adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 02:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing to Xml::toArray() return @ after attributes to dont conflict with tags with same name.

Browse source
This commit is contained in:
Juan Basso 2010-08-23 00:24:56 -03:00
parent 527446a3d1
commit 9611ab1027
2 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/xml.php
View file

@ -136,7 +136,7 @@ class Xml {
foreach ($namespaces as $namespace) { foreach ($namespaces as $namespace) {
foreach ($xml->attributes($namespace, true) as $key => $value) { foreach ($xml->attributes($namespace, true) as $key => $value) {
$data[$key] = (string)$value; $data['@' . $key] = (string)$value;
} }
foreach ($xml->children($namespace, true) as $child) { foreach ($xml->children($namespace, true) as $child) {

56
cake/tests/cases/libs/xml.test.php
View file

@ -256,6 +256,22 @@ class XmlTest extends CakeTestCase {
$xml = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'sample.xml'; $xml = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'sample.xml';
$obj = Xml::build($xml); $obj = Xml::build($xml);
$expected = array( $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( 'tags' => array(
'tag' => array( 'tag' => array(
array( array(
@ -269,11 +285,25 @@ class XmlTest extends CakeTestCase {
) )
) )
); );
$this->assertEqual(Xml::toArray($obj), $expected); $this->assertEqual(Xml::toArray(Xml::fromArray($array, 'tags')), $array);
$this->assertEqual(Xml::toArray(Xml::fromArray($expected)), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($expected, 'tags')), $expected);
$expected = 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( 'tags' => array(
'tag' => array( 'tag' => array(
'id' => '1', 'id' => '1',
@ -289,7 +319,23 @@ class XmlTest extends CakeTestCase {
) )
) )
); );
$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 = '<root>';
$xml .= '<tag id="1">defect</tag>'; $xml .= '<tag id="1">defect</tag>';
@ -299,7 +345,7 @@ class XmlTest extends CakeTestCase {
$expected = array( $expected = array(
'root' => array( 'root' => array(
'tag' => array( 'tag' => array(
'id' => 1, '@id' => 1,
'value' => 'defect' 'value' => 'defect'
) )
) )