[PropertyInfo] Deal with not serializable context

symfony · dunglas · Dec 9, 2015 · Dec 9, 2015 · Dec 31, 2015 · Jan 26, 2016
commit 681bc86f47c8eb221c98c1cc53b6513dd5529559
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractorCacheDecorator.php b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractorCacheDecorator.php
@@ -99,7 +99,14 @@ public function getTypes($class, $property, array $context = array())
     */
    private function extract($method, array $arguments)
    {
-        $key = $method.serialize($arguments);
+        try {
+            $serializedArguments = serialize($arguments);
+        } catch (\Exception $exception) {
+            // If arguments are not serializable, skip the cache
+            return call_user_func_array(array($this->propertyInfoExtractor, $method), $arguments);
+        }
+
+        $key = $method.$serializedArguments;

        if (isset($this->arrayCache[$key])) {
            return $this->arrayCache[$key];

diff --git a/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorCacheDecoratorTest.php b/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorCacheDecoratorTest.php
@@ -31,4 +31,9 @@ public function testCache()
        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));
        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));
    }
+
+    public function testNotSerializableContext()
+    {
+        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array('foo' => function () {})));
+    }
 }