fix cache pool wiring

xabbuh · xabbuh · commit fba8f64a0cc0 · 2016-03-11T09:48:42.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -59,6 +59,6 @@ public function process(ContainerBuilder $container)
 
     private function getNamespace($id)
     {
-        return substr(str_replace('/', '-', base64_encode(md5('symfony.'.$id, true)), 0, 10));
+        return substr(str_replace('/', '-', base64_encode(md5('symfony.'.$id, true))), 0, 10);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -560,15 +560,13 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('pool')
                             ->useAttributeAsKey('name')
                             ->prototype('array')
-                                ->beforeNormalization()
-                                ->end()
                                 ->children()
                                     ->enumNode('type')
                                         ->info('The cache pool type (one of "apcu", "doctrine", "psr6" or "filesystem")')
                                         ->isRequired()
                                         ->values(array('apcu', 'doctrine', 'psr6', 'filesystem'))
                                     ->end()
-                                    ->integerNode('default_lifetime')->default(0)->end()
+                                    ->integerNode('default_lifetime')->defaultValue(0)->end()
                                     ->scalarNode('cache_provider_service')->defaultNull()->end()
                                     ->scalarNode('directory')->defaultNull()->end()
                                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ public function process(ContainerBuilder $container)`
`59`	`59`
`60`	`60`	`private function getNamespace($id)`
`61`	`61`	`{`
`62`		`- return substr(str_replace('/', '-', base64_encode(md5('symfony.'.$id, true)), 0, 10));`
	`62`	`+ return substr(str_replace('/', '-', base64_encode(md5('symfony.'.$id, true))), 0, 10);`
`63`	`63`	`}`
`64`	`64`	`}`