From ad29335e336f63dde607c939e59b45f04e442d45 Mon Sep 17 00:00:00 2001
From: Ivan Stasiuk <brokeyourbike@gmail.com>
Date: Wed, 20 Oct 2021 20:50:13 +0300
Subject: [PATCH] fix: accept UriInterface and strings

---
 src/ResolveUriTrait.php  | 11 ++++++-----
 tests/ResolveUriTest.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ResolveUriTrait.php b/src/ResolveUriTrait.php
index fbfd102..2955f22 100644
--- 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
index fb9f044..57c38de 100644
--- 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();