bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)

fabpot · fabpot · commit f24690e493ec · 2015-12-26T13:02:10.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Config] Fix array sort on normalization in edge case | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- eca41a8 [Config] Fix array sort on normalization in edge case
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -75,14 +75,17 @@ protected function preNormalize($value)
             return $value;
         }
 
+        $normalized = array();
+
         foreach ($value as $k => $v) {
             if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) {
-                $value[$normalizedKey] = $v;
-                unset($value[$k]);
+                $normalized[$normalizedKey] = $v;
+            } else {
+                $normalized[$k] = $v;
             }
         }
 
-        return $value;
+        return $normalized;
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
@@ -74,6 +74,10 @@ public function getPreNormalizationTests()
                 array('foo-bar_moo' => 'foo'),
                 array('foo-bar_moo' => 'foo'),
             ),
+            array(
+                array('anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'),
+                array('anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'),
+            ),
             array(
                 array('foo-bar' => null, 'foo_bar' => 'foo'),
                 array('foo-bar' => null, 'foo_bar' => 'foo'),

Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,17 @@ protected function preNormalize($value)`
`75`	`75`	`return $value;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ $normalized = array();`
	`79`	`+`
`78`	`80`	`foreach ($value as $k => $v) {`
`79`	`81`	`if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) {`
`80`		`- $value[$normalizedKey] = $v;`
`81`		`- unset($value[$k]);`
	`82`	`+ $normalized[$normalizedKey] = $v;`
	`83`	`+ } else {`
	`84`	`+ $normalized[$k] = $v;`
`82`	`85`	`}`
`83`	`86`	`}`
`84`	`87`
`85`		`- return $value;`
	`88`	`+ return $normalized;`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`/**`