[Serializer] PropertyNormalizer doesn't support DiscriminatorMap

agven · agven · commit a5e2916aead0 · 2020-05-01T21:32:10.000+03:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -93,6 +93,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
     private $propertyTypeExtractor;
     private $typesCache = [];
     private $attributesCache = [];
+    private $discriminatorCache = [];
 
     /**
      * @deprecated since Symfony 4.2
@@ -107,8 +108,14 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      */
     protected $classDiscriminatorResolver;
 
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
-    {
+    public function __construct(
+        ClassMetadataFactoryInterface $classMetadataFactory = null,
+        NameConverterInterface $nameConverter = null,
+        PropertyTypeExtractorInterface $propertyTypeExtractor = null,
+        ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null,
+        callable $objectClassResolver = null,
+        array $defaultContext = []
+    ) {
         parent::__construct($classMetadataFactory, $nameConverter, $defaultContext);
 
         if (isset($this->defaultContext[self::MAX_DEPTH_HANDLER]) && !\is_callable($this->defaultContext[self::MAX_DEPTH_HANDLER])) {
@@ -180,7 +187,7 @@ public function normalize($object, $format = null, array $context = [])
                 continue;
             }
 
-            $attributeValue = $this->getAttributeValue($object, $attribute, $format, $context);
+            $attributeValue = $this->getValue($object, $attribute, $format, $context);
             if ($maxDepthReached) {
                 $attributeValue = $maxDepthHandler($attributeValue, $object, $attribute, $format, $context);
             }
@@ -277,6 +284,43 @@ protected function getAttributes($object, $format = null, array $context)
         return $attributes;
     }
 
+    /**
+     * @internal This method is wrapper
+     * Gets the attribute value.
+     *
+     * @param object      $object
+     * @param string      $attribute
+     * @param string|null $format
+     * @param array       $context
+     *
+     * @return mixed
+     */
+    private function getValue($object, $attribute, $format = null, array $context = [])
+    {
+        return $attribute === $this->getDiscriminatorProperty($object)
+            ? $this->classDiscriminatorResolver->getTypeForMappedObject($object)
+            : $this->getAttributeValue($object, $attribute, $format, $context);
+    }
+    /**
+     * Gets the discriminator property name by object.
+     *
+     * @param object $object
+     *
+     * @return string|null
+     */
+    private function getDiscriminatorProperty($object): ?string
+    {
+        $cacheKey = \get_class($object);
+        if (!\array_key_exists($cacheKey, $this->discriminatorCache)) {
+            $this->discriminatorCache[$cacheKey] = null;
+            if ($this->classDiscriminatorResolver) {
+                $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);
+                $this->discriminatorCache[$cacheKey] = $mapping === null ? null : $mapping->getTypeProperty();
+            }
+        }
+        return $this->discriminatorCache[$cacheKey];
+    }
+
     /**
      * Extracts attributes to normalize from the class of the given object, format and context.
      *
@@ -350,7 +394,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
 
             if ($context[self::DEEP_OBJECT_TO_POPULATE] ?? $this->defaultContext[self::DEEP_OBJECT_TO_POPULATE] ?? false) {
                 try {
-                    $context[self::OBJECT_TO_POPULATE] = $this->getAttributeValue($object, $attribute, $format, $context);
+                    $context[self::OBJECT_TO_POPULATE] = $this->getValue($object, $attribute, $format, $context);
                 } catch (NoSuchPropertyException $e) {
                 }
             }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -28,19 +28,33 @@
  */
 class ObjectNormalizer extends AbstractObjectNormalizer
 {
+    /** @var PropertyAccessorInterface */
     protected $propertyAccessor;
 
-    private $discriminatorCache = [];
-
+    /** @var callable|\Closure */
     private $objectClassResolver;
 
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
-    {
+    public function __construct(
+        ClassMetadataFactoryInterface $classMetadataFactory = null,
+        NameConverterInterface $nameConverter = null,
+        PropertyAccessorInterface $propertyAccessor = null,
+        PropertyTypeExtractorInterface $propertyTypeExtractor = null,
+        ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null,
+        callable $objectClassResolver = null,
+        array $defaultContext = []
+    ) {
         if (!class_exists(PropertyAccess::class)) {
             throw new LogicException('The ObjectNormalizer class requires the "PropertyAccess" component. Install "symfony/property-access" to use it.');
         }
 
-        parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
+        parent::__construct(
+            $classMetadataFactory,
+            $nameConverter,
+            $propertyTypeExtractor,
+            $classDiscriminatorResolver,
+            $objectClassResolver,
+            $defaultContext
+        );
 
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
 
@@ -126,16 +140,7 @@ protected function extractAttributes($object, $format = null, array $context = [
      */
     protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
-        $cacheKey = \get_class($object);
-        if (!\array_key_exists($cacheKey, $this->discriminatorCache)) {
-            $this->discriminatorCache[$cacheKey] = null;
-            if (null !== $this->classDiscriminatorResolver) {
-                $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);
-                $this->discriminatorCache[$cacheKey] = null === $mapping ? null : $mapping->getTypeProperty();
-            }
-        }
-
-        return $attribute === $this->discriminatorCache[$cacheKey] ? $this->classDiscriminatorResolver->getTypeForMappedObject($object) : $this->propertyAccessor->getValue($object, $attribute);
+        return $this->propertyAccessor->getValue($object, $attribute);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -30,22 +30,6 @@
  */
 class PropertyNormalizer extends AbstractObjectNormalizer
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return parent::supportsNormalization($data, $format) && $this->supports(\get_class($data));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -54,25 +38,6 @@ public function hasCacheableSupportsMethod(): bool
         return __CLASS__ === static::class;
     }
 
-    /**
-     * Checks if the given class has any non-static property.
-     */
-    private function supports(string $class): bool
-    {
-        $class = new \ReflectionClass($class);
-
-        // We look for at least one non-static property
-        do {
-            foreach ($class->getProperties() as $property) {
-                if (!$property->isStatic()) {
-                    return true;
-                }
-            }
-        } while ($class = $class->getParentClass());
-
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      */
