[Serializer][ClassDiscriminatorMapping] Fix getMappedObjectType() whe…

…n a discriminator child extends another one
symfony · fabpot · Aug 18, 2020 · Aug 17, 2020 · Aug 18, 2020 · c16a192473e6496f1648d5486d5b4238225e61e0
commit c16a192473e6496f1648d5486d5b4238225e61e0
@@ -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

@@ -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\AbstractDummyThir
8000
dChild",
  * })
  */
 abstract class AbstractDummy

@@ -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
+{
+}
@@ -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()));
     }
 }
@@ -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'));