Merge 3.4.x up into 4.0.x

docs/en/tutorials/working-with-indexed-associations.rst

@@ -35,10 +35,6 @@ The code and mappings for the Market entity looks like this:
  .. literalinclude:: working-with-indexed-associations/market.xml
  :language: xml
 
- .. literalinclude:: working-with-indexed-associations/market.xml
- :language: yaml
-
-
 Inside the ``addStock()`` method you can see how we directly set the key of the association to the symbol,
 so that we can work with the indexed association directly after invoking ``addStock()``. Inside ``getStock($symbol)``
 we pick a stock traded on the particular market by symbol. If this stock doesn't exist an exception is thrown.

doctrine-mapping.xsd

@@ -321,7 +321,7 @@
  <xs:choice minOccurs="0" maxOccurs="unbounded">
  <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
  </xs:choice>
- <xs:attribute name="value" type="xs:NMTOKEN" use="required"/>
+ <xs:attribute name="value" type="orm:type" use="required"/>
  <xs:attribute name="class" type="orm:fqcn" use="required"/>
  <xs:anyAttribute namespace="##other"/>
  </xs:complexType>

tests/Tests/Models/Customer/CustomerType.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\Customer;
+
+class CustomerType
+{
+ /** @var string */
+ public $name;
+
+ public function __construct(string $name)
+ {
+ $this->name = $name;
+ }
+}

tests/Tests/Models/Customer/ExternalCustomer.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\Customer;
+
+final class ExternalCustomer extends CustomerType
+{
+ public function __construct(string $name)
+ {
+ parent::__construct($name);
+ }
+}

tests/Tests/Models/Customer/InternalCustomer.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\Customer;
+
+final class InternalCustomer extends CustomerType
+{
+ public function __construct(string $name)
+ {
+ parent::__construct($name);
+ }
+}

tests/Tests/ORM/Mapping/ClassMetadataTest.php

@@ -14,6 +14,7 @@
 use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\DefaultTypedFieldMapper;
 use Doctrine\ORM\Mapping\DiscriminatorColumnMapping;
+use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\Mapping\JoinTableMapping;
 use Doctrine\ORM\Mapping\MappedSuperclass;
 use Doctrine\ORM\Mapping\MappingException;
@@ -33,6 +34,7 @@
 use Doctrine\Tests\Models\CMS\UserRepository;
 use Doctrine\Tests\Models\Company\CompanyContract;
 use Doctrine\Tests\Models\Company\CompanyContractListener;
+use Doctrine\Tests\Models\Customer\CustomerType;
 use Doctrine\Tests\Models\CustomType\CustomTypeParent;
 use Doctrine\Tests\Models\DDC117\DDC117Article;
 use Doctrine\Tests\Models\DDC117\DDC117ArticleDetails;
@@ -1080,14 +1082,27 @@ public function testItThrowsOnInvalidCallToGetAssociationMappedByTargetField():
 
  $metadata->getAssociationMappedByTargetField('foo');
  }
+
+ public function testClassNameMappingDiscriminatorValue(): void
+ {
+ $driver = new XmlDriver(
+ __DIR__ . '/xml',
+ XmlDriver::DEFAULT_FILE_EXTENSION,
+ true,
+ );
+ $xmlElement = $driver->getElement(CustomerType::class);
+ self::assertEquals(
+ 'Doctrine\Tests\Models\Customer\InternalCustomer',
+ $xmlElement->children()->{'discriminator-map'}->{'discriminator-mapping'}[0]->attributes()['value'],
+ );
+ }
 }
 
 #[MappedSuperclass]
 class DDC2700MappedSuperClass
 {
- /** @var mixed */
  #[Column]
- private $foo;
+ private mixed $foo;
 }
 
 class MyNamespacedNamingStrategy extends DefaultNamingStrategy

tests/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Customer.CustomerType.dcm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+ https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="Doctrine\Tests\Models\Customer\CustomerType" table="customers" inheritance-type="SINGLE_TABLE">
+ <field name="name" column="name"/>
+ <discriminator-column name="type" type="string"/>
+ <discriminator-map>
+ <discriminator-mapping value="Doctrine\Tests\Models\Customer\InternalCustomer" class="Doctrine\Tests\Models\Customer\InternalCustomer" />
+ <discriminator-mapping value="Doctrine\Tests\Models\Customer\ExternalCustomer" class="Doctrine\Tests\Models\Customer\ExternalCustomer" />
+ </discriminator-map>
+ </entity>
+</doctrine-mapping>