Bug fixed about query params in route paths.

izniburak · Nov 29, 2020 · 70e16b9 · 70e16b9
1 parent 3e6d43c
commit 70e16b9
Showing 1 changed file with 3 additions and 2 deletions.
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]);
     }
 }