Skip to content
Permalink
Browse files

Fixing Xml::toArray() when blank nodes are provided. Fixes #87.

  • Loading branch information...
renan committed Sep 22, 2009
1 parent 06fb86f commit 7116c016420619938151ed03d63f175cac791702
Showing with 25 additions and 4 deletions.
  1. +3 −4 cake/libs/xml.php
  2. +22 −0 cake/tests/cases/libs/xml.test.php
@@ -672,7 +672,6 @@ function toArray($camelize = true) {
continue;
} elseif (isset($child->children[0]) && is_a($child->children[0], 'XmlTextNode')) {
$value = $child->children[0]->value;
if ($child->attributes) {
$value = array_merge(array('value' => $value), $child->attributes);
}
@@ -688,10 +687,10 @@ function toArray($camelize = true) {
continue;
} elseif (count($child->children) === 0 && $child->value == '') {
$value = $child->attributes;
if (isset($out[$child->name]) || isset($multi[$key])) {
if (isset($out[$key]) || isset($multi[$key])) {
if (!isset($multi[$key])) {
$multi[$key] = array($out[$child->name]);
unset($out[$child->name]);
$multi[$key] = array($out[$key]);
unset($out[$key]);
}
$multi[$key][] = $value;
} elseif (!empty($value)) {
@@ -1188,7 +1188,29 @@ function testToArray() {
)
)
));
$this->assertEqual($result, $expected);
$text = '<?xml version="1.0" encoding="UTF-8"?>
<root>
<child id="1" other="1" />
<child id="2" other="1" />
<child id="3" other="1" />
<child id="4" other="1" />
<child id="5" other="1" />
</root>';
$xml = new Xml($text);
$result = $xml->toArray();
$expected = array(
'Root' => array(
'Child' => array(
array('id' => 1, 'other' => 1),
array('id' => 2, 'other' => 1),
array('id' => 3, 'other' => 1),
array('id' => 4, 'other' => 1),
array('id' => 5, 'other' => 1)
)
)
);
$this->assertEqual($result, $expected);
}
/**

0 comments on commit 7116c01

Please sign in to comment.
You can’t perform that action at this time.