adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing failing tests.

Browse source
This commit is contained in:
mark_story 2011-05-04 23:08:10 -04:00
parent 695d38fe68
commit e857387a8e
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/CakeRequest.php
View file

@ -491,7 +491,7 @@ class CakeRequest implements ArrayAccess {
* @return The current object, you can chain this method.
*/
public function addParams($params) {
$this->params = array_merge($this->params, $params);
$this->params = array_merge($this->params, (array)$params);
return $this;
}

1
lib/Cake/tests/Case/Core/ObjectTest.php
View file

@ -822,7 +822,6 @@ class ObjectTest extends CakeTestCase {
$this->assertEqual($result->url, 'request_action/params_pass');
$this->assertEqual($result['controller'], 'request_action');
$this->assertEqual($result['action'], 'params_pass');
$this->assertEqual($result['form'], array());
$this->assertEqual($result['plugin'], null);
$result = $this->object->requestAction('/request_action/params_pass/sort:desc/limit:5');

2
lib/Cake/tests/Case/Routing/RouterTest.php
View file

@ -1275,7 +1275,7 @@ class RouterTest extends CakeTestCase {
$this->assertEqual($result, $expected);
$result = Router::parse('/posts.atom?hello=goodbye');
$expected = array('plugin' => null, 'controller' => 'posts.atom', 'action' => 'index', 'pass' => array(), 'named' => array(), 'url' => array('ext' => 'html'));
$expected = array('plugin' => null, 'controller' => 'posts.atom', 'action' => 'index', 'pass' => array(), 'named' => array());
$this->assertEqual($result, $expected);
Router::reload();