Merge pull request #18 from skipperbent/development

[OPTIMISATION] Optimised router handling - router will now use the or…

Author: skipperbent

src/Pecee/SimpleRouter/RouterBase.php

@@ -100,14 +100,6 @@ public function routeRequest() {
         // Loop through each route-request
         $this->processRoutes($this->routes);
 
-        // Make sure the urls is in the right order when comparing
-        usort($this->controllerUrlMap, function($a, $b) {
-            if(stripos($b->getUrl(), '{') !== false) {
-                return $a->getUrl();
-            }
-            return strcmp($b->getUrl(), $a->getUrl());
-        });
-
         $routeNotAllowed = false;
 
         /* @var $route RouterEntry */

src/Pecee/SimpleRouter/RouterRoute.php

@@ -49,7 +49,7 @@ public function matchRoute(Request $request) {
         // Check if url parameter count matches
         if(stripos($url, $routeMatch) === 0) {
 
-            $matches = true;
+            $matches = (count(explode('/', rtrim($url, '/'))) == count(explode('/', rtrim($route, '/'))));
 
             if($this->regexMatch) {
                 $parameters = $this->parseParameters($url, true, $this->regexMatch);
@@ -62,7 +62,7 @@ public function matchRoute(Request $request) {
             } else {
 
                 $url = explode('/', $url);
-                $route = explode('/', $route);
+                $route = explode('/', rtrim($route, '/'));
 
                 $parameters = array();