Fix duplicated keys in nested XML array

Author: z38

src/Util/XML.php

@@ -222,17 +222,20 @@ public static function xmlToVariable(DOMElement $element)
             case 'array':
                 $variable = array();
 
-                foreach ($element->getElementsByTagName('element') as $element) {
-                    $item = $element->childNodes->item(0);
+                foreach ($element->childNodes as $entry) {
+                    if (!$entry instanceof DOMElement || $entry->tagName !== 'element') {
+                        continue;
+                    }
+                    $item = $entry->childNodes->item(0);
 
                     if ($item instanceof DOMText) {
-                        $item = $element->childNodes->item(1);
+                        $item = $entry->childNodes->item(1);
                     }
 
                     $value = self::xmlToVariable($item);
 
-                    if ($element->hasAttribute('key')) {
-                        $variable[(string) $element->getAttribute('key')] = $value;
+                    if ($entry->hasAttribute('key')) {
+                        $variable[(string) $entry->getAttribute('key')] = $value;
                     } else {
                         $variable[] = $value;
                     }

tests/Util/XMLTest.php

@@ -342,4 +342,22 @@ public function testLoadBoolean()
     {
         PHPUnit_Util_XML::load(false);
     }
+
+    public function testNestedXmlToVariable()
+    {
+        $xml = '<array><element key="a"><array><element key="b"><string>foo</string></element></array></element><element key="c"><string>bar</string></element></array>';
+        $dom = new DOMDocument();
+        $dom->loadXML($xml);
+
+        $expected = [
+            'a' => [
+                'b' => 'foo',
+            ],
+            'c' => 'bar',
+        ];
+
+        $actual = PHPUnit_Util_XML::xmlToVariable($dom->documentElement);
+
+        $this->assertSame($expected, $actual);
+    }
 }