Fix a problem of tag values which is not taken into account

(when equal to zero) when passing an XML object to an array.
cakephp · May 7, 2013 · ca6612b · ca6612b
1 parent d01d291
commit ca6612b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -644,6 +644,16 @@ public function testToArray() {
 			)
 		);
 		$this->assertEquals($expected, Xml::toArray($obj));
+
+		$xml = '<tag type="myType">0</tag>';
+		$obj = Xml::build($xml);
+		$expected = array(
+			'tag' => array(
+				'@type' => 'myType',
+				'@' => 0
+			)
+		);
+		$this->assertEquals($expected, Xml::toArray($obj));
 	}
 
 /**

diff --git a/lib/Cake/Utility/Xml.php b/lib/Cake/Utility/Xml.php
@@ -360,7 +360,7 @@ protected static function _toArray($xml, &$parentData, $ns, $namespaces) {
 		$asString = trim((string)$xml);
 		if (empty($data)) {
 			$data = $asString;
-		} elseif (!empty($asString)) {
+		} elseif (strlen($asString) > 0) {
 			$data['@'] = $asString;
 		}