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

Fixing failing tests in controller test.

Browse source
This commit is contained in:
mark_story 2010-11-06 23:57:35 -04:00
parent 88c717dbd8
commit 22497eb41c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/controller/controller.php
View file

@ -1039,7 +1039,7 @@ class Controller extends Object {
), E_USER_WARNING);
return array();
}
$options = array_merge($this->request->params, $this->params['url'], $this->passedArgs);
$options = array_merge($this->request->params, $this->request->params['url'], $this->passedArgs);
if (isset($this->paginate[$object->alias])) {
$defaults = $this->paginate[$object->alias];

1
cake/tests/cases/libs/controller/controller.test.php
View file

@ -759,6 +759,7 @@ class ControllerTest extends CakeTestCase {
function testPaginateFieldsDouble(){
$Controller =& new Controller();
$Controller->uses = array('ControllerPost');
$Controller->request = $this->getMock('CakeRequest');
$Controller->request->params['url'] = array();
$Controller->constructClasses();