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

Moving parameter persist to RouterRoute.

Browse source 
Tests updated.
This commit is contained in:
mark_story 2009-11-29 10:59:38 -05:00
parent f59b8daf2e
commit b242dc9531
2 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cake/libs/router.php
View file

@ -755,7 +755,7 @@ class Router {
$params['plugin'] = $url['plugin'];
}
$_url = $url;
$backupUrl = $url;
$url = array_merge(
array('controller' => $params['controller'], 'plugin' => $params['plugin']),
Set::filter($url, true)
@ -771,14 +771,8 @@ class Router {
$route =& $self->routes[$i];
$originalUrl = $url;
if (isset($route->params['persist'], $self->__params[0])) {
foreach ($route->params['persist'] as $persistKey) {
if (array_key_exists($persistKey, $_url)) {
$url[$persistKey] = $_url[$persistKey];
} elseif (array_key_exists($persistKey, $params)) {
$url[$persistKey] = $params[$persistKey];
}
}
if (isset($route->params['persist'], $params)) {
$url = $route->persistParams($url, array_merge($params, $backupUrl));
}
if ($match = $route->match($url)) {
$output = trim($match, '/');
@ -1331,6 +1325,22 @@ class RouterRoute {
}
}
/**
* Apply persistent parameters to a url array.
*
* @param array $url The array to apply persistent parameters to.
* @param array $params An array of persistent values to replace persistent ones.
* @return array An array with persistent parameters applied.
*/
function persistParams($url, $params) {
foreach ($this->params['persist'] as $persistKey) {
if (array_key_exists($persistKey, $params)) {
$url[$persistKey] = $params[$persistKey];
}
}
return $url;
}
/**
* Attempt to match a url array. If the url matches the routes pattern, then
* return an array of parsed params. If the url doesn't match the routes compiled pattern
@ -1345,8 +1355,6 @@ class RouterRoute {
}
$url += array('controller' => null, 'plugin' => null);
$defaults = $this->defaults;
$routeParams = $this->keys;
$routeOptions = $this->params;
if (isset($defaults['prefix'])) {
$prefix = $defaults['prefix'];
@ -1379,12 +1387,11 @@ class RouterRoute {
if (!strpos($this->template, '*') && (!empty($pass) || !empty($named))) {
return false;
}
$urlKeys = array_keys($url);
$paramsKeys = array_keys($params);
$defaultsKeys = array_keys($defaults);
$routeParams = $this->keys;
if (!empty($params)) {
$urlKeys = array_keys($url);
$paramsKeys = array_keys($params);
if (array_diff($paramsKeys, $routeParams) != array()) {
return false;
}
@ -1410,10 +1417,10 @@ class RouterRoute {
if (empty($params)) {
return $this->__mapRoute(array_merge($url, compact('pass', 'named', 'prefix')));
} elseif (!empty($routeParams) && !empty($defaults)) {
if (!empty($required)) {
return false;
}
foreach ($params as $key => $val) {
if ((!isset($url[$key]) || $url[$key] != $val) || (!isset($defaults[$key]) || $defaults[$key] != $val) && !in_array($key, $routeParams)) {
if (!isset($defaults[$key])) {
@ -1428,6 +1435,7 @@ class RouterRoute {
}
return false;
}
$routeOptions = $this->params;
if (!empty($routeOptions)) {
foreach ($routeOptions as $key => $reg) {

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

@ -2162,6 +2162,24 @@ class RouterRouteTestCase extends CakeTestCase {
$this->assertEqual($result, $expected);
}
/**
* test persistParams ability to persist parameters from $params and remove params.
*
* @return void
*/
function testPersistParams() {
$route =& new RouterRoute(
'/:lang/:color/blog/:action',
array('controller' => 'posts'),
array('persist' => array('lang', 'color'))
);
$url = array('controller' => 'posts', 'action' => 'index');
$params = array('lang' => 'en', 'color' => 'blue');
$result = $route->persistParams($url, $params);
$this->assertEqual($result['lang'], $params['lang']);
$this->assertEqual($result['color'], $params['color']);
}
/**
* test the parse method of RouterRoute.
*