[FrameworkBundle] PropertyAccess cache support

dunglas · dunglas · commit 42ccf65b31fe · 2015-12-05T11:09:07.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -838,11 +838,22 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
     private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container)
     {
-        $container
+        $definition = $container
             ->getDefinition('property_accessor')
             ->replaceArgument(0, $config['magic_call'])
             ->replaceArgument(1, $config['throw_exception_on_invalid_index'])
         ;
+
+        if (isset($config['cache']) && $config['cache']) {
+            $container->setParameter(
+                'property_accessor.cache.prefix',
+                'property_accessor_'.hash('sha256', $container->getParameter('kernel.root_dir'))
+            );
+
+            $definition->replaceArgument(
+                2, new Reference($config['cache'])
+            );
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
@@ -4,10 +4,22 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
+    <parameters>
+        <parameter key="property_accessor.cache.prefix" />
+    </parameters>
+
     <services>
         <service id="property_accessor" class="Symfony\Component\PropertyAccess\PropertyAccessor" >
             <argument /> <!-- magicCall, set by the extension -->
             <argument /> <!-- throwExceptionOnInvalidIndex, set by the extension -->
+            <argument /> <!-- cache, set by the extension -->
+        </service>
+
+        <!-- Cache -->
+        <service id="property_accessor.cache.apc" class="Doctrine\Common\Cache\ApcCache" public="false">
+            <call method="setNamespace">
+                <argument>%property_accessor.cache.prefix%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
@@ -105,21 +105,21 @@ public function isExceptionOnInvalidIndexEnabled()
     }
 
     /**
-     * Uses a cache system.
+     * Sets a cache system.
      *
      * @param Cache|null $cache
      *
      * @return PropertyAccessorBuilder The builder object
      */
-    public function useCache(Cache $cache = null)
+    public function setCache(Cache $cache = null)
     {
         $this->cache = $cache;
 
         return $this;
     }
 
     /**
-     * Gets the cache system.
+     * Gets the used cache system.
      *
      * @return Cache|null
      */
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorBuilderTest.php
@@ -57,7 +57,7 @@ public function testGetPropertyAccessor()
     public function testUseCache()
     {
         $cache = new ArrayCache();
-        $this->builder->useCache($cache);
+        $this->builder->setCache($cache);
         $this->assertEquals($cache, $this->builder->getCache());
         $this->assertInstanceOf('Symfony\Component\PropertyAccess\PropertyAccessor', $this->builder->getPropertyAccessor());
     }

Original file line number	Diff line number	Diff line change
`@@ -105,21 +105,21 @@ public function isExceptionOnInvalidIndexEnabled()`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/**`
`108`		`- * Uses a cache system.`
	`108`	`+ * Sets a cache system.`
`109`	`109`	`*`
`110`	`110`	`* @param Cache\|null $cache`
`111`	`111`	`*`
`112`	`112`	`* @return PropertyAccessorBuilder The builder object`
`113`	`113`	`*/`
`114`		`- public function useCache(Cache $cache = null)`
	`114`	`+ public function setCache(Cache $cache = null)`
`115`	`115`	`{`
`116`	`116`	`$this->cache = $cache;`
`117`	`117`
`118`	`118`	`return $this;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/**`
`122`		`- * Gets the cache system.`
	`122`	`+ * Gets the used cache system.`
`123`	`123`	`*`
`124`	`124`	`* @return Cache\|null`
`125`	`125`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testGetPropertyAccessor()`
`57`	`57`	`public function testUseCache()`
`58`	`58`	`{`
`59`	`59`	`$cache = new ArrayCache();`
`60`		`- $this->builder->useCache($cache);`
	`60`	`+ $this->builder->setCache($cache);`
`61`	`61`	`$this->assertEquals($cache, $this->builder->getCache());`
`62`	`62`	`$this->assertInstanceOf('Symfony\Component\PropertyAccess\PropertyAccessor', $this->builder->getPropertyAccessor());`
`63`	`63`	`}`