geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 20:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TASK] Fixed parameter matching regex when using multiple optional parameters.

Browse Source
This commit is contained in:
Simon Sessingø
2015-12-19 07:15:32 +01:00
parent 97e2edd207
commit b9be7695a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+1 -1
View File
@@ -277,7 +277,7 @@ abstract class RouterEntry {
// Check for optional parameter // Check for optional parameter
if($lastCharacter === '?') { if($lastCharacter === '?') {
$parameter = substr($parameter, 0, strlen($parameter)-1); $parameter = substr($parameter, 0, strlen($parameter)-1);
$regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>'.$parameterRegex.')){0,1}\\/{0,1})'; $regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[^\/]*)))\\/{0,1}';
$required = false; $required = false;
} else { } else {
$regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/{0,1})'; $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/{0,1})';
src/Pecee/SimpleRouter/RouterResource.php
+1 -1
View File
@@ -51,7 +51,7 @@ class RouterResource extends RouterEntry {
$route = rtrim($this->url, '/') . '/{id?}/{action?}'; $route = rtrim($this->url, '/') . '/{id?}/{action?}';
$parameters = $this->parseParameters($route, $url, '[0-9]*?'); $parameters = $this->parseParameters($route, $url);
if($parameters !== null) { if($parameters !== null) {