massage https://github.com/gaarf/XML-string-to-PHP-array/pull/1.patch

gaarf · gaarf · commit 1e539d6ee41c · 2012-02-27T22:24:58.000-08:00
diff --git a/test.sh b/test.sh
@@ -13,11 +13,18 @@ function prettyPrint($title, $thing)
 $xmlstr = <<<EOD
   <tv>
     <show name="Family Guy">
-      <dog type="beagle">Brian</dog>
+      <dog>Brian</dog>
       <kid>Chris</kid>
       <kid>Meg</kid>
       <kid><![CDATA[<em>Stewie</em>]]></kid>
     </show>
+    <show name="American Dad!">
+      <pet type="fish">Klaus</pet>
+      <alien nick="The Decider">
+        <persona>Roger Smith</persona>
+        <persona>Sidney Huffman</persona>
+      </alien>
+    </show>
     <show name="Edge Cases" zero="0" empty="">
       <empty></empty>
       <foo empty=""></foo>
@@ -30,14 +37,7 @@ $expected = array(
   "show" => array(
 
     array(
-      "dog" => array(
-      	array(
-				"dog"=>"Brian",
-				"@attributes" => array(
-					"type"=>"beagle"
-				)
-			)
-	  ),
+      "dog" => 'Brian',
       "kid" => array(
         "Chris",
         "Meg",
@@ -46,6 +46,21 @@ $expected = array(
       "@attributes" => array( "name" => "Family Guy" )
     ),
 
+    array(
+      'pet' => array(
+        "@content" => 'Klaus',
+        "@attributes" => array( "type" => "fish" )
+      ),
+      'alien' => array(
+        'persona' => array(
+          'Roger Smith',
+          'Sidney Huffman'
+        ),
+        "@attributes" => array( "nick" => "The Decider" )
+      ),
+      "@attributes" => array( "name" => "American Dad!" )
+    ),
+
     array(
       "empty" => array(),
       "foo" => array(
diff --git a/xmlstr_to_array.php b/xmlstr_to_array.php
@@ -16,7 +16,6 @@ function xmlstr_to_array($xmlstr) {
 }
 
 function domnode_to_array($node) {
-  $alt = false; //Flag for regular output 
   $output = array();
   switch ($node->nodeType) {
 
@@ -41,22 +40,15 @@ function domnode_to_array($node) {
         }
       }
       if($node->attributes->length && !is_array($output)) { //Has attributes but isn't an array
-        $a = array();
-        $nodeName =  $node->nodeName;
-        $output = array(0=>array($nodeName=>$output)); //Change output into an array.
-        $alt = true; //Change the output
+        $output = array('@content'=>$output); //Change output into an array.
       }
       if(is_array($output)) {
         if($node->attributes->length) {
           $a = array();
           foreach($node->attributes as $attrName => $attrNode) {
             $a[$attrName] = (string) $attrNode->value;
           }
-          if($alt){
-     						 $output[0]['@attributes'] = $a; //Add as an array for consistency
-    						}else{
-    							 $output['@attributes'] = $a;
-    						}
+          $output['@attributes'] = $a;
         }
         foreach ($output as $t => $v) {
           if(is_array($v) && count($v)==1 && $t!='@attributes') {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ function xmlstr_to_array($xmlstr) {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`function domnode_to_array($node) {`
`19`		`- $alt = false; //Flag for regular output`
`20`	`19`	`$output = array();`
`21`	`20`	`switch ($node->nodeType) {`
`22`	`21`
`@@ -41,22 +40,15 @@ function domnode_to_array($node) {`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`	`if($node->attributes->length && !is_array($output)) { //Has attributes but isn't an array`
`44`		`- $a = array();`
`45`		`- $nodeName = $node->nodeName;`
`46`		`- $output = array(0=>array($nodeName=>$output)); //Change output into an array.`
`47`		`- $alt = true; //Change the output`
	`43`	`+ $output = array('@content'=>$output); //Change output into an array.`
`48`	`44`	`}`
`49`	`45`	`if(is_array($output)) {`
`50`	`46`	`if($node->attributes->length) {`
`51`	`47`	`$a = array();`
`52`	`48`	`foreach($node->attributes as $attrName => $attrNode) {`
`53`	`49`	`$a[$attrName] = (string) $attrNode->value;`
`54`	`50`	`}`
`55`		`- if($alt){`
`56`		`- $output[0]['@attributes'] = $a; //Add as an array for consistency`
`57`		`- }else{`
`58`		`- $output['@attributes'] = $a;`
`59`		`- }`
	`51`	`+ $output['@attributes'] = $a;`
`60`	`52`	`}`
`61`	`53`	`foreach ($output as $t => $v) {`
`62`	`54`	`if(is_array($v) && count($v)==1 && $t!='@attributes') {`