Merge pull request #123 from skipperbent/v1-development

Fixed RouterGroup not pushing multiple middlewares properly

src/Pecee/SimpleRouter/RouterBase.php

@@ -85,16 +85,21 @@ class RouterBase {
 
             $this->currentRoute = $route;
 
-            if($route instanceof RouterGroup && is_callable($route->getCallback()) && $route->matchRoute($this->request)) {
+            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
 
-                $group = $route;
+                $route->renderRoute($this->request);
 
-                $group->renderRoute($this->request);
-                $mergedSettings = array_merge($settings, $group->getMergeableSettings());
+                if($route->matchRoute($this->request)) {
+
+                    $group = $route;
+
+                    $mergedSettings = array_merge($settings, $group->getMergeableSettings());
+
+                    // Add ExceptionHandler
+                    if ($group->getExceptionHandler() !== null) {
+                        $this->exceptionHandlers[] = $route;
+                    }
 
-                // Add ExceptionHandler
-                if($group->getExceptionHandler() !== null) {
-                    $this->exceptionHandlers[] = $route;
                 }
 
             }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -97,9 +97,12 @@ class RouterGroup extends RouterEntry {
         if($this->getMiddleware() !== null && isset($settings['middleware'])) {
 
             if(!is_array($this->getMiddleware())) {
-                $middlewares = [$this->getMiddleware(), $settings['middleware']];
+                $middlewares = [
+                    $this->getMiddleware(),
+                    $settings['middleware']
+                ];
             } else {
-                $middlewares = array_push($settings['middleware']);
+                $middlewares = array_push($settings['middleware'], $this->getMiddleware());
             }
 
             $settings['middleware'] = array_unique(array_reverse($middlewares));