[PropertyInfo] PSR-6 cache

dunglas · dunglas · commit 335381b18678 · 2016-01-26T13:05:31.000+01:00
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
@@ -112,22 +112,41 @@ private function extract($method, array $arguments)
             return $this->arrayCache[$key];
         }
 
-        if ($value = $this->cacheItemPool->getItem($key)) {
-            return $this->arrayCache[$key] = $value;
+        $item = $this->cacheItemPool->getItem($key);
+
+        if ($item->isHit()) {
+            return $this->arrayCache[$key] = $item->get();
         }
 
         $value = call_user_func_array(array($this->propertyInfoExtractor, $method), $arguments);
-        $this->cacheItemPool->save($key, $value);
+        $item->set($value);
+        $this->cacheItemPool->save($item);
 
         return $this->arrayCache[$key] = $value;
     }
 
+    /**
+     * Escapes a key according to PSR-6.
+     *
+     * Replaces characters forbidden by PSR-6 and the _ char by the _ char followed by the ASCII
+     * code of the escaped char.
+     *
+     * @param string $key
+     *
+     * @return string
+     */
     private function escape($key)
     {
-        str_replace(
-            array('_', '{', '}', '(', ')', '/', '\\', '@', ':'),
-            array('_95', '_123', '_125', '_40', '_41', '_47', '_92', '_64', '_58'),
-            $key
-        );
+        return strtr($key, array(
+            '{' => '_123',
+            '}' => '_125',
+            '(' => '_40',
+            ')' => '_41',
+            '/' => '_47',
+            '\\' => '_92',
+            '@' => '_64',
+            ':' => '_58',
+            '_' => '_95',
+        ));
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoCacheExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoCacheExtractorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\PropertyInfo\Tests;
 
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\PropertyInfo\PropertyInfoCacheExtractor;
 
 /**
@@ -22,7 +23,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->propertyInfo = new PropertyInfoCacheExtractor($this->propertyInfo, new ArrayCac);
+        $this->propertyInfo = new PropertyInfoCacheExtractor($this->propertyInfo, new ArrayAdapter());
     }
 
     public function testCache()
@@ -36,18 +37,28 @@ public function testNotSerializableContext()
         $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array('foo' => function () {})));
     }
 
-    public function testEscape()
+    /**
+     * @dataProvider escapeDataProvider
+     */
+    public function testEscape($toEscape, $expected)
     {
         $reflectionMethod = new \ReflectionMethod($this->propertyInfo, 'escape');
         $reflectionMethod->setAccessible(true);
 
-        $this->assertSame('foo_bar', $this->propertyInfo->escape('foo_95bar'));
-        $this->assertSame('foo_95bar', $this->propertyInfo->escape('foo_9595bar'));
-        $this->assertSame('foo{bar}', $this->propertyInfo->escape('foo_123bar_125'));
-        $this->assertSame('foo(bar)', $this->propertyInfo->escape('foo_40bar_41'));
-        $this->assertSame('foo/bar', $this->propertyInfo->escape('foo_47bar'));
-        $this->assertSame('foo\bar', $this->propertyInfo->escape('foo_92bar'));
-        $this->assertSame('foo@bar', $this->propertyInfo->escape('foo_64bar'));
-        $this->assertSame('foo:bar', $this->propertyInfo->escape('foo_58bar'));
+        $this->assertSame($expected, $reflectionMethod->invoke($this->propertyInfo, $toEscape));
+    }
+
+    public function escapeDataProvider()
+    {
+        return array(
+            array('foo_bar', 'foo_95bar'),
+            array('foo_95bar', 'foo_9595bar'),
+            array('foo{bar}', 'foo_123bar_125'),
+            array('foo(bar)', 'foo_40bar_41'),
+            array('foo/bar', 'foo_47bar'),
+            array('foo\bar', 'foo_92bar'),
+            array('foo@bar', 'foo_64bar'),
+            array('foo:bar', 'foo_58bar'),
+        );
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -27,15 +27,15 @@
     },
     "require-dev": {
         "symfony/serializer": "~2.8|~3.0",
+        "symfony/cache": "~3.1",
         "phpdocumentor/reflection": "^1.0.7",
         "doctrine/annotations": "~1.0",
-        "doctrine/cache": "~1.0"
     },
     "conflict": {
         "phpdocumentor/reflection": "<1.0.7"
     },
     "suggest": {
-        "doctrine/cache": "To cache results",
+        "symfony/cache": "To cache results",
         "symfony/doctrine-bridge": "To use Doctrine metadata",
         "phpdocumentor/reflection": "To use the PHPDoc",
         "symfony/serializer": "To use Serializer metadata"
