adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing the read for toArray of content when have child or attribute in xml.

Browse source
This commit is contained in:
Juan Basso 2010-07-28 18:53:36 -03:00
parent 8f1bdd5378
commit f4d5230dfa
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/xml.php
View file

@ -140,8 +140,11 @@ class Xml {
self::_toArray($child, $data);
}
$asString = trim((string)$xml);
if (empty($data)) {
$data = (string)$xml;
$data = $asString;
} elseif (!empty($asString)) {
$data['value'] = $asString;
}
$name = $xml->getName();

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

@ -291,6 +291,21 @@ class XmlTest extends CakeTestCase {
);
$this->assertEqual(Xml::toArray(Xml::fromArray($expected)), $expected);
$xml = '<root>';
$xml .= '<tag id="1">defect</tag>';
$xml .= '</root>';
$obj = Xml::build($xml);
$expected = array(
'root' => array(
'tag' => array(
'id' => 1,
'value' => 'defect'
)
)
);
$this->assertEqual(Xml::toArray($obj), $expected);
$xml = '<root>';
$xml .= '<table xmlns="http://www.w3.org/TR/html4/"><tr><td>Apples</td><td>Bananas</td></tr></table>';
$xml .= '<table xmlns="http://www.cakephp.org"><name>CakePHP</name><license>MIT</license></table>';