bug #16795 [FrameworkBundle][Validator] Fix apc cache service & config (ogizanagi)

fabpot · fabpot · commit dd4acae867a8 · 2016-01-25T19:30:14.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- [FrameworkBundle][Validator] Fix apc cache service & config | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16793 | License | MIT | Doc PR | - _Keep track of #16794 (comment) _NOTE_: This PR is on standby. If #16822 is merged, this one might probably be closed, as everything will be done during the merge. Commits ------- 94a1728 [FrameworkBundle][Validator] Fix apc cache service & config
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -454,20 +454,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                     ->info('validation configuration')
                     ->canBeEnabled()
                     ->children()
-                        ->scalarNode('cache')
-                            ->beforeNormalization()
-                                // Can be removed in 3.0, once ApcCache support is dropped
-                                ->ifString()->then(function ($v) {
-                                    if ('apc' === $v) {
-                                        @trigger_error('The ability to pass "apc" as the framework.validation.cache configuration key value is deprecated since version 2.8 and will be removed in 3.0. Use the "validator.mapping.cache.doctrine.apc" service id instead.', E_USER_DEPRECATED);
-
-                                        return 'validator.mapping.cache.apc';
-                                    }
-
-                                    return $v;
-                                })
-                            ->end()
-                        ->end()
+                        ->scalarNode('cache')->end()
                         ->booleanNode('enable_annotations')->defaultFalse()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(array('loadValidatorMetadata'))
