diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php index 05d9908..28ad270 100644 --- a/src/Pecee/SimpleRouter/Router.php +++ b/src/Pecee/SimpleRouter/Router.php @@ -510,6 +510,7 @@ class Router $this->debug('Finished rendering exception-handler'); if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasPendingRewrite() === true) { + $this->loadedExceptionHandlers[$key] = $handler; $this->debug('Exception handler contains rewrite, reloading routes'); @@ -519,6 +520,10 @@ class Router 'rewriteRoute' => $this->request->getRewriteRoute(), ]); + if ($this->request->getRewriteRoute() !== null) { + $this->processedRoutes[] = $this->request->getRewriteRoute(); + } + return $this->routeRequest(); } diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php index 3209812..2e4436a 100644 --- a/src/Pecee/SimpleRouter/SimpleRouter.php +++ b/src/Pecee/SimpleRouter/SimpleRouter.php @@ -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 */