[Serializer] Add ->hasCacheableSupportsMethod() to CacheableSupportsMethodInterface

nicolas-grekas · nicolas-grekas · commit 04b369215c0e · 2018-05-01T14:58:32.000-07:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -27,7 +27,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
     use ObjectToPopulateTrait;
     use SerializerAwareTrait;
@@ -147,6 +147,14 @@ public function setIgnoredAttributes(array $ignoredAttributes)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return false;
+    }
+
     /**
      * Detects if the configured circular reference limit is reached.
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -30,7 +30,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-abstract class AbstractObjectNormalizer extends AbstractNormalizer implements CacheableSupportsMethodInterface
+abstract class AbstractObjectNormalizer extends AbstractNormalizer
 {
     const ENABLE_MAX_DEPTH = 'enable_max_depth';
     const DEPTH_KEY_PATTERN = 'depth_%s::%s';
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -24,7 +24,7 @@
  *
  * @final
  */
-class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface
+class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
     /**
      * @var SerializerInterface|DenormalizerInterface
@@ -83,4 +83,12 @@ public function setSerializer(SerializerInterface $serializer)
 
         $this->serializer = $serializer;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return $this->serializer instanceof CacheableSupportsMethodInterface && $this->serializer->hasCacheableSupportsMethod();
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php b/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php
@@ -22,4 +22,5 @@
  */
 interface CacheableSupportsMethodInterface
 {
+    public function hasCacheableSupportsMethod(): bool;
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -56,4 +56,12 @@ public function supportsNormalization($data, $format = null)
     {
         return $data instanceof ConstraintViolationListInterface;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -67,4 +67,12 @@ public function supportsDenormalization($data, $type, $format = null)
     {
         return \is_subclass_of($type, DenormalizableInterface::class);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -119,6 +119,14 @@ public function supportsDenormalization($data, $type, $format = null)
         return isset(self::$supportedTypes[$type]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * Gets the mime type of the object. Defaults to application/octet-stream.
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -55,6 +55,14 @@ public function supportsNormalization($data, $format = null)
         return $data instanceof \DateInterval;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * {@inheritdoc}
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -116,6 +116,14 @@ public function supportsDenormalization($data, $type, $format = null)
         return isset(self::$supportedTypes[$type]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * Formats datetime errors.
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -52,6 +52,14 @@ public function supportsDenormalization($data, $type, $format = null)
         return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * Checks if the given class has any get{Property} method.
      */
diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
@@ -19,7 +19,7 @@
  *
  * @author Fred Cox <mcfedr@gmail.com>
  */
-class JsonSerializableNormalizer extends AbstractNormalizer implements CacheableSupportsMethodInterface
+class JsonSerializableNormalizer extends AbstractNormalizer
 {
     /**
      * {@inheritdoc}
@@ -64,4 +64,12 @@ public function denormalize($data, $class, $format = null, array $context = arra
     {
         throw new LogicException(sprintf('Cannot denormalize with "%s".', \JsonSerializable::class));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -40,6 +40,14 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -46,6 +46,14 @@ public function supportsDenormalization($data, $type, $format = null)
         return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return __CLASS__ === \get_class($this);
+    }
+
     /**
      * Checks if the given class has any non-static property.
      */
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -19,14 +19,14 @@
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 
 /**
  * Serializer serializes and deserializes data.
@@ -221,12 +221,11 @@ private function getNormalizer($data, ?string $format, array $context)
                     continue;
                 }
 
-                if (!$normalizer instanceof CacheableSupportsMethodInterface) {
+                if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
                     $this->normalizerCache[$format][$type][$k] = false;
                 } elseif ($normalizer->supportsNormalization($data, $format)) {
                     $this->normalizerCache[$format][$type][$k] = true;
-
-                    return $normalizer;
+                    break;
                 }
             }
         }
@@ -263,12 +262,11 @@ private function getDenormalizer($data, string $class, ?string $format, array $c
                     continue;
                 }
 
-                if (!$normalizer instanceof CacheableSupportsMethodInterface) {
+                if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
                     $this->denormalizerCache[$format][$class][$k] = false;
                 } elseif ($normalizer->supportsDenormalization(null, $class, $format)) {
                     $this->denormalizerCache[$format][$class][$k] = true;
-
-                    return $normalizer;
+                    break;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`29`	`29`	`*/`
`30`		`-abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface`
	`30`	`+abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface`
`31`	`31`	`{`
`32`	`32`	`use ObjectToPopulateTrait;`
`33`	`33`	`use SerializerAwareTrait;`
`@@ -147,6 +147,14 @@ public function setIgnoredAttributes(array $ignoredAttributes)`
`147`	`147`	`return $this;`
`148`	`148`	`}`
`149`	`149`
	`150`	`+ /**`
	`151`	`+ * {@inheritdoc}`
	`152`	`+ */`
	`153`	`+ public function hasCacheableSupportsMethod(): bool`
	`154`	`+ {`
	`155`	`+ return false;`
	`156`	`+ }`
	`157`	`+`
`150`	`158`	`/**`
`151`	`159`	`* Detects if the configured circular reference limit is reached.`
`152`	`160`	`*`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`32`	`32`	`*/`
`33`		`-abstract class AbstractObjectNormalizer extends AbstractNormalizer implements CacheableSupportsMethodInterface`
	`33`	`+abstract class AbstractObjectNormalizer extends AbstractNormalizer`
`34`	`34`	`{`
`35`	`35`	`const ENABLE_MAX_DEPTH = 'enable_max_depth';`
`36`	`36`	`const DEPTH_KEY_PATTERN = 'depth_%s::%s';`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @final`
`26`	`26`	`*/`
`27`		`-class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface`
	`27`	`+class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* @var SerializerInterface\|DenormalizerInterface`
`@@ -83,4 +83,12 @@ public function setSerializer(SerializerInterface $serializer)`
`83`	`83`
`84`	`84`	`$this->serializer = $serializer;`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ /**`
	`88`	`+ * {@inheritdoc}`
	`89`	`+ */`
	`90`	`+ public function hasCacheableSupportsMethod(): bool`
	`91`	`+ {`
	`92`	`+ return $this->serializer instanceof CacheableSupportsMethodInterface && $this->serializer->hasCacheableSupportsMethod();`
	`93`	`+ }`
`86`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@`
`22`	`22`	`*/`
`23`	`23`	`interface CacheableSupportsMethodInterface`
`24`	`24`	`{`
	`25`	`+ public function hasCacheableSupportsMethod(): bool;`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,12 @@ public function supportsNormalization($data, $format = null)`
`56`	`56`	`{`
`57`	`57`	`return $data instanceof ConstraintViolationListInterface;`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ /**`
	`61`	`+ * {@inheritdoc}`
	`62`	`+ */`
	`63`	`+ public function hasCacheableSupportsMethod(): bool`
	`64`	`+ {`
	`65`	`+ return __CLASS__ === \get_class($this);`
	`66`	`+ }`
`59`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,12 @@ public function supportsDenormalization($data, $type, $format = null)`
`67`	`67`	`{`
`68`	`68`	`return \is_subclass_of($type, DenormalizableInterface::class);`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ /**`
	`72`	`+ * {@inheritdoc}`
	`73`	`+ */`
	`74`	`+ public function hasCacheableSupportsMethod(): bool`
	`75`	`+ {`
	`76`	`+ return __CLASS__ === \get_class($this);`
	`77`	`+ }`
`70`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,14 @@ public function supportsDenormalization($data, $type, $format = null)`
`119`	`119`	`return isset(self::$supportedTypes[$type]);`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ /**`
	`123`	`+ * {@inheritdoc}`
	`124`	`+ */`
	`125`	`+ public function hasCacheableSupportsMethod(): bool`
	`126`	`+ {`
	`127`	`+ return __CLASS__ === \get_class($this);`
	`128`	`+ }`
	`129`	`+`
`122`	`130`	`/**`
`123`	`131`	`* Gets the mime type of the object. Defaults to application/octet-stream.`
`124`	`132`	`*`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,14 @@ public function supportsNormalization($data, $format = null)`
`55`	`55`	`return $data instanceof \DateInterval;`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ /**`
	`59`	`+ * {@inheritdoc}`
	`60`	`+ */`
	`61`	`+ public function hasCacheableSupportsMethod(): bool`
	`62`	`+ {`
	`63`	`+ return __CLASS__ === \get_class($this);`
	`64`	`+ }`
	`65`	`+`
`58`	`66`	`/**`
`59`	`67`	`* {@inheritdoc}`
`60`	`68`	`*`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,14 @@ public function supportsDenormalization($data, $type, $format = null)`
`116`	`116`	`return isset(self::$supportedTypes[$type]);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ /**`
	`120`	`+ * {@inheritdoc}`
	`121`	`+ */`
	`122`	`+ public function hasCacheableSupportsMethod(): bool`
	`123`	`+ {`
	`124`	`+ return __CLASS__ === \get_class($this);`
	`125`	`+ }`
	`126`	`+`
`119`	`127`	`/**`
`120`	`128`	`* Formats datetime errors.`
`121`	`129`	`*`