[Config] renamed keepKeys() to normalizeKeys() (refs symfony#6367)

fabpot · fabpot · commit 8df9b7a2de8d · 2012-12-16T17:56:50.000+01:00
diff --git 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
@@ -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
@@ -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;
     }

Original file line number	Diff line number	Diff line change
`@@ -284,13 +284,15 @@ public function ignoreExtraKeys()`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`/**`
`287`		`- * Disables key normalization.`
	`287`	`+ * Sets key normalization.`
	`288`	`+ *`
	`289`	`+ * @param Boolean $bool Whether to enable key normalization`
`288`	`290`	`*`
`289`	`291`	`* @return ArrayNodeDefinition`
`290`	`292`	`*/`
`291`		`- public function keepKeys()`
	`293`	`+ public function normalizeKeys($bool)`
`292`	`294`	`{`
`293`		`- $this->normalizeKeys = false;`
	`295`	`+ $this->normalizeKeys = (Boolean) $bool;`
`294`	`296`
`295`	`297`	`return $this;`
`296`	`298`	`}`