- Added support for setups where getallheaders function is not availible.
- Made matchDomain method in RouterGroup always return boolean.
This commit is contained in:
Simon Sessingø
2015-12-19 20:15:10 +01:00
parent 3510c4c5a4
commit df2545dd37
3 changed files with 24 additions and 11 deletions
+10 -7
View File
@@ -54,7 +54,10 @@ class RouterBase {
$route = $routes[$i];
$route->addSettings($settings);
$route->setGroup($group);
if($backStack) {
$route->setGroup($group);
}
if($this->defaultNamespace && !$route->getNamespace()) {
$namespace = null;
@@ -124,6 +127,12 @@ class RouterBase {
$route = $this->controllerUrlMap[$i];
if($route->getGroup() !== null) {
if($route->getGroup()->matchDomain($this->request) === false) {
continue;
}
}
$routeMatch = $route->matchRoute($this->request);
if($routeMatch) {
@@ -133,12 +142,6 @@ class RouterBase {
continue;
}
if($route->getGroup() !== null) {
if($route->getGroup()->matchDomain($this->request) === null) {
continue;
}
}
$routeNotAllowed = false;
$this->loadedRoute = $route;