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

Updating fatal tests in Dispatcher tests. Updating Router to use a method instead of a raw array_merge.

Browse source
This commit is contained in:
Mark Story 2010-05-01 11:07:32 -04:00
parent 0a7ba707b6
commit 2b08ad6012
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/router.php
View file

@ -486,8 +486,7 @@ class Router {
$out['url']['ext'] = $ext; $out['url']['ext'] = $ext;
} }
$request->params = array_merge($request->params, $out); $request->addParams($out);
return $request; return $request;
} }

8
cake/tests/cases/dispatcher.test.php
View file

@ -679,16 +679,16 @@ class DispatcherTest extends CakeTestCase {
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
$_GET = array('coffee' => 'life', 'sleep' => 'sissies'); $_GET = array('coffee' => 'life', 'sleep' => 'sissies');
$Dispatcher =& new Dispatcher(); $Dispatcher = new Dispatcher();
$uri = 'posts/home/?coffee=life&sleep=sissies'; $uri = new CakeRequest('posts/home/?coffee=life&sleep=sissies');
$result = $Dispatcher->parseParams($uri); $result = $Dispatcher->parseParams($uri);
$this->assertPattern('/posts/', $result['controller']); $this->assertPattern('/posts/', $result['controller']);
$this->assertPattern('/home/', $result['action']); $this->assertPattern('/home/', $result['action']);
$this->assertTrue(isset($result['url']['sleep'])); $this->assertTrue(isset($result['url']['sleep']));
$this->assertTrue(isset($result['url']['coffee'])); $this->assertTrue(isset($result['url']['coffee']));
$Dispatcher =& new Dispatcher(); $Dispatcher = new Dispatcher();
$uri = '/?coffee=life&sleep=sissy'; $uri = new CakeRequest('/?coffee=life&sleep=sissy');
$result = $Dispatcher->parseParams($uri); $result = $Dispatcher->parseParams($uri);
$this->assertPattern('/pages/', $result['controller']); $this->assertPattern('/pages/', $result['controller']);
$this->assertPattern('/display/', $result['action']); $this->assertPattern('/display/', $result['action']);