Merge pull request #79 from skipperbent/development

[BUGFIX] Bugfixes and optimisations

src/Pecee/SimpleRouter/RouterBase.php

@@ -91,7 +91,7 @@ class RouterBase {
             if($route instanceof RouterGroup && is_callable($route->getCallback())) {
                 $group = $route;
                 $route->renderRoute($this->request);
-                $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
+                $mergedSettings = array_merge($settings, $route->getMergeableSettings());
             }
 
             $this->currentRoute = null;
@@ -135,6 +135,14 @@ class RouterBase {
 
         $routeNotAllowed = false;
 
+        // 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;
+        });
+
         $max = count($this->controllerUrlMap);
 
         /* @var $route RouterEntry */
@@ -373,7 +381,7 @@ class RouterBase {
             $route = $this->controllerUrlMap[$i];
 
             // Check an alias exist, if the matches - use it
-            if($route instanceof RouterRoute && strtolower($route->getAlias()) === strtolower($controller)) {
+            if($route instanceof RouterRoute && $route->hasAlias($controller)) {
                 return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
             }
 

src/Pecee/SimpleRouter/RouterGroup.php

@@ -88,4 +88,18 @@ class RouterGroup extends RouterEntry {
         return $this->domain;
     }
 
+    /**
+     * @param array $settings
+     * @return self
+     */
+    public function addSettings(array $settings = null) {
+        if($this->getNamespace() !== null && isset($settings['namespace'])) {
+            unset($settings['namespace']);
+        }
+        if(is_array($settings)) {
+            $this->settings = array_merge($this->settings, $settings);
+        }
+        return $this;
+    }
+
 }

src/Pecee/SimpleRouter/RouterRoute.php

@@ -15,8 +15,6 @@ class RouterRoute extends RouterEntry {
         parent::__construct();
         $this->setUrl($url);
         $this->setCallback($callback);
-
-        $this->settings['aliases'] = array();
     }
 
     public function matchRoute(Request $request) {
@@ -50,8 +48,6 @@ class RouterRoute extends RouterEntry {
             return true;
         }
 
-
-
         return null;
     }
 
@@ -88,15 +84,37 @@ class RouterRoute extends RouterEntry {
 
     /**
      * Get alias for the url which can be used when getting the url route.
-     * @return string
+     * @return string|array
      */
     public function getAlias(){
         return $this->alias;
     }
 
+    /**
+     * Check if route has given alias.
+     *
+     * @param $name
+     * @return bool
+     */
+    public function hasAlias($name) {
+        if(is_array($this->alias)) {
+            foreach($this->alias as $alias) {
+                if(strtolower($alias) === strtolower($name)) {
+                    return true;
+                }
+            }
+        } else {
+            if(strtolower($this->getAlias()) === strtolower($name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Set the url alias for easier getting the url route.
-     * @param string $alias
+     * @param string|array $alias
      * @return self
      */
     public function setAlias($alias){