[Serializer] Looking for DiscriminatorMap on interfaces when the current object also extends from a class

Caligone · Caligone · commit bfc4bddc7b93 · 2023-09-02T09:45:59.000+02:00
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -78,7 +78,9 @@ private function resolveMappingForMappedObject($object)
     {
         $reflectionClass = new \ReflectionClass($object);
         if ($parentClass = $reflectionClass->getParentClass()) {
-            return $this->getMappingForMappedObject($parentClass->getName());
+            if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {
+                return $parentMapping;
+            }
         }
 
         foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageInterface.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageInterface.php
@@ -16,7 +16,8 @@
 /**
  * @DiscriminatorMap(typeProperty="type", mapping={
  *    "one"="Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne",
- *    "two"="Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo"
+ *    "two"="Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo",
+ *    "three"="Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberThree"
  * })
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberThree.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberThree.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+/**
+ * @author Samuel Roze <samuel.roze@gmail.com>
+ */
+class DummyMessageNumberThree extends \stdClass implements DummyMessageInterface
+{
+}
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -58,6 +58,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\DummyFirstChildQuux;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne;
+use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberThree;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyObjectWithEnumConstructor;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyObjectWithEnumProperty;
@@ -488,6 +489,18 @@ public function testDeserializeAndSerializeNestedInterfacedObjectsWithTheClassMe
         $this->assertEquals($example, $deserialized);
     }
 
+    public function testDeserializeAndSerializeNestedAbstractAndInterfacedObjectsWithTheClassMetadataDiscriminator()
+    {
+        $example = new DummyMessageNumberThree();
+
+        $serializer = $this->serializerWithClassDiscriminator();
+
+        $serialized = $serializer->serialize($example, 'json');
+        $deserialized = $serializer->deserialize($serialized, DummyMessageInterface::class, 'json');
+
+        $this->assertEquals($example, $deserialized);
+    }
+
     public function testExceptionWhenTypeIsNotKnownInDiscriminator()
     {
         try {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ private function resolveMappingForMappedObject($object)`
`78`	`78`	`{`
`79`	`79`	`$reflectionClass = new \ReflectionClass($object);`
`80`	`80`	`if ($parentClass = $reflectionClass->getParentClass()) {`
`81`		`- return $this->getMappingForMappedObject($parentClass->getName());`
	`81`	`+ if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {`
	`82`	`+ return $parentMapping;`
	`83`	`+ }`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {`