adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Router tests all pass now.

Browse source
This commit is contained in:
mark_story 2010-12-18 14:26:45 -05:00
parent 328db0c36b
commit 756b09849f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/route/cake_route.php
View file

@ -269,6 +269,11 @@ class CakeRoute {
return false;
}
// Missing defaults is a fail.
if (array_diff_key($defaults, $url) !== array()) {
return false;
}
$named = $pass = $diff = array();
foreach ($url as $key => $value) {
@ -307,7 +312,6 @@ class CakeRoute {
}
}
//if a not a greedy route, no extra params are allowed.
if (!$this->_greedy && ( (!empty($pass) || !empty($named)) || array_diff_key($diff, $keyNames) != array()) ) {
return false;

2
cake/tests/cases/libs/router.test.php
View file

@ -1516,7 +1516,7 @@ class RouterTest extends CakeTestCase {
$result = Router::url(array('controller' => 'images', 'action' => 'add'));
$expected = '/images/add';
$this->assertEqual($result, $expected);
$this->assertEquals($expected, $result);
$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
$expected = '/protected/images/add';