Skip to content

Commit 5a398f0

Browse files
committed
Merge pull request #37 from skipperbent/development
Fixed route not matching when two params added next to each other.
2 parents 6e98f8e + 866832f commit 5a398f0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Pecee/SimpleRouter/RouterRoute.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function matchRoute(Request $request) {
6363
// Check for optional parameter
6464
if($lastCharacter === '?') {
6565
$parameter = substr($parameter, 0, strlen($parameter)-1);
66-
$regex .= '(?:(?:\/(?P<'.$parameter.'>[a-z0-9]*?)){0,1}\\/)';
66+
$regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[a-z0-9]*?)){0,1}\\/)';
6767
} else {
6868
// Use custom parameter regex if it exists
6969
$parameterRegex = '[a-z0-9]*?';
@@ -72,7 +72,7 @@ public function matchRoute(Request $request) {
7272
$parameterRegex = $this->parametersRegex[$parameter];
7373
}
7474

75-
$regex .= '(?:\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
75+
$regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
7676
}
7777
$parameterNames[] = $parameter;
7878
$parameter = '';

0 commit comments

Comments
 (0)