Merge pull request #72 from skipperbent/development

[BUGFIX] Only render group if prefix matches.

Author: skipperbent

src/Pecee/SimpleRouter/RouterBase.php

@@ -86,7 +86,7 @@ protected function processRoutes(array $routes, array $settings = array(), array
 
             $this->currentRoute = $route;
 
-            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
+            if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
                 $group = $route;
                 $route->renderRoute($this->request);
                 $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
@@ -126,12 +126,6 @@ public function routeRequest() {
 
             $route = $this->controllerUrlMap[$i];
 
-            if($route->getGroup() !== null) {
-                if($route->getGroup()->matchDomain($this->request) === false) {
-                    continue;
-                }
-            }
-
             $routeMatch = $route->matchRoute($this->request);
 
             if($routeMatch) {

src/Pecee/SimpleRouter/RouterGroup.php

@@ -66,7 +66,12 @@ public function renderRoute(Request $request) {
     }
 
     public function matchRoute(Request $request) {
-        return null;
+        // Skip if prefix doesn't match
+        if($this->getPrefix() !== null && stripos($request->getUri(), $this->getPrefix()) === false) {
+            return false;
+        }
+
+        return $this->matchDomain($request);
     }
 
     public function setExceptionHandler($class) {