diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index bbe5d0931..28ddeff95 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -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; } diff --git a/lib/Cake/tests/Case/Core/ObjectTest.php b/lib/Cake/tests/Case/Core/ObjectTest.php index a9729255d..8566057df 100644 --- a/lib/Cake/tests/Case/Core/ObjectTest.php +++ b/lib/Cake/tests/Case/Core/ObjectTest.php @@ -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'); diff --git a/lib/Cake/tests/Case/Routing/RouterTest.php b/lib/Cake/tests/Case/Routing/RouterTest.php index d80bb7f43..67e058080 100644 --- a/lib/Cake/tests/Case/Routing/RouterTest.php +++ b/lib/Cake/tests/Case/Routing/RouterTest.php @@ -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();