Merge pull request #29 from skipperbent/development

[BUGFIX] Group will now always be rendered no matter of what prefix is.

src/Pecee/SimpleRouter/RouterGroup.php

@@ -12,30 +12,21 @@ class RouterGroup extends RouterEntry {
 
     public function renderRoute(Request $request) {
         // Check if request method is allowed
+        $hasAccess = (!$this->method);
 
-        if(trim($this->prefix) === '' || strtolower($request->getUri()) == strtolower($this->prefix) || stripos($request->getUri(), $this->prefix) === 0) {
-
-            $hasAccess = (!$this->method);
-
-            if($this->method) {
-                if(is_array($this->method)) {
-                    $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
-                } else {
-                    $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
-                }
+        if($this->method) {
+            if(is_array($this->method)) {
+                $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
+            } else {
+                $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
             }
-
-            if(!$hasAccess) {
-                throw new RouterException('Method not allowed');
-            }
-
-            $this->loadMiddleware($request);
-
-            return parent::renderRoute($request);
         }
 
-        // No match here, move on...
-        return null;
+        if(!$hasAccess) {
+            throw new RouterException('Method not allowed');
+        }
+
+        return parent::renderRoute($request);
     }
 
     public function matchRoute(Request $request) {

src/Pecee/SimpleRouter/RouterRoute.php

@@ -44,7 +44,7 @@ class RouterRoute extends RouterEntry {
 
         $route = $this->url;
 
-        $routeMatch = preg_replace('/'.self::PARAMETERS_REGEX_MATCH.'/is', '', $route);
+        $routeMatch = preg_replace('/\/{0,1}'.self::PARAMETERS_REGEX_MATCH.'\/{0,1}/is', '', $route);
 
         // Check if url parameter count matches
         if(stripos($url, $routeMatch) === 0) {