fix: accept UriInterface and strings

brokeyourbike · Oct 20, 2021 · ad29335 · ad29335
1 parent b3b0193
commit ad29335
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/ResolveUriTrait.php b/src/ResolveUriTrait.php
@@ -8,6 +8,7 @@
 
 namespace BrokeYourBike\ResolveUri;
 
+use Psr\Http\Message\UriInterface;
 use GuzzleHttp\Psr7\Utils;
 use GuzzleHttp\Psr7\UriResolver;
 
@@ -17,13 +18,13 @@
 trait ResolveUriTrait
 {
     /**
-     * @return \Psr\Http\Message\UriInterface
+     * @return UriInterface
      */
-    public function resolveUriFor(string $baseUri, string $uri): \Psr\Http\Message\UriInterface
+    public function resolveUriFor(string|UriInterface $baseUri, string|UriInterface $uri): UriInterface
     {
-        $baseUri = Utils::uriFor($baseUri);
-        $uri = Utils::uriFor($uri);
+        $base = Utils::uriFor($baseUri);
+        $rel = Utils::uriFor($uri);
 
-        return UriResolver::resolve($baseUri, $uri);
+        return UriResolver::resolve($base, $rel);
     }
 }
diff --git a/tests/ResolveUriTest.php b/tests/ResolveUriTest.php
@@ -25,7 +25,7 @@ public function it_uses_json_request_result_trait(): void
     }
 
     /** @test */
-    public function it_can_resolve_uri()
+    public function it_can_resolve_uri_from_strings()
     {
         $apiClient = new ApiClientFixture();