diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php index 04fd537..825f296 100644 --- a/src/Pecee/SimpleRouter/RouterEntry.php +++ b/src/Pecee/SimpleRouter/RouterEntry.php @@ -179,9 +179,9 @@ abstract class RouterEntry { public function getMergeableSettings() { $settings = $this->settings; - if(isset($settings['middleware'])) { + /*if(isset($settings['middleware'])) { unset($settings['middleware']); - } + }*/ if(isset($settings['prefix'])) { unset($settings['prefix']); diff --git a/src/Pecee/SimpleRouter/RouterGroup.php b/src/Pecee/SimpleRouter/RouterGroup.php index 1537a71..d9f615a 100644 --- a/src/Pecee/SimpleRouter/RouterGroup.php +++ b/src/Pecee/SimpleRouter/RouterGroup.php @@ -10,7 +10,7 @@ class RouterGroup extends RouterEntry { parent::__construct(); } - public function matchRoute(Request $request) { + public function renderRoute(Request $request) { // Check if request method is allowed if(strtolower($request->getUri()) == strtolower($this->prefix) || stripos($request->getUri(), $this->prefix) === 0) { @@ -29,11 +29,17 @@ class RouterGroup extends RouterEntry { throw new RouterException('Method not allowed'); } - return $this; + $this->loadMiddleware($request); + + return parent::renderRoute($request); } // No match here, move on... return null; } + public function matchRoute(Request $request) { + return null; + } + } \ No newline at end of file