Fix bugs

- Remove comments - Fix bugs when collect namespaces
JackieDo · Nov 28, 2018 · e1396f1 · e1396f1
1 parent f0a0c22
commit e1396f1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Xml2Array.php b/src/Xml2Array.php
@@ -268,7 +268,7 @@ protected function parseChildNodes(DOMNode $node, $output)
                             $output = $value;
                         }
                     }
-                } else {
+                } elseif ($child->nodeType !== XML_COMMENT_NODE) {
                     $nodeName = $child->nodeName;
 
                     if (!isset($output[$nodeName])) {
@@ -367,7 +367,9 @@ protected function collectAttributes(DOMNode $node, $output)
             }
         }
 
-        $output[$this->config['attributesKey']] = array_merge($attributes, $namespaces);
+        foreach (array_merge($attributes, $namespaces) as $key => $value) {
+            $output[$this->config['attributesKey']][$key] = $value;
+        }
 
         return $output;
     }