fix(http): empty request uri is an empty path (/)

leocavalcante · Jan 27, 2021 · 5c69776 · 5c69776
1 parent 042132c
commit 5c69776
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Http/Http.php b/src/Http/Http.php
@@ -114,7 +114,7 @@ function path(): string
     }
 
     $query_string = strpos($request_uri, '?');
-    $request_uri = $query_string ? substr($request_uri, 0, $query_string) : $request_uri;
+    $request_uri = $query_string === false ? $request_uri : substr($request_uri, 0, $query_string);
     $request_uri = rawurldecode($request_uri);
     $script_path = str_replace('\\', '/', \dirname($script_name));
 

diff --git a/tests/Unit/Http/HttpTest.php b/tests/Unit/Http/HttpTest.php
@@ -99,6 +99,21 @@ public function testFuzzyQueryString()
         $this->assertSame('/bar/baz', Http\path());
     }
 
+    public function testEmptyRequestUri()
+    {
+        $_SERVER['REQUEST_URI'] = '';
+        $this->assertSame('/', Http\path());
+
+        $_SERVER['REQUEST_URI'] = '/';
+        $this->assertSame('/', Http\path());
+
+        $_SERVER['REQUEST_URI'] = '?foo=bar';
+        $this->assertSame('/', Http\path());
+
+        $_SERVER['REQUEST_URI'] = '/?foo=bar';
+        $this->assertSame('/', Http\path());
+    }
+
     protected function setUp(): void
     {
         $_GET = $_POST = $_REQUEST = $_COOKIE = $_SESSION = ['foo' => 'bar'];