mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 04:42:15 +00:00
Merge pull request #59 from skipperbent/development
[TASK] Simplified regex for matching parameters.
This commit is contained in:
@@ -278,10 +278,10 @@ abstract class RouterEntry {
|
|||||||
|
|
||||||
if($lastCharacter === '?') {
|
if($lastCharacter === '?') {
|
||||||
$parameter = substr($parameter, 0, strlen($parameter)-1);
|
$parameter = substr($parameter, 0, strlen($parameter)-1);
|
||||||
$regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[^\/]*)))\\/{0,1}';
|
$regex .= '\\/?(?P<'.$parameter.'>[^\/]*)\\/?';
|
||||||
$required = false;
|
$required = false;
|
||||||
} else {
|
} else {
|
||||||
$regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/{0,1})';
|
$regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
|
||||||
}
|
}
|
||||||
$parameterNames[] = array('name' => $parameter, 'required' => $required);
|
$parameterNames[] = array('name' => $parameter, 'required' => $required);
|
||||||
$parameter = '';
|
$parameter = '';
|
||||||
|
|||||||
Reference in New Issue
Block a user