diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index d282a17..76b6cb8 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -116,6 +116,7 @@ class RouterBase { $routeNotAllowed = false; $this->loadedRoute = $routeMatch; + $routeMatch->loadMiddleware($this->request); $routeMatch->renderRoute($this->request); break; } diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php index aa50533..04fd537 100644 --- a/src/Pecee/SimpleRouter/RouterEntry.php +++ b/src/Pecee/SimpleRouter/RouterEntry.php @@ -243,7 +243,7 @@ abstract class RouterEntry { return new $name(); } - protected function loadMiddleware(Request $request) { + public function loadMiddleware(Request $request) { if($this->getMiddleware()) { $middleware = $this->loadClass($this->getMiddleware()); if (!($middleware instanceof Middleware)) { @@ -256,8 +256,6 @@ abstract class RouterEntry { } public function renderRoute(Request $request) { - // Load middleware - $this->loadMiddleware($request); if(is_object($this->getCallback()) && is_callable($this->getCallback())) { diff --git a/src/Pecee/SimpleRouter/RouterResource.php b/src/Pecee/SimpleRouter/RouterResource.php index 071ff40..c10435e 100644 --- a/src/Pecee/SimpleRouter/RouterResource.php +++ b/src/Pecee/SimpleRouter/RouterResource.php @@ -20,9 +20,6 @@ class RouterResource extends RouterEntry { } public function renderRoute(Request $request) { - // Load middleware - $this->loadMiddleware($request); - if(is_object($this->getCallback()) && is_callable($this->getCallback())) { // When the callback is a function call_user_func_array($this->getCallback(), $this->getParameters());