Merge pull request #136 from GrahamCampbell/patch-1

Fix #135
thephpleague · Jul 8, 2021 · 88d0557 · 88d0557
2 parents 19a3ce4 + 661d8c9
commit 88d0557
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,8 @@
         "php": ">=7.1||>=8.0",
         "ext-json": "*",
         "ext-openssl": "*",
-        "guzzlehttp/guzzle": "^6.0|^7.0"
+        "guzzlehttp/guzzle": "^6.0|^7.0",
+        "guzzlehttp/psr7": "^1.7|^2.0"
     },
     "require-dev": {
         "ext-simplexml": "*",

diff --git a/src/Signature/EncodesUrl.php b/src/Signature/EncodesUrl.php
@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Uri;
-use function GuzzleHttp\Psr7\uri_for;
 use Psr\Http\Message\UriInterface;
 
 trait EncodesUrl
@@ -18,12 +17,7 @@ trait EncodesUrl
      */
     protected function createUrl($uri)
     {
-        if (method_exists(Psr7\Utils::class, 'uriFor')) {
-            return Psr7\Utils::uriFor($uri);
-        }
-
-        // Deprecated, removed in Guzzle 7.2
-        return Psr7\uri_for($uri);
+        return Psr7\Utils::uriFor($uri);
     }
 
     /**