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

Minor cleanup and reformattting.

Browse source 
Changing greedy -> greedyNamed for clarity and consistency.
This commit is contained in:
mark_story 2011-03-03 07:11:32 -05:00
parent 15275eddac
commit 171830df33
2 changed files with 61 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,56 +185,55 @@ class CakeRoute {
} }
if (!preg_match($this->_compiledRoute, $url, $route)) { if (!preg_match($this->_compiledRoute, $url, $route)) {
return false; return false;
} else {
foreach ($this->defaults as $key => $val) {
if ($key[0] === '[' && preg_match('/^\[(\w+)\]$/', $key, $header)) {
if (isset($this->__headerMap[$header[1]])) {
$header = $this->__headerMap[$header[1]];
} else {
$header = 'http_' . $header[1];
}
$header = strtoupper($header);
$val = (array)$val;
$h = false;
foreach ($val as $v) {
if (env($header) === $v) {
$h = true;
}
}
if (!$h) {
return false;
}
}
}
array_shift($route);
$count = count($this->keys);
for ($i = 0; $i <= $count; $i++) {
unset($route[$i]);
}
$route['pass'] = $route['named'] = array();
// Assign defaults, set passed args to pass
foreach ($this->defaults as $key => $value) {
if (isset($route[$key])) {
continue;
}
if (is_integer($key)) {
$route['pass'][] = $value;
continue;
}
$route[$key] = $value;
}
if (isset($route['_args_'])) {
list($pass, $named) = $this->parseArgs($route['_args_'], $route['controller'], $route['action']);
$route['pass'] = array_merge($route['pass'], $pass);
$route['named'] = $named;
unset($route['_args_']);
}
return $route;
} }
foreach ($this->defaults as $key => $val) {
if ($key[0] === '[' && preg_match('/^\[(\w+)\]$/', $key, $header)) {
if (isset($this->__headerMap[$header[1]])) {
$header = $this->__headerMap[$header[1]];
} else {
$header = 'http_' . $header[1];
}
$header = strtoupper($header);
$val = (array)$val;
$h = false;
foreach ($val as $v) {
if (env($header) === $v) {
$h = true;
}
}
if (!$h) {
return false;
}
}
}
array_shift($route);
$count = count($this->keys);
for ($i = 0; $i <= $count; $i++) {
unset($route[$i]);
}
$route['pass'] = $route['named'] = array();
// Assign defaults, set passed args to pass
foreach ($this->defaults as $key => $value) {
if (isset($route[$key])) {
continue;
}
if (is_integer($key)) {
$route['pass'][] = $value;
continue;
}
$route[$key] = $value;
}
if (isset($route['_args_'])) {
list($pass, $named) = $this->parseArgs($route['_args_'], $route['controller'], $route['action']);
$route['pass'] = array_merge($route['pass'], $pass);
$route['named'] = $named;
unset($route['_args_']);
}
return $route;
} }
/** /**
@ -252,9 +251,9 @@ class CakeRoute {
$context = compact('controller', 'action'); $context = compact('controller', 'action');
$namedConfig = Router::namedConfig(); $namedConfig = Router::namedConfig();
$greedy = isset($this->options['greedyNamed']) ? $this->options['greedyNamed'] : $namedConfig['greedy']; $greedy = $namedConfig['greedyNamed'];
$rules = $namedConfig['rules']; $rules = $namedConfig['rules'];
if (isset($this->options['named'])) { if (!empty($this->options['named'])) {
$greedy = isset($this->options['greedyNamed']) && $this->options['greedyNamed'] === true; $greedy = isset($this->options['greedyNamed']) && $this->options['greedyNamed'] === true;
foreach ((array)$this->options['named'] as $key => $val) { foreach ((array)$this->options['named'] as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
@ -271,7 +270,7 @@ class CakeRoute {
} }
$separatorIsPresent = strpos($param, $namedConfig['separator']) !== false; $separatorIsPresent = strpos($param, $namedConfig['separator']) !== false;
if ((!isset($options['named']) || !empty($this->options['named'])) && $separatorIsPresent) { if ((!isset($this->options['named']) || !empty($this->options['named'])) && $separatorIsPresent) {
list($key, $val) = explode($namedConfig['separator'], $param, 2); list($key, $val) = explode($namedConfig['separator'], $param, 2);
$hasRule = isset($rules[$key]); $hasRule = isset($rules[$key]);
$passIt = (!$hasRule && !$greedy) || ($hasRule && !$this->_matchNamed($key, $val, $rules[$key], $context)); $passIt = (!$hasRule && !$greedy) || ($hasRule && !$this->_matchNamed($key, $val, $rules[$key], $context));
@ -324,11 +323,17 @@ class CakeRoute {
return false; return false;
} }
$controllerMatches = !isset($rule['controller'], $context['controller']) || in_array($context['controller'], (array)$rule['controller']); $controllerMatches = (
!isset($rule['controller'], $context['controller']) ||
in_array($context['controller'], (array)$rule['controller'])
);
if (!$controllerMatches) { if (!$controllerMatches) {
return false; return false;
} }
$actionMatches = !isset($rule['action'], $context['action']) || in_array($context['action'], (array)$rule['action']); $actionMatches = (
!isset($rule['action'], $context['action']) ||
in_array($context['action'], (array)$rule['action'])
);
if (!$actionMatches) { if (!$actionMatches) {
return false; return false;
} }
@ -383,7 +388,7 @@ class CakeRoute {
} }
$namedConfig = Router::namedConfig(); $namedConfig = Router::namedConfig();
$greedyNamed = $namedConfig['greedy']; $greedyNamed = $namedConfig['greedyNamed'];
$allowedNamedParams = $namedConfig['rules']; $allowedNamedParams = $namedConfig['rules'];
$named = $pass = $_query = array(); $named = $pass = $_query = array();

2
cake/libs/router.php
View file

@ -102,7 +102,7 @@ class Router {
*/ */
protected static $_namedConfig = array( protected static $_namedConfig = array(
'default' => array('page', 'fields', 'order', 'limit', 'recursive', 'sort', 'direction', 'step'), 'default' => array('page', 'fields', 'order', 'limit', 'recursive', 'sort', 'direction', 'step'),
'greedy' => true, 'greedyNamed' => true,
'separator' => ':', 'separator' => ':',
'rules' => false, 'rules' => false,
); );