fix 5528 let ArrayNode::normalizeValue respect order of value array p…

…rovided
symfony · Dec 17, 2013 · bee06e9 · bee06e9
1 parent 8b7d0e8
commit bee06e9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -303,9 +303,9 @@ protected function normalizeValue($value)
         $value = $this->remapXml($value);
 
         $normalized = array();
-        foreach ($this->children as $name => $child) {
-            if (array_key_exists($name, $value)) {
-                $normalized[$name] = $child->normalize($value[$name]);
+        foreach ($value as $name => $val) {
+            if (isset($this->children[$name])) {
+                $normalized[$name] = $this->children[$name]->normalize($val);
                 unset($value[$name]);
             }
         }

diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
@@ -129,4 +129,33 @@ public function getZeroNamedNodeExamplesData()
             ),
         );
     }
+
+    /**
+     * @dataProvider getPreNormalizedNormalizedOrderedData
+     */
+    public function testChildrenOrderIsMaintainedOnNormalizeValue($prenormalized, $normalized)
+    {
+        $scalar1 = new ScalarNode('1');
+        $scalar2 = new ScalarNode('2');
+        $scalar3 = new ScalarNode('3');
+        $node = new ArrayNode('foo');
+        $node->addChild($scalar1);
+        $node->addChild($scalar3);
+        $node->addChild($scalar2);
+
+        $r = new \ReflectionMethod($node, 'normalizeValue');
+        $r->setAccessible(true);
+
+        $this->assertSame($normalized, $r->invoke($node, $prenormalized));
+    }
+
+    public function getPreNormalizedNormalizedOrderedData()
+    {
+        return array(
+            array(
+                array('2' => 'two', '1' => 'one', '3' => 'three'),
+                array('2' => 'two', '1' => 'one', '3' => 'three'),
+            ),
+        );
+    }
 }