geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-16 10:40:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Development

Browse Source 
- Optimized the way parameters are parsed as a result, simple-router now supports routes like `/{param1}-{param2}.json`.
- Replaced reg-ex for parameter-matching with `\w` which means that default parameter matching on routes now include `_` (underscore) per default.
- Simplified `MiddlewareTest` class.
This commit is contained in:
Simon Sessingø
2016-06-04 15:12:04 +02:00
parent b540c01650
commit 6780b24e59
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Pecee/SimpleRouter/RouterBase.php
View File

@@ -131,6 +131,14 @@ class RouterBase {
// Loop through each route-request
$this->processRoutes($this->routes);
// Make sure routes with longer urls are rendered first
usort($this->controllerUrlMap, function($a, $b) {
if(strlen($a->getUrl()) < strlen($b->getUrl())) {
return 1;
}
return -1;
});
$routeNotAllowed = false;
$max = count($this->controllerUrlMap);

6
src/Pecee/SimpleRouter/RouterEntry.php
View File

@@ -249,7 +249,7 @@ abstract class RouterEntry {
return new $name();
}
protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+') {
protected function parseParameters($route, $url, $parameterRegex = '[\w]+') {
$parameterNames = array();
$regex = '';
$lastCharacter = '';
@@ -288,7 +288,7 @@ abstract class RouterEntry {
$regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
$required = false;
} else {
$regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
$regex .= '.*?(?P<' . $parameter . '>'. $parameterRegex .').*?';
}
$parameterNames[] = array('name' => $parameter, 'required' => $required);
$parameter = '';
@@ -307,7 +307,7 @@ abstract class RouterEntry {
$parameterValues = array();
if(preg_match('/^'.$regex.'$/is', $url, $parameterValues)) {
if(preg_match('/^'.$regex.'.?$/is', $url, $parameterValues)) {
$parameters = array();
$max = count($parameterNames);