mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-06-17 08:47:52 +00:00
[...] Stuff from previous commit
This commit is contained in:
@@ -76,7 +76,7 @@ class RouterRoute extends RouterEntry {
|
|||||||
|
|
||||||
$regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
|
$regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
|
||||||
}
|
}
|
||||||
$parameterNames[] = array('value' => $parameter, 'required' => $required);
|
$parameterNames[] = array('name' => $parameter, 'required' => $required);
|
||||||
$parameter = '';
|
$parameter = '';
|
||||||
$isParameter = false;
|
$isParameter = false;
|
||||||
|
|
||||||
@@ -99,13 +99,13 @@ class RouterRoute extends RouterEntry {
|
|||||||
|
|
||||||
if(count($parameterNames)) {
|
if(count($parameterNames)) {
|
||||||
foreach($parameterNames as $name) {
|
foreach($parameterNames as $name) {
|
||||||
$parameterValue = (isset($parameterValues[$name['value']]) && !empty($parameterValues[$name['value']])) ? $parameterValues[$name['value']] : null;
|
$parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
|
||||||
|
|
||||||
if($name['required'] && $parameterValue === null) {
|
if($name['required'] && $parameterValue === null) {
|
||||||
throw new RouterException('Missing required parameter ' . $name['name'], 404);
|
throw new RouterException('Missing required parameter ' . $name['name'], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters[$name] = $parameterValue;
|
$parameters[$name['name']] = $parameterValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user