From a8b11a14d1033deaef2358222467d821a89a37a5 Mon Sep 17 00:00:00 2001
From: MatteoFeltrin <matteo.feltrin@kanbanbox.com>
Date: Mon, 13 May 2024 10:48:39 +0200
Subject: [PATCH] allow classname in 'value' attribute of xml
 discriminator-mapping field

---
 doctrine-mapping.xsd                              |  2 +-
 tests/Tests/Models/Customer/CustomerType.php      | 10 ++++++++++
 tests/Tests/Models/Customer/ExternalCustomer.php  | 13 +++++++++++++
 tests/Tests/Models/Customer/InternalCustomer.php  | 13 +++++++++++++
 tests/Tests/ORM/Mapping/XmlMappingDriverTest.php  | 15 +++++++++++++++
 ...ine.Tests.Models.Customer.CustomerType.dcm.xml | 14 ++++++++++++++
 6 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/Tests/Models/Customer/CustomerType.php
 create mode 100644 tests/Tests/Models/Customer/ExternalCustomer.php
 create mode 100644 tests/Tests/Models/Customer/InternalCustomer.php
 create mode 100644 tests/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Customer.CustomerType.dcm.xml

diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index 58175a2e8dd..6131026f5f6 100644
--- a/doctrine-mapping.xsd
+++ b/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>
diff --git a/tests/Tests/Models/Customer/CustomerType.php b/tests/Tests/Models/Customer/CustomerType.php
new file mode 100644
index 00000000000..e66f90ccd06
--- /dev/null
+++ b/tests/Tests/Models/Customer/CustomerType.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Doctrine\Tests\Models\Customer;
+
+class CustomerType
+{
+    public function __construct(public string $name)
+    {
+    }
+}
\ No newline at end of file
diff --git a/tests/Tests/Models/Customer/ExternalCustomer.php b/tests/Tests/Models/Customer/ExternalCustomer.php
new file mode 100644
index 00000000000..cf50d3e85e0
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/tests/Tests/Models/Customer/InternalCustomer.php b/tests/Tests/Models/Customer/InternalCustomer.php
new file mode 100644
index 00000000000..305bdd140b9
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/tests/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Tests/ORM/Mapping/XmlMappingDriverTest.php
index 5426da45c91..bc2f6a6b465 100644
--- a/tests/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -14,6 +14,7 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Doctrine\Persistence\Mapping\RuntimeReflectionService;
+use Doctrine\Tests\Models\Customer\CustomerType;
 use Doctrine\Tests\Models\DDC117\DDC117Translation;
 use Doctrine\Tests\Models\DDC3293\DDC3293User;
 use Doctrine\Tests\Models\DDC3293\DDC3293UserPrefixed;
@@ -301,6 +302,20 @@ public function testClassNameInFieldOrId(): void
         self::assertEquals(ProjectName::class, $name->type);
     }
 
+    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']
+        );
+    }
+
     public function testDisablingXmlValidationIsPossible(): void
     {
         $this->expectNotToPerformAssertions();
diff --git a/tests/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Customer.CustomerType.dcm.xml b/tests/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Customer.CustomerType.dcm.xml
new file mode 100644
index 00000000000..8cb22900428
--- /dev/null
+++ b/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">
+        <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>