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

Changing the default format of fromArray from attributes to tags.

Browse source
This commit is contained in:
Juan Basso 2010-09-06 23:11:45 -03:00
parent 87604f92c7
commit 5f902d42e0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/xml.php
View file

@ -106,7 +106,7 @@ class Xml {
* @param string $format If create childs ('tags') or attributes ('attribute').
* @return object SimpleXMLElement
*/
public static function fromArray($input, $format = 'attribute') {
public static function fromArray($input, $format = 'tags') {
if (!is_array($input) || count($input) !== 1) {
throw new Exception(__('Invalid input.'));
}

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

@ -115,14 +115,14 @@ class XmlTest extends CakeTestCase {
)
)
);
$obj = Xml::fromArray($xml);
$obj = Xml::fromArray($xml, 'attributes');
$this->assertTrue($obj instanceof SimpleXMLElement);
$this->assertEqual($obj->getName(), 'tags');
$this->assertEqual(count($obj), 2);
$xmlText = '<' . '?xml version="1.0"?><tags><tag id="1" name="defect"/><tag id="2" name="enhancement"/></tags>';
$this->assertEqual(str_replace(array("\r", "\n"), '', $obj->asXML()), $xmlText);
$obj = Xml::fromArray($xml, 'tags');
$obj = Xml::fromArray($xml);
$this->assertTrue($obj instanceof SimpleXMLElement);
$this->assertEqual($obj->getName(), 'tags');
$this->assertEqual(count($obj), 2);
@ -202,7 +202,7 @@ class XmlTest extends CakeTestCase {
)
)
);
$obj = Xml::fromArray($xml);
$obj = Xml::fromArray($xml, 'attributes');
$xmlText = '<' . '?xml version="1.0"?><tags><tag id="1">defect</tag></tags>';
$this->assertEqual(str_replace(array("\r", "\n"), '', $obj->asXML()), $xmlText);
}
@ -318,8 +318,8 @@ class XmlTest extends CakeTestCase {
)
)
);
$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'tags')), $array);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $array);
$array = array(
'tags' => array(
@ -353,7 +353,7 @@ class XmlTest extends CakeTestCase {
)
)
);
$this->assertEqual(Xml::toArray(Xml::fromArray($array)), $expected);
$this->assertEqual(Xml::toArray(Xml::fromArray($array, 'attributes')), $expected);
$xml = '<root>';
$xml .= '<tag id="1">defect</tag>';