[BUGFIX] Fixed middlewaresToLoad logic used before any routes loaded in RouterBase.

This commit is contained in:
Simon Sessingø
2016-04-16 13:08:32 +02:00
parent 94e98ad5f0
commit 2afe784f47
+7 -8
View File
@@ -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 = '';