Merge pull request #63 from skipperbent/development

[OPTIMISATION] Parameters matching optimisations.

src/Pecee/SimpleRouter/RouterBase.php

@@ -327,6 +327,10 @@ class RouterBase {
             return $url;
         }
 
+        if($controller === null && $this->loadedRoute !== null) {
+            return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams);
+        }
+
         $c = '';
         $method = null;
 

src/Pecee/SimpleRouter/RouterEntry.php

@@ -178,10 +178,6 @@ abstract class RouterEntry {
     public function getMergeableSettings() {
         $settings = $this->settings;
 
-        /*if(isset($settings['middleware'])) {
-            unset($settings['middleware']);
-        }*/
-
         if(isset($settings['prefix'])) {
             unset($settings['prefix']);
         }
@@ -242,7 +238,7 @@ abstract class RouterEntry {
         return new $name();
     }
 
-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]*?') {
+    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+?') {
         $parameterNames = array();
         $regex = '';
         $lastCharacter = '';
@@ -278,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 .')\\/';
@@ -314,6 +310,10 @@ abstract class RouterEntry {
                         throw new RouterException('Missing required parameter ' . $name['name'], 404);
                     }
 
+                    if(!$name['required'] && $parameterValue === null) {
+                        continue;
+                    }
+
                     $parameters[$name['name']] = $parameterValue;
                 }
             }

src/Pecee/SimpleRouter/RouterResource.php

@@ -51,7 +51,7 @@ class RouterResource extends RouterEntry {
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
-        $parameters = $this->parseParameters($route, $url, '[0-9]*?');
+        $parameters = $this->parseParameters($route, $url, '[0-9]+?');
 
         if($parameters !== null) {
 

src/Pecee/SimpleRouter/RouterRoute.php

@@ -2,6 +2,7 @@
 
 namespace Pecee\SimpleRouter;
 
+use Pecee\ArrayUtil;
 use Pecee\Http\Request;
 
 class RouterRoute extends RouterEntry {
@@ -39,13 +40,7 @@ class RouterRoute extends RouterEntry {
         $parameters = $this->parseParameters($route, $url);
 
         if($parameters !== null) {
-
-            if(is_array($this->parameters)) {
-                $this->parameters = array_merge($this->parameters, $parameters);
-            } else {
-                $this->parameters = $parameters;
-            }
-
+            $this->parameters = $parameters;
             return true;
         }
 
@@ -74,7 +69,7 @@ class RouterRoute extends RouterEntry {
         if(count($parameters)) {
             $tmp = array();
             foreach($parameters as $param) {
-                $tmp[$param] = '';
+                $tmp[$param] = null;
             }
             $this->parameters = $tmp;
         }