geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 08:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPTIMISATION] Parameters matching optimisations.

Browse Source
This commit is contained in:
Simon Sessingø
2016-01-15 10:20:50 +01:00
parent b096742d6b
commit 714edf7902
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+2 -2
View File
@@ -238,7 +238,7 @@ abstract class RouterEntry {
return new $name(); return new $name();
} }
protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]*?') { protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+?') {
$parameterNames = array(); $parameterNames = array();
$regex = ''; $regex = '';
$lastCharacter = ''; $lastCharacter = '';
@@ -274,7 +274,7 @@ abstract class RouterEntry {
if($lastCharacter === '?') { if($lastCharacter === '?') {
$parameter = substr($parameter, 0, strlen($parameter)-1); $parameter = substr($parameter, 0, strlen($parameter)-1);
$regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]*)?\\/?)'; $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
$required = false; $required = false;
} else { } else {
$regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/'; $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
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, '[0-9]+?');
if($parameters !== null) { if($parameters !== null) {