[Seriaizer] Add local cache to normalizers

nicolas-grekas · nicolas-grekas · commit 6e94152a726b · 2017-09-15T23:40:40.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -36,6 +36,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
 
     private $propertyTypeExtractor;
     private $attributesCache = array();
+    private $cache = array();
 
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null)
     {
@@ -49,7 +50,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
      */
     public function supportsNormalization($data, $format = null)
     {
-        return is_object($data) && !$data instanceof \Traversable;
+        return \is_object($data) && !$data instanceof \Traversable;
     }
 
     /**
@@ -163,7 +164,7 @@ abstract protected function getAttributeValue($object, $attribute, $format = nul
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        return class_exists($type);
+        return isset($this->cache[$type]) ? $this->cache[$type] : $this->cache[$type] = class_exists($type);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -66,7 +66,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null/*, array $context = array()*/)
     {
-        $context = func_num_args() > 3 ? func_get_arg(3) : array();
+        $context = \func_num_args() > 3 ? func_get_arg(3) : array();
 
         return '[]' === substr($type, -2)
             && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -19,6 +19,8 @@
  */
 class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
+    private $cache = array();
+
     use SerializerAwareTrait;
 
     /**
@@ -64,10 +66,14 @@ public function supportsNormalization($data, $format = null)
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
+        if (isset($this->cache[$type])) {
+            return $this->cache[$type];
+        }
+
         if (!class_exists($type)) {
-            return false;
+            return $this->cache[$type] = false;
         }
 
-        return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
+        return $this->cache[$type] = is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -25,6 +25,12 @@
  */
 class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
 {
+    private static $supportedTypes = array(
+        \SplFileInfo::class => true,
+        \SplFileObject::class => true,
+        File::class => true,
+    );
+
     /**
      * @var MimeTypeGuesserInterface
      */
@@ -107,13 +113,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        $supportedTypes = array(
-            \SplFileInfo::class => true,
-            \SplFileObject::class => true,
-            'Symfony\Component\HttpFoundation\File\File' => true,
-        );
-
-        return isset($supportedTypes[$type]);
+        return isset(self::$supportedTypes[$type]);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -31,6 +31,12 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
     private $format;
     private $timezone;
 
+    private static $supportedTypes = array(
+        \DateTimeInterface::class => true,
+        \DateTimeImmutable::class => true,
+        \DateTime::class => true,
+    );
+
     /**
      * @param string             $format
      * @param \DateTimeZone|null $timezone
@@ -115,13 +121,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        $supportedTypes = array(
-            \DateTimeInterface::class => true,
-            \DateTimeImmutable::class => true,
-            \DateTime::class => true,
-        );
-
-        return isset($supportedTypes[$type]);
+        return isset(self::$supportedTypes[$type]);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -35,13 +35,14 @@
 class GetSetMethodNormalizer extends AbstractObjectNormalizer
 {
     private static $setterAccessibleCache = array();
+    private $cache = array();
 
     /**
      * {@inheritdoc}
      */
     public function supportsNormalization($data, $format = null)
     {
-        return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));
+        return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -30,12 +30,14 @@
  */
 class PropertyNormalizer extends AbstractObjectNormalizer
 {
+    private $cache = array();
+
     /**
      * {@inheritdoc}
      */
     public function supportsNormalization($data, $format = null)
     {
-        return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));
+        return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer`
`36`	`36`
`37`	`37`	`private $propertyTypeExtractor;`
`38`	`38`	`private $attributesCache = array();`
	`39`	`+ private $cache = array();`
`39`	`40`
`40`	`41`	`public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null)`
`41`	`42`	`{`
`@@ -49,7 +50,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory`
`49`	`50`	`*/`
`50`	`51`	`public function supportsNormalization($data, $format = null)`
`51`	`52`	`{`
`52`		`- return is_object($data) && !$data instanceof \Traversable;`
	`53`	`+ return \is_object($data) && !$data instanceof \Traversable;`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`/**`
`@@ -163,7 +164,7 @@ abstract protected function getAttributeValue($object, $attribute, $format = nul`
`163`	`164`	`*/`
`164`	`165`	`public function supportsDenormalization($data, $type, $format = null)`
`165`	`166`	`{`
`166`		`- return class_exists($type);`
	`167`	`+ return isset($this->cache[$type]) ? $this->cache[$type] : $this->cache[$type] = class_exists($type);`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`66`	`66`	`*/`
`67`	`67`	`public function supportsDenormalization($data, $type, $format = null/, array $context = array()/)`
`68`	`68`	`{`
`69`		`- $context = func_num_args() > 3 ? func_get_arg(3) : array();`
	`69`	`+ $context = \func_num_args() > 3 ? func_get_arg(3) : array();`
`70`	`70`
`71`	`71`	`return '[]' === substr($type, -2)`
`72`	`72`	`&& $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`*/`
`20`	`20`	`class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface`
`21`	`21`	`{`
	`22`	`+ private $cache = array();`
	`23`	`+`
`22`	`24`	`use SerializerAwareTrait;`
`23`	`25`
`24`	`26`	`/**`
`@@ -64,10 +66,14 @@ public function supportsNormalization($data, $format = null)`
`64`	`66`	`*/`
`65`	`67`	`public function supportsDenormalization($data, $type, $format = null)`
`66`	`68`	`{`
	`69`	`+ if (isset($this->cache[$type])) {`
	`70`	`+ return $this->cache[$type];`
	`71`	`+ }`
	`72`	`+`
`67`	`73`	`if (!class_exists($type)) {`
`68`		`- return false;`
	`74`	`+ return $this->cache[$type] = false;`
`69`	`75`	`}`
`70`	`76`
`71`		`- return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');`
	`77`	`+ return $this->cache[$type] = is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');`
`72`	`78`	`}`
`73`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,14 @@`
`35`	`35`	`class GetSetMethodNormalizer extends AbstractObjectNormalizer`
`36`	`36`	`{`
`37`	`37`	`private static $setterAccessibleCache = array();`
	`38`	`+ private $cache = array();`
`38`	`39`
`39`	`40`	`/**`
`40`	`41`	`* {@inheritdoc}`
`41`	`42`	`*/`
`42`	`43`	`public function supportsNormalization($data, $format = null)`
`43`	`44`	`{`
`44`		`- return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));`
	`45`	`+ return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,14 @@`
`30`	`30`	`*/`
`31`	`31`	`class PropertyNormalizer extends AbstractObjectNormalizer`
`32`	`32`	`{`
	`33`	`+ private $cache = array();`
	`34`	`+`
`33`	`35`	`/**`
`34`	`36`	`* {@inheritdoc}`
`35`	`37`	`*/`
`36`	`38`	`public function supportsNormalization($data, $format = null)`
`37`	`39`	`{`
`38`		`- return parent::supportsNormalization($data, $format) && $this->supports(get_class($data));`
	`40`	`+ return parent::supportsNormalization($data, $format) && (isset($this->cache[$type = \get_class($data)]) ? $this->cache[$type] : $this->cache[$type] = $this->supports($type));`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`/**`