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 tests + adding tests for passed args order preservation when passed args are part of default route parameters.

Browse source
This commit is contained in:
mark_story 2009-11-30 00:23:41 -05:00
parent e41c408378
commit 11dd7898c4
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cake/libs/router.php
View file

@ -242,7 +242,7 @@ class Router {
* {{{
* Router::connect(
* '/:lang/:controller/:action/:id',
* array('controller' => 'testing4'),
* array(),
* array('id' => '[0-9]+', 'lang' => '[a-z]{3}')
* );
* }}}
@ -1354,14 +1354,20 @@ class RouterRoute {
if (!$this->compiled()) {
$this->compile();
}
$url += $this->defaults;
$defaults = $this->defaults;
$url += $defaults;
if (isset($defaults['prefix'])) {
$prefix = $defaults['prefix'];
unset($defaults['prefix']);
}
//check that all the key names are in the url
$keyNames = array_flip($this->keys);
if (array_intersect_key($keyNames, $url) != $keyNames) {
return false;
}
$diff = Set::diff($url, $this->defaults);
$diff = Set::diff($url, $defaults);
//if a not a greedy route, no extra params are allowed.
if (!$this->_greedy && array_keys($diff) != $this->keys) {
@ -1369,30 +1375,35 @@ class RouterRoute {
}
//if the difference between the url and defaults contains keys from defaults its not a match
if (array_intersect_key($diff, $this->defaults) !== array()) {
if (array_intersect_key(array_filter($defaults), $diff) !== array()) {
return false;
}
//check that required passed parameters are the same.
$i = 0;
while (isset($this->defaults[$i])) {
if (isset($url[$i]) && $this->defaults[$i] !== $url[$i]) {
while (isset($defaults[$i])) {
if (isset($url[$i]) && $defaults[$i] !== $url[$i]) {
return false;
}
$i++;
}
$passedArgsAndParams = array_diff_key($diff, $this->defaults, $keyNames);
$passedArgsAndParams = array_diff_key($diff, $defaults, $keyNames);
list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
//remove any pass params, they have numeric indexes
//remove any pass params, they have numeric indexes, skip any params that are in the defaults
$pass = array();
$i = 0;
while (isset($url[$i])) {
if (!isset($diff[$i])) {
$i++;
continue;
}
$pass[] = $url[$i];
unset($url[$i]);
$i++;
}
//check patterns for routed params
if (!empty($this->params)) {
foreach ($this->params as $key => $pattern) {

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

@ -2181,7 +2181,7 @@ class RouterRouteTestCase extends CakeTestCase {
$result = $route->match(array('controller' => 'nodes', 'action' => 'view'));
$this->assertFalse($result);
$result = $route->match(array('controller' => 'posts', 'action' => 'view', 1));
$this->assertFalse($result);
@ -2218,7 +2218,7 @@ class RouterRouteTestCase extends CakeTestCase {
*
* @return void
*/
function testMatchWithNamedParameters() {
function testMatchWithNamedParametersAndPassedArgs() {
Router::connectNamed(true);
$route = new RouterRoute('/:controller/:action/*', array('plugin' => null));
@ -2230,6 +2230,14 @@ class RouterRouteTestCase extends CakeTestCase {
$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, 'page' => 1, 'limit' => 20, 'order' => 'title'));
$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
$route =& new RouterRoute('/test2/*', array('controller' => 'pages', 'action' => 'display', 2));
$result = $route->match(array('controller' => 'pages', 'action' => 'display', 1));
$this->assertFalse($result);
$result = $route->match(array('controller' => 'pages', 'action' => 'display', 2, 'something'));
$this->assertEqual($result, '/test2/something');
}
/**