[Serializer] ObjectNormalizer: context can contain not serializable data

Author: dunglas

src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

@@ -26,7 +26,7 @@
  */
 class ObjectNormalizer extends AbstractNormalizer
 {
-    private static $attributesCache = array();
+    private $attributesCache = array();
 
     /**
      * @var PropertyAccessorInterface
@@ -136,20 +136,39 @@ public function denormalize($data, $class, $format = null, array $context = arra
      * @param object $object
      * @param array  $context
      *
-     * @return array
+     * @return string[]
      */
     private function getAttributes($object, array $context)
     {
-        $key = sprintf('%s-%s', get_class($object), serialize($context));
+        try {
+            $serializedContext = serialize($context);
+        } catch (\Exception $exception) {
+            // The context cannot be serialized, skip the cache
+            return $this->extractAttributes($object, $context);
+        }
+
+        $key = sprintf('%s-%s', get_class($object), $serializedContext);
 
-        if (isset(self::$attributesCache[$key])) {
-            return self::$attributesCache[$key];
+        if (isset($this->attributesCache[$key])) {
+            return $this->attributesCache[$key];
         }
 
-        $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
+        return $this->attributesCache[$key] = $this->extractAttributes($object, $context);
+    }
 
+    /**
+     * Extracts attributes for this class and context.
+     *
+     * @param object $object
+     * @param array  $context
+     *
+     * @return string[]
+     */
+    private function extractAttributes($object, array $context)
+    {
+        $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
         if (false !== $allowedAttributes) {
-            return self::$attributesCache[$key] = $allowedAttributes;
+            return $allowedAttributes;
         }
 
         // If not using groups, detect manually
@@ -167,9 +186,9 @@ private function getAttributes($object, array $context)
                 continue;
             }
 
-            $name = $reflMethod->getName();
+            $name = $reflMethod->name;
 
-            if (strpos($name, 'get') === 0 || strpos($name, 'has') === 0) {
+            if (0 === strpos($name, 'get') || 0 === strpos($name, 'has')) {
                 // getters and hassers
                 $attributes[lcfirst(substr($name, 3))] = true;
             } elseif (strpos($name, 'is') === 0) {
@@ -184,9 +203,9 @@ private function getAttributes($object, array $context)
                 continue;
             }
 
-            $attributes[$reflProperty->getName()] = true;
+            $attributes[$reflProperty->name] = true;
         }
 
-        return self::$attributesCache[$key] = array_keys($attributes);
+        return array_keys($attributes);
     }
 }

src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php

@@ -473,6 +473,21 @@ public function testNormalizeStatic()
     {
         $this->assertEquals(array('foo' => 'K'), $this->normalizer->normalize(new ObjectWithStaticPropertiesAndMethods()));
     }
+
+    public function testNormalizeNotSerializableContext()
+    {
+        $objectDummy = new ObjectDummy();
+        $expected = array(
+            'foo' => null,
+            'baz' => null,
+            'fooBar' => '',
+            'camelCase' => null,
+            'object' => null,
+            'bar' => null,
+        );
+
+        $this->assertEquals($expected, $this->normalizer->normalize($objectDummy, null, array('not_serializable' => function () {})));
+    }
 }
 
 class ObjectDummy