From 4cd1e8e069f37c7050fe19681660c7356d4de1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Tue, 22 Aug 2017 17:18:48 +0100 Subject: [PATCH] Fixed: return / if all parameters are empty in `$router->getUrl` method. --- src/Pecee/SimpleRouter/Router.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php index 9090d6a..621eebe 100644 --- a/src/Pecee/SimpleRouter/Router.php +++ b/src/Pecee/SimpleRouter/Router.php @@ -248,6 +248,7 @@ class Router if ($rewriteRoute !== null) { $rewriteRoute->loadMiddleware($this->request); + return $rewriteRoute->renderRoute($this->request); } @@ -265,6 +266,7 @@ class Router /* Render route */ $routeNotAllowed = false; $this->request->setLoadedRoute($route); + return $route->renderRoute($this->request); break; @@ -323,6 +325,7 @@ class Router if ($rewriteRoute !== null) { $rewriteRoute->loadMiddleware($this->request); + return $rewriteRoute->renderRoute($this->request); } @@ -434,6 +437,10 @@ class Router throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null'); } + if ($name === '' && $parameters === '') { + return '/'; + } + /* Only merge $_GET when all parameters are null */ if ($name === null && $parameters === null && $getParams === null) { $getParams = $_GET;