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

Merge pull request #62 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2016-01-15 10:07:51 +01:00
parent 3298970798 b096742d6b
commit c3b12ba053
2 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+1 -1
View File
@@ -274,7 +274,7 @@ abstract class RouterEntry {
if($lastCharacter === '?') {
$parameter = substr($parameter, 0, strlen($parameter)-1);
$regex .= '\\/(?:(?P<'.$parameter.'>[^\/]*)\\/?)';
$regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]*)?\\/?)';
$required = false;
} else {
$regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
src/Pecee/SimpleRouter/RouterResource.php
+5
View File
@@ -53,6 +53,8 @@ class RouterResource extends RouterEntry {
$parameters = $this->parseParameters($route, $url, '[0-9]*?');
if($parameters !== null) {
if(is_array($parameters)) {
$parameters = array_merge($this->parameters, $parameters);
}
@@ -94,6 +96,9 @@ class RouterResource extends RouterEntry {
return $this->call('index', $parameters);
}
return null;
}
/**
* @return string
*/