adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed.

Browse source
This commit is contained in:
Ceeram 2012-05-23 11:39:02 +02:00
parent 0bfcd49249
commit 25c7a27495
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/Cake/Test/Case/View/XmlViewTest.php
View file

@ -43,9 +43,27 @@ class XmlViewTest extends CakeTestCase {
$View = new XmlView($Controller); $View = new XmlView($Controller);
$output = $View->render(false); $output = $View->render(false);
$expected = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<users><user>user1</user><user>user2</user></users>'; $this->assertSame(Xml::build($data)->asXML(), $output);
$this->assertTextEquals($expected, trim($output)); $this->assertSame('application/xml', $Response->type());
$this->assertIdentical('application/xml', $Response->type());
$data = array(
array(
'User' => array(
'username' => 'user1'
)
),
array(
'User' => array(
'username' => 'user2'
)
)
);
$Controller->set(array('users' => $data, '_serialize' => 'users'));
$View = new XmlView($Controller);
$output = $View->render(false);
$expected = Xml::build(array('response'=> array('users'=> $data)))->asXML();
$this->assertSame($expected, $output);
} }
/** /**
@ -100,9 +118,12 @@ class XmlViewTest extends CakeTestCase {
$View = new XmlView($Controller); $View = new XmlView($Controller);
$output = $View->render('index'); $output = $View->render('index');
$expected = '<?xml version="1.0" encoding="UTF-8"?><users><user>user1</user><user>user2</user></users>'; $expected = array(
$this->assertIdentical($expected, str_replace(array("\r", "\n"), '', $output)); 'users'=> array('user'=> array('user1', 'user2'))
$this->assertIdentical('application/xml', $Response->type()); );
$expected = Xml::build($expected)->asXML();
$this->assertSame($expected, $output);
$this->assertSame('application/xml', $Response->type());
$this->assertInstanceOf('HelperCollection', $View->Helpers); $this->assertInstanceOf('HelperCollection', $View->Helpers);
} }

11
lib/Cake/View/XmlView.php
View file

@ -26,7 +26,7 @@ App::uses('Xml', 'Utility');
* *
* `$this->set(array('posts' => $posts, '_serialize' => 'posts'));` * `$this->set(array('posts' => $posts, '_serialize' => 'posts'));`
* *
* When the view is rendered, the `$posts` view variable will be serialized * When the view is rendered, the `$posts` view variable will be serialized
* into XML. * into XML.
* *
* **Note** The view variable you specify must be compatible with Xml::fromArray(). * **Note** The view variable you specify must be compatible with Xml::fromArray().
@ -38,7 +38,7 @@ App::uses('Xml', 'Utility');
* $this->set(compact('posts', 'users', 'stuff')); * $this->set(compact('posts', 'users', 'stuff'));
* $this->set('_serialize', array('posts', 'users')); * $this->set('_serialize', array('posts', 'users'));
* }}} * }}}
* *
* The above would generate a XML object that looks like: * The above would generate a XML object that looks like:
* *
* `<response><posts>...</posts><users>...</users></response>` * `<response><posts>...</posts><users>...</users></response>`
@ -75,8 +75,8 @@ class XmlView extends View {
* Render a XML view. * Render a XML view.
* *
* Uses the special '_serialize' parameter to convert a set of * Uses the special '_serialize' parameter to convert a set of
* view variables into a XML response. Makes generating simple * view variables into a XML response. Makes generating simple
* XML responses very easy. You can omit the '_serialize' parameter, * XML responses very easy. You can omit the '_serialize' parameter,
* and use a normal view + layout as well. * and use a normal view + layout as well.
* *
* @param string $view The view being rendered. * @param string $view The view being rendered.
@ -93,6 +93,9 @@ class XmlView extends View {
} }
} else { } else {
$data = isset($this->viewVars[$serialize]) ? $this->viewVars[$serialize] : null; $data = isset($this->viewVars[$serialize]) ? $this->viewVars[$serialize] : null;
if (is_array($data) && Set::numeric(array_keys($data))) {
$data = array('response' => array($serialize => $data));
}
} }
$content = Xml::fromArray($data)->asXML(); $content = Xml::fromArray($data)->asXML();
$this->Blocks->set('content', $content); $this->Blocks->set('content', $content);