refactor: update handling of paths

Author: innocenzi

packages/support/src/Uri/Uri.php

@@ -229,7 +229,7 @@ private function with(
             password: $password ?? $this->password,
             host: $host ?? $this->host,
             port: $port ?? $this->port,
-            path: Str\ensure_starts_with($path ?? $this->path, '/'),
+            path: $path ?? $this->path,
             queryString: match (true) {
                 $queryString !== null => $queryString,
                 $query !== [] => $this->buildQueryString($query),
@@ -302,7 +302,13 @@ public function toString(): string
         }
 
         if ($this->path !== null) {
-            $uri .= $this->path;
+            $path = $this->path;
+
+            if ($this->host !== null) {
+                $path = Str\ensure_starts_with($path, '/');
+            }
+
+            $uri .= $path;
         }
 
         if ($this->queryString !== null && $this->queryString !== '') {

packages/support/tests/Uri/FunctionsTest.php

@@ -39,6 +39,7 @@ final class FunctionsTest extends TestCase
     #[TestWith(['https://example.com', ['foo'], 'https://example.com?foo'])]
     #[TestWith(['https://example.com', ['foo' => true], 'https://example.com?foo=true'])]
     #[TestWith(['https://example.com', ['foo' => false], 'https://example.com?foo=false'])]
+    #[TestWith(['https://example.com', ['foo' => ['bar' => 'baz']], 'https://example.com?foo%5Bbar%5D=baz'])]
     public function set_query(string $uri, array $query, string $expected): void
     {
         $this->assertSame($expected, set_query($uri, ...$query));
@@ -79,7 +80,7 @@ public function get_fragment(string $uri, ?string $expected): void
     #[TestWith(['https://example.com', 'flamme.org', 'https://flamme.org'])]
     #[TestWith(['https://old.com/path', 'neue.com', 'https://neue.com/path'])]
     #[TestWith(['http://user:[email protected]:8080', 'serie.com', 'http://user:[email protected]:8080'])]
-    #[TestWith(['malformed-uri', 'domain.com', '//domain.commalformed-uri'])]
+    #[TestWith(['malformed-uri', 'domain.com', '//domain.com/malformed-uri'])]
     public function set_host(string $uri, string $host, string $expected): void
     {
         $this->assertSame($expected, set_host($uri, $host));

packages/support/tests/Uri/UriTest.php

@@ -103,20 +103,11 @@ public function path_manipulation(): void
 
         $clone = $uri->withPath('foo/bar');
         $this->assertSame('https://example.com/foo/bar', $clone->toString());
-        $this->assertSame('/foo/bar', $clone->path);
+        $this->assertSame('foo/bar', $clone->path);
 
         $this->assertNull($uri->path);
     }
 
-    #[Test]
-    #[TestWith(['/foo/bar', '/foo/bar'])]
-    #[TestWith(['foo/bar', '/foo/bar'])]
-    #[TestWith(['foo-bar', '/foo-bar'])]
-    public function path_prefix(string $path, string $expected): void
-    {
-        $this->assertSame($expected, Uri::from('https://example.com')->withPath($path)->path);
-    }
-
     #[Test]
     public function query_manipulation(): void
     {