Move normalizer cache to getNormalier()/getDenormalizer(), use those …

…in normalizeObject()/denormalizeObject()
symfony · Berdir · Mar 14, 2014 · Mar 15, 2014 · Mar 15, 2014 · Mar 15, 2014
commit 1467ae657057d9fd060ed1292b78d28e756a468e
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -168,12 +168,28 @@ public function supportsDenormalization($data, $type, $format = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Returns a matching normalizer.
+     *
+     * @param $data
+     * @param null $format
+     *
+     * @return mixed
+     *
+     * @throws Exception\LogicException
+     * @throws Exception\UnexpectedValueException
      */
     private function getNormalizer($data, $format = null)
     {
+
+        $class = get_class($data);
+        if (isset($this->normalizerCache[$class][$format])) {
+            return $this->normalizerCache[$class][$format];
+        }
+
         foreach ($this->normalizers as $normalizer) {
             if ($normalizer instanceof NormalizerInterface && $normalizer->supportsNormalization($data, $format)) {
+                $this->normalizerCache[$class][$format] = $normalizer;
+
                 return $normalizer;
             }
         }
@@ -182,12 +198,27 @@ private function getNormalizer($data, $format = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Returns a matching denormalizer.
+     *
+     * @param $data
+     * @param $type
+     * @param null $format
+     *
+     * @return mixed
+     *
+     * @throws Exception\LogicException
+     * @throws Exception\UnexpectedValueException
      */
     private function getDenormalizer($data, $type, $format = null)
     {
+        if (isset($this->denormalizerCache[$type][$format])) {
+            return $this->denormalizerCache[$type][$format];
+        }
+
         foreach ($this->normalizers as $normalizer) {
             if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $type, $format)) {
+                $this->denormalizerCache[$type][$format] = $normalizer;
+
                 return $normalizer;
             }
         }
@@ -229,21 +260,11 @@ private function normalizeObject($object, $format = null, array $context = array
             throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
         }
 
-        $class = get_class($object);
-        if (isset($this->normalizerCache[$class][$format])) {
-            return $this->normalizerCache[$class][$format]->normalize($object, $format, $context);
-        }
-
-        foreach ($this->normalizers as $normalizer) {
-            if ($normalizer instanceof NormalizerInterface
-                && $normalizer->supportsNormalization($object, $format)) {
-                $this->normalizerCache[$class][$format] = $normalizer;
-
-                return $normalizer->normalize($object, $format, $context);
-            }
+        try {
+            return $this->getNormalizer($object, $format)->normalize($object, $format, $context);
+        } catch (RuntimeException $e) {
+            throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', get_class($object)));
         }
-
-        throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', $class));
     }
 
     /**
@@ -265,20 +286,11 @@ private function denormalizeObject($data, $class, $format = null, array $context
             throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
         }
 
-        if (isset($this->denormalizerCache[$class][$format])) {
-            return $this->denormalizerCache[$class][$format]->denormalize($data, $class, $format, $context);
-        }
-
-        foreach ($this->normalizers as $normalizer) {
-            if ($normalizer instanceof DenormalizerInterface
-                && $normalizer->supportsDenormalization($data, $class, $format)) {
-                $this->denormalizerCache[$class][$format] = $normalizer;
-
-                return $normalizer->denormalize($data, $class, $format, $context);
-            }
+        try {
+            return $this->getDenormalizer($data, $class, $format)->denormalize($data, $class, $format, $context);
+        } catch (RuntimeException $e) {
+            throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $class));
         }
-
-        throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $class));
     }
 
     /**