Merge pull request #3 from transprime-research/fix-remove-question-ma…

…rk-from-url-when-no-query fix: Remove question mark from url if there's no query
transprime-research · Aug 23, 2023 · 894ce78 · 894ce78
2 parents cc7f640 + ab142c0
commit 894ce78
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Url.php b/src/Url.php
@@ -85,7 +85,7 @@ public function __toString(): string
 
     public function toString(): string
     {
-        return implode($this->toArray());
+        return implode(array_filter($this->toArray()));
     }
 
     public function toArray(): array
@@ -94,7 +94,7 @@ public function toArray(): array
             return [
                 $this->fullDomain,
                 $this->path,
-                '?',
+                $this->query ? '?' : '',
                 http_build_query($this->query),
             ];
         }
@@ -104,7 +104,7 @@ public function toArray(): array
             $this->domain,
             $this->port ? ':' . $this->port : $this->port,
             $this->path,
-            '?',
+            $this->query ? '?' : '',
             http_build_query($this->query)
         ];
     }

diff --git a/tests/UrlTest.php b/tests/UrlTest.php
@@ -74,6 +74,23 @@ public function testUrlIsCorrectForSetFullDomain(): void
         $this->assertEquals('http://localhost:8080/api/hello?name=John&public=yes', (string) $url);
     }
 
+    public function testUrlIsCorrectWhenThereIsNoQuery(): void
+    {
+        $url = Url::make(
+            fullDomain: 'http://localhost:8080',
+            path: '/api/hello',
+        );
+
+        $this->assertEquals([
+            'http://localhost:8080',
+            '/api/hello',
+            '',
+            '',
+        ], $url->toArray());
+
+        $this->assertEquals('http://localhost:8080/api/hello', (string) $url);
+    }
+
     public function testUrlIsCorrectWhenSetOnConstructor(): void
     {
         $url = Url::make(