Updating converter to work with additional test

markwilson · Jul 17, 2014 · 827691f · 827691f
1 parent 409bffd
commit 827691f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/MarkWilson/XmlToJson/Tests/XmlToJsonConverterTest.php b/src/MarkWilson/XmlToJson/Tests/XmlToJsonConverterTest.php
@@ -46,8 +46,8 @@ public function getConvertData()
                 '{"Metadata":{"SubscriptionCreate":{"-url":"http:\/\/www.google.com\/home#anchor"},"SubscriptionValidate":{"-url":"https:\/\/yahoo.com\/login","-required":"N"},"Studio":{"-email":"studio@gmail.com","-phone":"020 7607 3200"}}}'
             ],
             [
-                '<Main><Sub><Child demo="something" another="something else" /><Child demo="something" another="something else" /><Child demo="something" another="something else" /></Sub></Main>',
-                '{"Main":{"Sub":{"Child":[{"-demo": "something,"-another":"something else"},{"-demo": "something,"-another":"something else"},{"-demo": "something,"-another":"something else"}]}}}'
+                '<Main><Child demo="something" another="something else" /><Child demo="something" another="something else" /><Child demo="something" another="something else" /></Main>',
+                '{"Main":{"Child":[{"-demo":"something","-another":"something else"},{"-demo":"something","-another":"something else"},{"-demo":"something","-another":"something else"}]}}'
             ]
         ];
     }

diff --git a/src/MarkWilson/XmlToJson/XmlToJsonConverter.php b/src/MarkWilson/XmlToJson/XmlToJsonConverter.php
@@ -55,7 +55,13 @@ private function getData(\SimpleXMLElement $xml)
                         $data[$key] = array($data[$key], $childData);
                     }
                 } else {
-                    $data[$key] = $childData;
+                    $data[$key] = array($childData);
+                }
+            }
+
+            foreach ($data as $key => $value) {
+                if (is_array($value) && count($value) === 1) {
+                    $data[$key] = $value[0];
                 }
             }
         } else {