Remove normalizer cache in Serializer class

jvasseur · jvasseur · commit 8566dc18fc8c · 2016-01-03T18:07:57.000+01:00
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -237,7 +237,6 @@ private function normalizeObject($object, $format = null, array $context = array
         foreach ($this->normalizers as $normalizer) {
             if ($normalizer instanceof NormalizerInterface
                 && $normalizer->supportsNormalization($object, $format)) {
-                $this->normalizerCache[$class][$format] = $normalizer;
 
                 return $normalizer->normalize($object, $format, $context);
             }
@@ -272,7 +271,6 @@ private function denormalizeObject($data, $class, $format = null, array $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);
             }
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -73,6 +73,50 @@ public function testDenormalizeOnNormalizer()
         $this->assertTrue($this->serializer->denormalize(json_encode($data), 'stdClass', 'json'));
     }
 
+    public function testNormalizeWithSupportOnData()
+    {
+        $normalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+        $normalizer1->method('supportsNormalization')
+            ->willReturnCallback(function ($data, $format) {
+                return isset($data->test);
+            });
+        $normalizer1->method('normalize')->willReturn('test1');
+
+        $normalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+        $normalizer2->method('supportsNormalization')
+            ->willReturn(true);
+        $normalizer2->method('normalize')->willReturn('test2');
+
+        $serializer = new Serializer(array($normalizer1, $normalizer2));
+
+        $data = new \stdClass();
+        $data->test = true;
+        $this->assertEquals('test1', $serializer->normalize($data));
+
+        $this->assertEquals('test2', $serializer->normalize(new \stdClass()));
+    }
+
+    public function testDenormalizeWithSupportOnData()
+    {
+        $denormalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+        $denormalizer1->method('supportsDenormalization')
+            ->willReturnCallback(function ($data, $type, $format) {
+                return isset($data['test1']);
+            });
+        $denormalizer1->method('denormalize')->willReturn('test1');
+
+        $denormalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+        $denormalizer2->method('supportsDenormalization')
+            ->willReturn(true);
+        $denormalizer2->method('denormalize')->willReturn('test2');
+
+        $serializer = new Serializer(array($denormalizer1, $denormalizer2));
+
+        $this->assertEquals('test1', $serializer->denormalize(array('test1' => true), 'test'));
+
+        $this->assertEquals('test2', $serializer->denormalize(array(), 'test'));
+    }
+
     public function testSerialize()
     {
         $this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ private function normalizeObject($object, $format = null, array $context = array`
`237`	`237`	`foreach ($this->normalizers as $normalizer) {`
`238`	`238`	`if ($normalizer instanceof NormalizerInterface`
`239`	`239`	`&& $normalizer->supportsNormalization($object, $format)) {`
`240`		`- $this->normalizerCache[$class][$format] = $normalizer;`
`241`	`240`
`242`	`241`	`return $normalizer->normalize($object, $format, $context);`
`243`	`242`	`}`
`@@ -272,7 +271,6 @@ private function denormalizeObject($data, $class, $format = null, array $context`
`272`	`271`	`foreach ($this->normalizers as $normalizer) {`
`273`	`272`	`if ($normalizer instanceof DenormalizerInterface`
`274`	`273`	`&& $normalizer->supportsDenormalization($data, $class, $format)) {`
`275`		`- $this->denormalizerCache[$class][$format] = $normalizer;`
`276`	`274`
`277`	`275`	`return $normalizer->denormalize($data, $class, $format, $context);`
`278`	`276`	`}`