replace custom UriInterface implementation with a \Uri\Rfc3986\Uri wrapper

Author: KurtThiemann

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ '8.3', '8.4', '8.5' ]
+        php-version: [ '8.5' ]
 
     name: Run tests on PHP v${{ matrix.php-version }}
 

composer.json

@@ -7,7 +7,8 @@
         "psr/http-message": "^1.1 || ^2.0",
         "psr/http-factory": "^1.1",
         "ext-curl": "*",
-        "php": ">=8.3.0"
+        "php": ">=8.5",
+        "ext-uri": "*"
     },
     "provide": {
         "psr/http-client-implementation": "1.0",

src/Exception/UriResolutionException.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Aternos\CurlPsr\Exception;
+
+use Exception;
+use Psr\Http\Message\UriInterface;
+use Throwable;
+
+class UriResolutionException extends Exception implements UriResolutionExceptionInterface
+{
+    /**
+     * @param UriInterface $baseUri
+     * @param UriInterface $targetUri
+     * @param string $message
+     * @param int $code
+     * @param Throwable|null $previous
+     */
+    public function __construct(
+        protected UriInterface $baseUri,
+        protected UriInterface $targetUri,
+        string                 $message = "",
+        int                    $code = 0,
+        ?Throwable             $previous = null
+    )
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBaseUri(): UriInterface
+    {
+        return $this->baseUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTargetUri(): UriInterface
+    {
+        return $this->targetUri;
+    }
+}

src/Exception/UriResolutionExceptionInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Aternos\CurlPsr\Exception;
+
+use Psr\Http\Message\UriInterface;
+use Throwable;
+
+interface UriResolutionExceptionInterface extends Throwable
+{
+    /**
+     * @return UriInterface
+     */
+    public function getBaseUri(): UriInterface;
+
+    /**
+     * @return UriInterface
+     */
+    public function getTargetUri(): UriInterface;
+}

src/Psr18/Client.php

@@ -9,6 +9,7 @@
 use Aternos\CurlPsr\Exception\RequestException;
 use Aternos\CurlPsr\Exception\RequestRedirectedException;
 use Aternos\CurlPsr\Exception\TooManyRedirectsException;
+use Aternos\CurlPsr\Exception\UriResolutionExceptionInterface;
 use Aternos\CurlPsr\Psr17\Psr17Factory;
 use Aternos\CurlPsr\Psr18\UriResolver\UriResolver;
 use Aternos\CurlPsr\Psr18\UriResolver\UriResolverInterface;
@@ -302,7 +303,11 @@ protected function handleRedirect(RequestInterface $request, ResponseInterface $
         }
 
         $originalUri = $request->getUri();
-        $location = $this->uriResolver->resolve($originalUri, $relativeUri);
+        try {
+            $location = $this->uriResolver->resolve($originalUri, $relativeUri);
+        } catch (UriResolutionExceptionInterface $e) {
+            throw new RequestException($request, "Could not resolve redirect location", previous: $e);
+        }
         $request = $request->withUri($location);
 
         if (in_array($response->getStatusCode(), $options->redirectToGetStatusCodes)) {

src/Psr18/UriResolver/UriResolver.php

@@ -2,8 +2,12 @@
 
 namespace Aternos\CurlPsr\Psr18\UriResolver;
 
+use Aternos\CurlPsr\Exception\UriResolutionException;
+use Aternos\CurlPsr\Psr7\Uri;
+use InvalidArgumentException;
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
+use Throwable;
 
 class UriResolver implements UriResolverInterface
 {
@@ -21,83 +25,25 @@ public function __construct(
      */
     public function resolve(UriInterface $baseUri, UriInterface $relativeUri): UriInterface
     {
-        if ($relativeUri->getScheme() !== "") {
-            return $relativeUri;
-        }
-
-        if ($relativeUri->getAuthority() !== "") {
-            return $relativeUri
-                ->withPath($this->removeDotSegments($relativeUri->getPath()))
-                ->withScheme($baseUri->getScheme());
-        }
-
-        $result = $this->uriFactory->createUri();
-        if ($relativeUri->getPath() === "") {
-            $result = $result->withPath($baseUri->getPath());
-            if ($relativeUri->getQuery() !== "") {
-                $result = $result->withQuery($relativeUri->getQuery());
-            } else {
-                $result = $result->withQuery($baseUri->getQuery());
-            }
+        if ($baseUri instanceof Uri) {
+            $builtInBaseUri = $baseUri->getUri();
         } else {
-            $path = $this->mergePaths($baseUri->getPath(), $relativeUri->getPath());
-            $result = $result->withPath($this->removeDotSegments($path))
-                ->withQuery($relativeUri->getQuery());
-        }
-        $result = $result->withUserInfo($baseUri->getUserInfo())
-            ->withHost($baseUri->getHost())
-            ->withPort($baseUri->getPort());
-
-        return $result->withScheme($baseUri->getScheme())
-            ->withFragment($relativeUri->getFragment());
-    }
-
-    /**
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.3
-     * @param string $base
-     * @param string $relative
-     * @return string
-     */
-    protected function mergePaths(string $base, string $relative): string
-    {
-        if (str_starts_with($relative, "/")) {
-            return $relative;
-        }
-
-        $index = strrpos($base, "/");
-        if ($index === false) {
-            return "/" . $relative;
-        }
-
-        return substr($base, 0, $index + 1) . $relative;
-    }
-
-    /**
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4
-     * @param string $path
-     * @return string
-     */
-    protected function removeDotSegments(string $path): string
-    {
-        $resultParts = [];
-        $parts = explode("/", $path);
-
-        foreach ($parts as $part) {
-            if ($part === "..") {
-                array_pop($resultParts);
-            } elseif ($part !== ".") {
-                $resultParts[] = $part;
+            $builtInBaseUri = \Uri\Rfc3986\Uri::parse((string)$baseUri);
+            if ($builtInBaseUri === null) {
+                throw new UriResolutionException($baseUri, $relativeUri, "Could not create built-in URI from base URI");
             }
         }
 
-        $result = implode("/", $resultParts);
-
-        if (str_starts_with($path, "/") && !str_starts_with($result, "/")) {
-            $result = "/" . $result;
-        } else if ($result !== "" && in_array(end($parts), [".", ".."])) {
-            $result .= "/";
+        try {
+            $resolved = $builtInBaseUri->resolve((string)$relativeUri);
+        } catch (Throwable $e) {
+            throw new UriResolutionException($baseUri, $relativeUri, "Could not resolve URI relative to base URI", previous: $e);
         }
 
-        return $result;
+        try {
+            return $this->uriFactory->createUri($resolved->toString());
+        } catch (InvalidArgumentException $e) {
+            throw new UriResolutionException($baseUri, $relativeUri, "Could not create URI from resolved URI string", previous: $e);
+        }
     }
 }

src/Psr18/UriResolver/UriResolverInterface.php

@@ -2,7 +2,9 @@
 
 namespace Aternos\CurlPsr\Psr18\UriResolver;
 
+use Aternos\CurlPsr\Exception\UriResolutionExceptionInterface;
 use Psr\Http\Message\UriInterface;
+use Throwable;
 
 interface UriResolverInterface
 {
@@ -12,6 +14,7 @@ interface UriResolverInterface
      *
      * @param UriInterface $baseUri
      * @param UriInterface $relativeUri
+     * @throws UriResolutionExceptionInterface
      * @return UriInterface
      */
     public function resolve(UriInterface $baseUri, UriInterface $relativeUri): UriInterface;