[PropertyInfo] Deal with not serializable context

dunglas · dunglas · commit bd1022cce472 · 2015-12-31T11:30:57.000+01:00
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 () {})));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,9 @@ public function testCache()`
`31`	`31`	`$this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));`
`32`	`32`	`$this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+ public function testNotSerializableContext()`
	`36`	`+ {`
	`37`	`+ $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array('foo' => function () {})));`
	`38`	`+ }`
`34`	`39`	`}`