Improve BaseUri public API

thephpleague · Jul 2, 2023 · 4f963cf · 4f963cf
1 parent 370b44f
commit 4f963cf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/BaseUri.php b/BaseUri.php
@@ -34,22 +34,25 @@ final class BaseUri implements Stringable
      */
     private const DOT_SEGMENTS = ['.' => 1, '..' => 1];
 
-    public readonly ?string $origin;
+    public readonly ?UriInterface $origin;
 
     private function __construct(
-        public readonly UriInterface $value
+        public readonly Psr7UriInterface|UriInterface $value
     ) {
-        $this->origin = UriInfo::getOrigin($this->value);
+        $origin = UriInfo::getOrigin($this->value);
+        if (null !== $origin) {
+            $this->origin = Uri::new($origin);
+        }
     }
 
     public static function new(Stringable|string $baseUri): self
     {
-        return new self(Uri::new($baseUri));
+        return new self(self::filterUri($baseUri));
     }
 
     public function __toString(): string
     {
-        return $this->value->toString();
+        return $this->value->__toString();
     }
 
     /**
@@ -72,14 +75,14 @@ private static function filterUri(Stringable|string $uri): Psr7UriInterface|UriI
      * This method MUST be transparent when dealing with error and exceptions.
      * It MUST not alter or silence them apart from validating its own parameters.
      */
-    public function resolve(Stringable|string $uri): Psr7UriInterface|UriInterface
+    public function resolve(Stringable|string $uri): self
     {
         $uri = self::filterUri($uri);
         $null = $uri instanceof Psr7UriInterface ? '' : null;
 
         if ($null !== $uri->getScheme()) {
-            return $uri
-                ->withPath(self::removeDotSegments($uri->getPath()));
+            return new self($uri
+                ->withPath(self::removeDotSegments($uri->getPath())));
         }
 
         if ($null !== $uri->getAuthority()) {
@@ -88,9 +91,9 @@ public function resolve(Stringable|string $uri): Psr7UriInterface|UriInterface
                 $scheme = '';
             }
 
-            return $uri
+            return new self($uri
                 ->withScheme($scheme)
-                ->withPath(self::removeDotSegments($uri->getPath()));
+                ->withPath(self::removeDotSegments($uri->getPath())));
         }
 
         $user = $null;
@@ -102,13 +105,13 @@ public function resolve(Stringable|string $uri): Psr7UriInterface|UriInterface
 
         [$path, $query] = $this->resolvePathAndQuery($uri);
 
-        return $uri
+        return new self($uri
             ->withPath($this->removeDotSegments($path))
             ->withQuery($query)
             ->withHost($this->value->getHost())
             ->withPort($this->value->getPort())
             ->withUserInfo((string) $user, $pass)
-            ->withScheme($this->value->getScheme())
+            ->withScheme($this->value->getScheme()))
         ;
     }
 
@@ -213,24 +216,24 @@ private function resolvePathAndQuery(Psr7UriInterface|UriInterface $uri): array
      * This method MUST be transparent when dealing with error and exceptions.
      * It MUST not alter of silence them apart from validating its own parameters.
      */
-    public function relativize(Stringable|string $uri): Psr7UriInterface|UriInterface
+    public function relativize(Stringable|string $uri): self
     {
         $uri = self::formatHost(self::filterUri($uri));
         if (!$this->isRelativizable($uri)) {
-            return $uri;
+            return new self($uri);
         }
 
         $null = $uri instanceof Psr7UriInterface ? '' : null;
         $uri = $uri->withScheme($null)->withPort(null)->withUserInfo($null)->withHost($null);
         $targetPath = $uri->getPath();
         $basePath = $this->value->getPath();
 
-        return match (true) {
+        return new self(match (true) {
             $targetPath !== $basePath => $uri->withPath(self::relativizePath($targetPath, $basePath)),
             self::componentEquals('query', $uri) => $uri->withPath('')->withQuery($null),
             $null === $uri->getQuery() => $uri->withPath(self::formatPathWithEmptyBaseQuery($targetPath)),
             default => $uri->withPath(''),
-        };
+        });
     }
 
     /**
@@ -365,6 +368,6 @@ public function isCrossOrigin(Stringable|string $uri): bool
     {
         return null === $this->origin
             || null === ($uriString = UriInfo::getOrigin($uri))
-            || $uriString !== $this->origin;
+            || $uriString !== $this->origin->toString();
     }
 }
diff --git a/Uri.php b/Uri.php
@@ -447,7 +447,7 @@ public static function fromBaseUri(Stringable|String $uri, Stringable|String|nul
             }
 
             /** @var UriInterface $uri */
-            $uri = BaseUri::new($uri->withFragment(null)->withQuery(null)->withPath(''))->resolve($uri);
+            $uri = BaseUri::new($uri->withFragment(null)->withQuery(null)->withPath(''))->resolve($uri)->value;
 
             return $uri;
         }
@@ -461,7 +461,7 @@ public static function fromBaseUri(Stringable|String $uri, Stringable|String|nul
         }
 
         /** @var UriInterface $uri */
-        $uri = $baseUri->resolve($uri);
+        $uri = $baseUri->resolve($uri)->value;
 
         return $uri;
     }

diff --git a/UriInfo.php b/UriInfo.php
@@ -59,7 +59,7 @@ private static function normalize(Psr7UriInterface|UriInterface $uri): Psr7UriIn
 
         $path = $uri->getPath();
         if ('/' === ($path[0] ?? '') || '' !== $uri->getScheme().$uri->getAuthority()) {
-            $path = BaseUri::new($uri->withPath('')->withQuery($null))->resolve($uri)->getPath();
+            $path = BaseUri::new($uri->withPath('')->withQuery($null))->resolve($uri)->value->getPath();
         }
 
         $query = $uri->getQuery();

diff --git a/UriResolver.php b/UriResolver.php
@@ -35,7 +35,7 @@ final class UriResolver
      */
     public static function resolve(Stringable|string $uri, Stringable|string $baseUri): Psr7UriInterface|UriInterface
     {
-        return BaseUri::new($baseUri)->resolve($uri);
+        return BaseUri::new($baseUri)->resolve($uri)->value;
     }
 
     /**
@@ -49,6 +49,6 @@ public static function resolve(Stringable|string $uri, Stringable|string $baseUr
      */
     public static function relativize(Stringable|string $uri, Stringable|string $baseUri): Psr7UriInterface|UriInterface
     {
-        return BaseUri::new($baseUri)->relativize($uri);
+        return BaseUri::new($baseUri)->relativize($uri)->value;
     }
 }