fix issue #184 (#185)

Fix UriString::resolve to correctly handle path and authority resolution.

Author: nyamsprod

UriString.php

@@ -144,7 +144,7 @@ final class UriString
      */
     public static function toIriString(BackedEnum|Stringable|string $uri): string
     {
-        $components = UriString::parse($uri);
+        $components = self::parse($uri);
         $port = null;
         if (isset($components['port'])) {
             $port = (int) $components['port'];
@@ -325,7 +325,7 @@ public static function normalizeAuthority(Stringable|string|null $authority): ?s
             return null;
         }
 
-        $components = UriString::parseAuthority($authority);
+        $components = self::parseAuthority($authority);
         $components['host'] = self::normalizeHost($components['host'] ?? null);
         $components['user'] = Encoder::normalizeUser($components['user']);
         $components['pass'] = Encoder::normalizePassword($components['pass']);
@@ -358,50 +358,41 @@ public static function resolve(BackedEnum|Stringable|string $uri, BackedEnum|Str
 
         $uri = (string) $uri;
         if ('' === $uri) {
-            $uri = $baseUri ?? throw new SyntaxError('The uri can not be the empty string when there\'s no base URI.');
+            $uri = $baseUri ?? throw new SyntaxError("The uri can not be the empty string when there's no base URI.");
         }
 
         $uriComponents = self::parse($uri);
         $baseUriComponents = $uriComponents;
-        if (null !== $baseUri && (string) $uri !== (string) $baseUri) {
+        if (null !== $baseUri && $uri !== (string) $baseUri) {
             $baseUriComponents = self::parse($baseUri);
         }
 
-        $hasLeadingSlash = str_starts_with($baseUriComponents['path'], '/');
         if (null === $baseUriComponents['scheme']) {
             throw new SyntaxError('The base URI must be an absolute URI or null; If the base URI is null the URI must be an absolute URI.');
         }
 
-        if (null !== $uriComponents['scheme'] && '' !== $uriComponents['scheme']) {
-            $uriComponents['path'] = self::removeDotSegments($uriComponents['path']);
-            if ('' !== $uriComponents['path'] && '/' !== $uriComponents['path'][0] && $hasLeadingSlash) {
-                $uriComponents['path'] = '/'.$uriComponents['path'];
-            }
-
-            return UriString::build($uriComponents);
+        $authority = self::buildAuthority($uriComponents);
+        $path = self::removeDotSegments($uriComponents['path']);
+        if (null !== $authority && '' !== $path && '/' !== $path[0]) {
+            $path = '/'.$path;
         }
 
-        if (null !== self::buildAuthority($uriComponents)) {
-            $uriComponents['scheme'] = $baseUriComponents['scheme'];
-            $uriComponents['path'] = self::removeDotSegments($uriComponents['path']);
-            if ('' !== $uriComponents['path'] && '/' !== $uriComponents['path'][0] && $hasLeadingSlash) {
-                $uriComponents['path'] = '/'.$uriComponents['path'];
-            }
+        if (null !== $uriComponents['scheme'] && '' !== $uriComponents['scheme']) {
+            return self::buildUri($uriComponents['scheme'], $authority, $path, $uriComponents['query'], $uriComponents['fragment']);
+        }
 
-            return UriString::build($uriComponents);
+        if (null !== $authority) {
+            return self::buildUri($baseUriComponents['scheme'], $authority, $path, $uriComponents['query'], $uriComponents['fragment']);
         }
 
         [$path, $query] = self::resolvePathAndQuery($uriComponents, $baseUriComponents);
-        $path = UriString::removeDotSegments($path);
-        if ('' !== $path && '/' !== $path[0] && $hasLeadingSlash) {
+        $authority = self::buildAuthority($baseUriComponents);
+        $path = self::removeDotSegments($path);
+        if (null !== $authority && '' !== $path && '/' !== $path[0]) {
             $path = '/'.$path;
         }
 
-        $baseUriComponents['path'] = $path;
-        $baseUriComponents['query'] = $query;
-        $baseUriComponents['fragment'] = $uriComponents['fragment'];
-
-        return UriString::build($baseUriComponents);
+        return self::buildUri($baseUriComponents['scheme'], $authority, $path, $query, $uriComponents['fragment']);
     }
 
     /**

UriStringTest.php

@@ -1101,13 +1101,21 @@ public static function normalizedUriProvider(): iterable
         ];
     }
 
-    public function test_it_does_resolves_uri_against_authority_less_absolte_path(): void
+    public function test_it_does_resolves_uri_against_authority_less_absolute_path(): void
     {
-        self::assertSame('foo:/c', UriString::resolve('../../c', 'foo:/a/b'));
+        self::assertSame('foo:c', UriString::resolve('../../c', 'foo:/a/b'));
     }
 
     public function test_it_can_resolve_uri_when_dot_segment_leave_the_path_relative(): void
     {
         self::assertSame('https://user:pass@host/toto', UriString::resolve('https://user:pass@host/./.././toto'));
     }
+
+    public function test_it_resolve_correctly_uri_issue_184(): void
+    {
+        $baseUri = 'http://a/b/c/d;p?q';
+
+        self::assertSame('g:h', UriString::resolve('g:h', $baseUri));
+        self::assertSame('foo:g', UriString::resolve('foo:g', $baseUri));
+    }
 }