Fixed: return / if all parameters are empty in $router->getUrl method.

This commit is contained in:
Simon Sessingø
2017-08-22 17:18:48 +01:00
parent 7e8cb91f68
commit 4cd1e8e069
+7
View File
@@ -248,6 +248,7 @@ class Router
if ($rewriteRoute !== null) { if ($rewriteRoute !== null) {
$rewriteRoute->loadMiddleware($this->request); $rewriteRoute->loadMiddleware($this->request);
return $rewriteRoute->renderRoute($this->request); return $rewriteRoute->renderRoute($this->request);
} }
@@ -265,6 +266,7 @@ class Router
/* Render route */ /* Render route */
$routeNotAllowed = false; $routeNotAllowed = false;
$this->request->setLoadedRoute($route); $this->request->setLoadedRoute($route);
return $route->renderRoute($this->request); return $route->renderRoute($this->request);
break; break;
@@ -323,6 +325,7 @@ class Router
if ($rewriteRoute !== null) { if ($rewriteRoute !== null) {
$rewriteRoute->loadMiddleware($this->request); $rewriteRoute->loadMiddleware($this->request);
return $rewriteRoute->renderRoute($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'); throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
} }
if ($name === '' && $parameters === '') {
return '/';
}
/* Only merge $_GET when all parameters are null */ /* Only merge $_GET when all parameters are null */
if ($name === null && $parameters === null && $getParams === null) { if ($name === null && $parameters === null && $getParams === null) {
$getParams = $_GET; $getParams = $_GET;