Supports nested "abstract" object while serializing and de-serializing

sroze · sroze · commit 43dc1670d06b · 2018-07-04T09:10:31.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -294,7 +294,7 @@ abstract protected function setAttributeValue($object, $attribute, $value, $form
      */
     private function validateAndDenormalize(string $currentClass, string $attribute, $data, ?string $format, array $context)
     {
-        if (null === $this->propertyTypeExtractor || null === $types = $this->propertyTypeExtractor->getTypes($currentClass, $attribute)) {
+        if (null === $types = $this->getTypes($currentClass, $attribute)) {
             return $data;
         }
 
@@ -357,6 +357,20 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
         throw new NotNormalizableValueException(sprintf('The type of the "%s" attribute for class "%s" must be one of "%s" ("%s" given).', $attribute, $currentClass, implode('", "', array_keys($expectedTypes)), gettype($data)));
     }
 
+    /**
+     * Get the types for the given class and attribute.
+     *
+     * @return Type[]|null
+     */
+    protected function getTypes(string $currentClass, string $attribute)
+    {
+        if (null === $this->propertyTypeExtractor) {
+            return null;
+        }
+
+        return $this->propertyTypeExtractor->getTypes($currentClass, $attribute);
+    }
+
     /**
      * Sets an attribute and apply the name converter if necessary.
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -15,6 +15,7 @@
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Mapping\AttributeMetadata;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
@@ -152,4 +153,30 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
 
         return $allowedAttributes;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTypes(string $currentClass, string $attribute)
+    {
+        if (null !== $types = parent::getTypes($currentClass, $attribute)) {
+            return $types;
+        }
+
+        if (null !== $this->classDiscriminatorResolver && null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForClass($currentClass)) {
+            if ($discriminatorMapping->getTypeProperty() === $attribute) {
+                return array(
+                    new Type(Type::BUILTIN_TYPE_STRING),
+                );
+            }
+
+            foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {
+                if (null !== $types = parent::getTypes($mappedClass, $attribute)) {
+                    return $types;
+                }
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberTwo.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberTwo.php
@@ -16,4 +16,18 @@
  */
 class DummyMessageNumberTwo implements DummyMessageInterface
 {
+    /**
+     * @var DummyMessageNumberOne
+     */
+    private $nested;
+
+    public function setNested(DummyMessageNumberOne $nested)
+    {
+        $this->nested = $nested;
+    }
+
+    public function getNested(): DummyMessageNumberOne
+    {
+        return $this->nested;
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
@@ -35,6 +36,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne;
+use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo;
 use Symfony\Component\Serializer\Tests\Fixtures\TraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
 use Symfony\Component\Serializer\Tests\Normalizer\TestNormalizer;
@@ -430,6 +432,22 @@ public function testDeserializeAndSerializeInterfacedObjectsWithTheClassMetadata
         $this->assertEquals('{"two":2,"type":"one"}', $serialized);
     }
 
+    public function testDeserializeAndSerializeNestedInterfacedObjectsWithTheClassMetadataDiscriminator()
+    {
+        $nested = new DummyMessageNumberOne();
+        $nested->one = 'foo';
+
+        $example = new DummyMessageNumberTwo();
+        $example->setNested($nested);
+
+        $serializer = $this->serializerWithClassDiscriminator();
+
+        $serialized = $serializer->serialize($example, 'json');
+        $deserialized = $serializer->deserialize($serialized, DummyMessageInterface::class, 'json');
+
+        $this->assertEquals($example, $deserialized);
+    }
+
     /**
      * @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
      * @expectedExceptionMessage The type "second" has no mapped class for the abstract object "Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface"
@@ -452,7 +470,7 @@ private function serializerWithClassDiscriminator()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
 
-        return new Serializer(array(new ObjectNormalizer($classMetadataFactory, null, null, null, new ClassDiscriminatorFromClassMetadata($classMetadataFactory))), array('json' => new JsonEncoder()));
+        return new Serializer(array(new ObjectNormalizer($classMetadataFactory, null, null, new ReflectionExtractor(), new ClassDiscriminatorFromClassMetadata($classMetadataFactory))), array('json' => new JsonEncoder()));
     }
 }
 
