Merge pull request #11 from mente/opt-key-generator

ability to redefine key generator as service
EmanueleMinotto · Apr 5, 2016 · 37aa9e1 · 37aa9e1
2 parents 956f497 + dd7ddd7
commit 37aa9e1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -35,6 +35,11 @@ public function getConfigTreeBuilder()
                     ->cannotBeEmpty()
                     ->defaultValue('twig_cache.strategy')
                 ->end()
+                ->scalarNode('key_generator')
+                    ->cannotBeEmpty()
+                    ->defaultValue('twig_cache.strategy.spl_object_hash_key_generator')
+                    ->info('service id that implements KeyGeneratorInterface to generate a key for template cache')
+                ->end()
             ->end();
 
         return $treeBuilder;

diff --git a/DependencyInjection/TwigCacheExtension.php b/DependencyInjection/TwigCacheExtension.php
@@ -31,6 +31,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $config);
 
         $container->setAlias('twig_cache.service', $config['service']);
+        $container->setAlias('twig_cache.strategy.key_generator', $config['key_generator']);
 
         $loader = new Loader\XmlFileLoader(
             $container,

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -25,7 +25,7 @@
         </service>
         <service class="%twig_cache.strategy.generational.class%" id="twig_cache.strategy.generational">
             <argument id="twig_cache.adapter" type="service"/>
-            <argument id="twig_cache.strategy.spl_object_hash_key_generator" type="service"/>
+            <argument id="twig_cache.strategy.key_generator" type="service"/>
         </service>
         <service class="%twig_cache.strategy.lifetime.class%" id="twig_cache.strategy.lifetime">
             <argument id="twig_cache.adapter" type="service"/>

diff --git a/Resources/doc/configuration-reference.rst b/Resources/doc/configuration-reference.rst
@@ -7,4 +7,5 @@ Default Bundle Configuration
     twig_cache:
         profiler: '%kernel.debug%'
         service: # required
-        strategy: twig_cache.strategy
+        strategy: twig_cache.strategy
+        key_generator: twig_cache.strategy.spl_object_hash_key_generator
diff --git a/Tests/DependencyInjection/TwigCacheExtensionTest.php b/Tests/DependencyInjection/TwigCacheExtensionTest.php
@@ -42,6 +42,7 @@ public function testService()
     {
         $this->assertContainerBuilderHasService('twig_cache.extension');
         $this->assertContainerBuilderHasService('twig_cache.service');
+        $this->assertContainerBuilderHasService('twig_cache.strategy.key_generator');
     }
 
     /**