[Serializer][ClassDiscriminatorMapping] Fix getMappedObjectType() when a discriminator child extends another one

fancyweb · fancyweb · commit c16a192473e6 · 2020-08-18T09:04:16.000+02:00
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php
@@ -23,6 +23,18 @@ public function __construct(string $typeProperty, array $typesMapping = [])
     {
         $this->typeProperty = $typeProperty;
         $this->typesMapping = $typesMapping;
+
+        uasort($this->typesMapping, static function (string $a, string $b): int {
+            if (is_a($a, $b, true)) {
+                return -1;
+            }
+
+            if (is_a($b, $a, true)) {
+                return 1;
+            }
+
+            return 0;
+        });
     }
 
     public function getTypeProperty(): string
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractDummy.php
@@ -16,7 +16,8 @@
 /**
  * @DiscriminatorMap(typeProperty="type", mapping={
  *    "first"="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild",
- *    "second"="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild"
+ *    "second"="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild",
+ *    "third"="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyThirdChild",
  * })
  */
 abstract class AbstractDummy
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractDummyThirdChild.php b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractDummyThirdChild.php
@@ -0,0 +1,16 @@
+<?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;
+
+final class AbstractDummyThirdChild extends AbstractDummyFirstChild
+{
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/ClassDiscriminatorMappingTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/ClassDiscriminatorMappingTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild;
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild;
+use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyThirdChild;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
@@ -35,9 +36,11 @@ public function testMappedObjectType()
     {
         $mapping = new ClassDiscriminatorMapping('type', [
             'first' => AbstractDummyFirstChild::class,
+            'third' => AbstractDummyThirdChild::class,
         ]);
 
         $this->assertEquals('first', $mapping->getMappedObjectType(new AbstractDummyFirstChild()));
         $this->assertNull($mapping->getMappedObjectType(new AbstractDummySecondChild()));
+        $this->assertSame('third', $mapping->getMappedObjectType(new AbstractDummyThirdChild()));
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild;
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild;
+use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyThirdChild;
 use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
 
 /**
@@ -65,6 +66,7 @@ public function testLoadDiscriminatorMap()
         $expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', [
             'first' => AbstractDummyFirstChild::class,
             'second' => AbstractDummySecondChild::class,
+            'third' => AbstractDummyThirdChild::class,
         ]));
 
         $expected->addAttributeMetadata(new AttributeMetadata('foo'));

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;`
`16`	`16`	`use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild;`
`17`	`17`	`use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild;`
	`18`	`+use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyThirdChild;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* @author Samuel Roze <samuel.roze@gmail.com>`
`@@ -35,9 +36,11 @@ public function testMappedObjectType()`
`35`	`36`	`{`
`36`	`37`	`$mapping = new ClassDiscriminatorMapping('type', [`
`37`	`38`	`'first' => AbstractDummyFirstChild::class,`
	`39`	`+ 'third' => AbstractDummyThirdChild::class,`
`38`	`40`	`]);`
`39`	`41`
`40`	`42`	`$this->assertEquals('first', $mapping->getMappedObjectType(new AbstractDummyFirstChild()));`
`41`	`43`	`$this->assertNull($mapping->getMappedObjectType(new AbstractDummySecondChild()));`
	`44`	`+ $this->assertSame('third', $mapping->getMappedObjectType(new AbstractDummyThirdChild()));`
`42`	`45`	`}`
`43`	`46`	`}`