[FrameworkBundle] Allow custom services for validator mapping cache.

jakzal · jakzal · commit 4cdcf109d3a0 · 2014-12-13T20:05:40.000Z
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -442,7 +442,12 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                     ->info('validation configuration')
                     ->canBeEnabled()
                     ->children()
-                        ->scalarNode('cache')->end()
+                        ->scalarNode('cache')
+                            ->beforeNormalization()
+                                // Can be removed in 3.0, once ApcCache support is dropped
+                                ->ifString()->then(function ($v) { return 'apc' === $v ? 'validator.mapping.cache.apc' : $v; })
+                            ->end()
+                        ->end()
                         ->booleanNode('enable_annotations')->defaultFalse()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(array('loadValidatorMetadata'))
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -716,7 +716,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
                 'validator_'.hash('sha256', $container->getParameter('kernel.root_dir'))
             );
 
-            $validatorBuilder->addMethodCall('setMetadataCache', array(new Reference('validator.mapping.cache.'.$config['cache'])));
+            $validatorBuilder->addMethodCall('setMetadataCache', array(new Reference($config['cache'])));
         }
 
         switch ($config['api']) {

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`716`	`716`	`'validator_'.hash('sha256', $container->getParameter('kernel.root_dir'))`
`717`	`717`	`);`
`718`	`718`
`719`		`- $validatorBuilder->addMethodCall('setMetadataCache', array(new Reference('validator.mapping.cache.'.$config['cache'])));`
	`719`	`+ $validatorBuilder->addMethodCall('setMetadataCache', array(new Reference($config['cache'])));`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`switch ($config['api']) {`