diff --git a/src/Pecee/Http/Input/Input.php b/src/Pecee/Http/Input/Input.php index 475b19c..db45b00 100644 --- a/src/Pecee/Http/Input/Input.php +++ b/src/Pecee/Http/Input/Input.php @@ -89,7 +89,7 @@ class Input { return ($key !== null && isset($item->getValue()[$key])) ? $item->getValue()[$key] : $item->getValue(); } - return ($item->getValue() === null) ? $default : $item->getValue(); + return (trim($item->getValue()) === '') ? $default : $item->getValue(); } return $default; diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index 231e6d4..f88be22 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -111,13 +111,6 @@ class RouterBase { $originalUri = $this->request->getUri(); - // Load group middlewares - - /* @var $middleware RouterEntry */ - foreach($this->middlewaresToLoad as $middleware) { - $middleware->loadMiddleware($this->request); - } - // Initialize boot-managers if(count($this->bootManagers)) { /* @var $manager RouterBootManager */ @@ -138,6 +131,12 @@ class RouterBase { // Loop through each route-request $this->processRoutes($this->routes); + // Load group middlewares + /* @var $route RouterEntry */ + foreach($this->middlewaresToLoad as $route) { + $route->loadMiddleware($this->request); + } + $routeNotAllowed = false; // Make sure routes with longer urls are rendered first @@ -309,7 +308,7 @@ class RouterBase { return ''; } - protected function processUrl($route, $method = null, $parameters = null, $getParams = null) { + protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) { $domain = '';