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 issues with optional parameters. Allows route params to be made optional by setting a pattern definition.

Browse source
This commit is contained in:
mark_story 2009-11-27 09:58:51 -05:00
parent fd98bc5d76
commit 49c6cd3f9f
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/router.php
View file

@ -1286,22 +1286,28 @@ class RouterRoute {
if ($name !== 'plugin' && array_key_exists($name, $default)) {
$option = '?';
}
$replacements[] = '(?:(' . $params[$name] . ')' . $option . ')' . $option;
$slashParam = '/\\' . $namedElements[0][$i];
if (strpos($parsed, $slashParam) !== false) {
$replacements[] = '(?:/(' . $params[$name] . ')' . $option . ')' . $option;
$search[] = $slashParam;
} else {
$search[] = '\\' . $namedElements[0][$i];
$replacements[] = '(?:(' . $params[$name] . ')' . $option . ')' . $option;
}
} else {
$replacements[] = '(?:([^/]+))?';
$search[] = '\\' . $namedElements[0][$i];
}
$search[] = '\\' . $namedElements[0][$i];
$names[] = $name;
}
$parsed = str_replace($search, $replacements, $parsed);
if (preg_match('#\/\*#', $route, $m)) {
$parsed = preg_replace('#/\\\\\*#', '(?:/(.*))?', $parsed);
}
$parsed = str_replace($search, $replacements, $parsed);
$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
$this->keys = $names;
/*
/*
$elements = explode('/', $route);
foreach ($elements as $element) {

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

@ -2068,7 +2068,7 @@ class RouterRouteTestCase extends CakeTestCase {
extract(Router::getNamedExpressions());
$route = new RouterRoute(
'/:controller/:action/:id',
'/:controller/:action/:id',
array('controller' => 'testing4', 'id' => null),
array('id' => $ID)
);
@ -2097,7 +2097,7 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertPattern($result, '/posts/1' . $delim . 'name-of-article');
$this->assertPattern($result, '/posts/13244' . $delim . 'name-of_Article[]');
$this->assertNoPattern($result, '/posts/11!!nameofarticle');
$this->assertNoPattern($result, '/posts/11!nameofarticle');
$this->assertNoPattern($result, '/posts/11');
$this->assertEqual($route->keys, array('id', 'title'));
@ -2115,10 +2115,10 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertNoPattern($result, '/posts/:nameofarticle/2009');
$this->assertNoPattern($result, '/posts/:nameofarticle/01');
$this->assertEqual($route->keys, array('id', 'title', 'year'));
$route =& new RouterRoute(
'/posts/:url_title-(uuid::id)',
array('controller' => 'posts', 'action' => 'view'),
array('controller' => 'posts', 'action' => 'view'),
array('pass' => array('id', 'url_title'), 'id' => $ID)
);
$result = $route->compile();
@ -2148,7 +2148,7 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertPattern($result, '/pages/view/today');
$this->assertPattern($result, '/pages/view/today/tomorrow');
$this->assertNoPattern($result, '/pages/view/tomorrow/something:else');
$route =& new RouterRoute(
'/posts/:month/:day/:year/*',
array('controller' => 'posts', 'action' => 'view'), array('year' => $Year, 'month' => $Month, 'day' => $Day)
@ -2164,6 +2164,9 @@ class RouterRouteTestCase extends CakeTestCase {
array("extra" => '[a-z1-9_]*', "slug" => '[a-z1-9_]+', "action" => 'view')
);
$result = $route->compile();
$this->assertPattern($result, '/some_extra/page/this_is_the_slug');
$this->assertPattern($result, '/page/this_is_the_slug');
$this->assertEqual($route->keys, array('extra', 'slug'));
$this->assertEqual($route->params, array('extra' => '[a-z1-9_]*', 'slug' => '[a-z1-9_]+', 'action' => 'view'));
$expected = array(
@ -2173,8 +2176,6 @@ class RouterRouteTestCase extends CakeTestCase {
'plugin' => null
);
$this->assertEqual($route->defaults, $expected);
$this->assertPattern($result, '/some_extra/page/this_is_the_slug');
$this->assertNoPattern($result, '/page/this_is_the_slug');
}
/**