Changing to Xml::toArray() return @ after attributes to dont conflict…

… with tags with same name.
cakephp · Aug 23, 2010 · 9611ab1 · 9611ab1
1 parent 527446a
commit 9611ab1
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 6 deletions.
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
@@ -136,7 +136,7 @@ protected static function _toArray($xml, &$parentData, $namespaces) {
 
 		foreach ($namespaces as $namespace) {
 			foreach ($xml->attributes($namespace, true) as $key => $value) {
-				$data[$key] = (string)$value;
+				$data['@' . $key] = (string)$value;
 			}
 
 			foreach ($xml->children($namespace, true) as $child) {

diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
@@ -256,6 +256,22 @@ function testToArray() {
 		$xml = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$expected = array(
+			'tags' => array(
+				'tag' => array(
+					array(
+						'@id' => '1',
+						'name' => 'defect'
+					),
+					array(
+						'@id' => '2',
+						'name' => 'enhancement'
+					)
+				)
+			)
+		);
+		$this->assertEqual(Xml::toArray($obj), $expected);
+
+		$array = array(
 			'tags' => array(
 				'tag' => array(
 					array(
@@ -269,11 +285,25 @@ function testToArray() {
 				)
 			)
 		);
-		$this->assertEqual(Xml::toArray($obj), $expected);
-		$this->assertEqual(Xml::toArray(Xml::fromArray($expected)), $expected);
-		$this->assertEqual(Xml::toArray(Xml::fromArray($expected, 'tags')), $expected);
+		$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'tags')), $array);
 
 		$expected = array(
+			'tags' => array(
+				'tag' => array(
+					array(
+						'@id' => '1',
+						'@name' => 'defect'
+					),
+					array(
+						'@id' => '2',
+						'@name' => 'enhancement'
+					)
+				)
+			)
+		);
+		$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $expected);
+
+		$array = array(
 			'tags' => array(
 				'tag' => array(
 					'id' => '1',
@@ -289,7 +319,23 @@ function testToArray() {
 				)
 			)
 		);
-		$this->assertEqual(Xml::toArray(Xml::fromArray($expected)), $expected);
+		$expected = array(
+			'tags' => array(
+				'tag' => array(
+					'@id' => '1',
+					'posts' => array(
+						array('@id' => '1'),
+						array('@id' => '2')
+					)
+				),
+				'tagOther' => array(
+					'subtag' => array(
+						'@id' => '1'
+					)
+				)
+			)
+		);
+		$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $expected);
 
 		$xml = '<root>';
 		$xml .= '<tag id="1">defect</tag>';
@@ -299,7 +345,7 @@ function testToArray() {
 		$expected = array(
 			'root' => array(
 				'tag' => array(
-					'id' => 1,
+					'@id' => 1,
 					'value' => 'defect'
 				)
 			)