adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support to DOMDocument/DOMNode in Xml::toArray().

Browse source
This commit is contained in:
Juan Basso 2010-09-12 11:25:37 -03:00
parent a006ee0019
commit 46f784f956
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cake/libs/xml.php
View file

@ -268,16 +268,19 @@ class Xml {
/** /**
* Returns this XML structure as a array. * Returns this XML structure as a array.
* *
* @param object $simpleXML SimpleXMLElement instance * @param object $obj SimpleXMLElement, DOMDocument or DOMNode instance
* @return array Array representation of the XML structure. * @return array Array representation of the XML structure.
*/ */
public static function toArray($simpleXML) { public static function toArray($obj) {
if (!($simpleXML instanceof SimpleXMLElement)) { if ($obj instanceof DOMNode) {
throw new Exception(__('The input is not instance of SimpleXMLElement.')); $obj = simplexml_import_dom($obj);
}
if (!($obj instanceof SimpleXMLElement)) {
throw new Exception(__('The input is not instance of SimpleXMLElement, DOMDocument or DOMNode.'));
} }
$result = array(); $result = array();
$namespaces = array_merge(array('' => ''), $simpleXML->getNamespaces(true)); $namespaces = array_merge(array('' => ''), $obj->getNamespaces(true));
self::_toArray($simpleXML, $result, '', array_keys($namespaces)); self::_toArray($obj, $result, '', array_keys($namespaces));
return $result; return $result;
} }

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

@ -360,7 +360,9 @@ class XmlTest extends CakeTestCase {
) )
); );
$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected); $this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, array('return' => 'domdocument', 'format' => 'attributes'))), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $array); $this->assertEqual(Xml::toArray(Xml::fromArray($array)), $array);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, array('return' => 'domdocument'))), $array);
$array = array( $array = array(
'tags' => array( 'tags' => array(
@ -395,6 +397,7 @@ class XmlTest extends CakeTestCase {
) )
); );
$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected); $this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, array('format' => 'attributes', 'return' => 'domdocument'))), $expected);
$xml = '<root>'; $xml = '<root>';
$xml .= '<tag id="1">defect</tag>'; $xml .= '<tag id="1">defect</tag>';