- Fixed rewrite from ExceptionHandler sometimes not working correctly.
- Fixed default-namespace for Group and partial groups.
This commit is contained in:
Simon Sessingø
2018-03-29 23:13:56 +02:00
parent a1dc4c5119
commit da219d0b19
2 changed files with 13 additions and 0 deletions
+8
View File
@@ -256,6 +256,7 @@ class SimpleRouter
$group = new RouteGroup();
$group->setCallback($callback);
$group->setSettings($settings);
$group = static::addDefaultNamespace($group);
static::router()->addRoute($group);
@@ -283,6 +284,7 @@ class SimpleRouter
$group = new RoutePartialGroup();
$group->setSettings($settings);
$group->setCallback($callback);
$group = static::addDefaultNamespace($group);
static::router()->addRoute($group);
@@ -511,6 +513,12 @@ class SimpleRouter
{
if (static::$defaultNamespace !== null) {
if ($route instanceof IGroupRoute) {
$route->setNamespace(static::$defaultNamespace . '\\' . ltrim($route->getNamespace(), '\\'));
return $route;
}
$callback = $route->getCallback();
/* Only add default namespace on relative callbacks */