Bug fixed about query params in route paths.

izniburak · izniburak · commit 70e16b986650 · 2020-11-29T03:04:54.000+03:00
diff --git a/src/Router.php b/src/Router.php
@@ -770,9 +770,10 @@ protected function clearRouteName(string $route = ''): string
      */
     protected function getRequestUri(): string
     {
-        $dirname = dirname($_SERVER['SCRIPT_NAME']);
+        $dirname = dirname($this->request()->server->get('SCRIPT_NAME'));
         $dirname = $dirname === '/' ? '' : $dirname;
         $basename = basename($_SERVER['SCRIPT_NAME']);
-        return $this->clearRouteName(str_replace([$dirname, $basename], null, $_SERVER['REQUEST_URI']));
+        $uri = str_replace([$dirname, $basename],null, $this->request()->server->get('REQUEST_URI'));
+        return $this->clearRouteName(explode('?', $uri)[0]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -770,9 +770,10 @@ protected function clearRouteName(string $route = ''): string`
`770`	`770`	`*/`
`771`	`771`	`protected function getRequestUri(): string`
`772`	`772`	`{`
`773`		`- $dirname = dirname($_SERVER['SCRIPT_NAME']);`
	`773`	`+ $dirname = dirname($this->request()->server->get('SCRIPT_NAME'));`
`774`	`774`	`$dirname = $dirname === '/' ? '' : $dirname;`
`775`	`775`	`$basename = basename($_SERVER['SCRIPT_NAME']);`
`776`		`- return $this->clearRouteName(str_replace([$dirname, $basename], null, $_SERVER['REQUEST_URI']));`
	`776`	`+ $uri = str_replace([$dirname, $basename],null, $this->request()->server->get('REQUEST_URI'));`
	`777`	`+ return $this->clearRouteName(explode('?', $uri)[0]);`
`777`	`778`	`}`
`778`	`779`	`}`