diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php index 40982a5debb5..5fd2002bed5f 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php @@ -76,7 +76,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode) ->fixXmlConfig('global') ->children() ->arrayNode('globals') - ->keepKeys() + ->normalizeKeys(false) ->useAttributeAsKey('key') ->example(array('foo' => '"@bar"', 'pi' => 3.14)) ->prototype('array') @@ -127,7 +127,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode) ->scalarNode('auto_reload')->end() ->scalarNode('optimizations')->end() ->arrayNode('paths') - ->keepKeys() + ->normalizeKeys(false) ->beforeNormalization() ->always() ->then(function ($paths) { diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index 18065b26b488..1478ca1403ef 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -4,7 +4,7 @@ CHANGELOG 2.2.0 ----- - * added a `keepKeys()` method for array nodes (to avoid key normalization) + * added a `normalizeKeys()` method for array nodes (to avoid key normalization) * added numerical type handling for config definitions * added convenience methods for optional configuration sections to ArrayNodeDefinition * added a utils class for XML manipulations diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index b6b976d255d8..d0d97ff02c2f 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -284,13 +284,15 @@ public function ignoreExtraKeys() } /** - * Disables key normalization. + * Sets key normalization. + * + * @param Boolean $bool Whether to enable key normalization * * @return ArrayNodeDefinition */ - public function keepKeys() + public function normalizeKeys($bool) { - $this->normalizeKeys = false; + $this->normalizeKeys = (Boolean) $bool; return $this; }