Replaced deprecated function unwrap()

JBZoo · Oct 1, 2020 · a5a541e · a5a541e
1 parent e791606
commit a5a541e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,12 @@
         }
     ],
     "require"           : {
-        "php"         : ">=7.2",
-        "ext-json"    : "*",
+        "php"                 : ">=7.2",
+        "ext-json"            : "*",
 
-        "jbzoo/data"  : "^4.0.1",
-        "jbzoo/utils" : "^4.2.1"
+        "jbzoo/data"          : "^4.0.1",
+        "jbzoo/utils"         : "^4.2.1",
+        "guzzlehttp/promises" : ">=1.4.0"
     },
 
     "require-dev"       : {

diff --git a/src/Driver/Guzzle.php b/src/Driver/Guzzle.php
@@ -21,8 +21,6 @@
 use JBZoo\HttpClient\Request;
 use JBZoo\HttpClient\Response;
 
-use function GuzzleHttp\Promise\unwrap;
-
 /**
  * Class Guzzle
  * @package JBZoo\HttpClient\Driver
@@ -59,7 +57,6 @@ public function request(Request $request): Response
 
     /**
      * @inheritDoc
-     * @psalm-suppress DeprecatedFunction
      */
     public function multiRequest(array $requestList): array
     {
@@ -79,12 +76,7 @@ public function multiRequest(array $requestList): array
             );
         }
 
-        if (function_exists('\GuzzleHttp\Promise\unwrap')) {
-            /** @phan-suppress-next-line PhanDeprecatedFunction */
-            $httpResults = unwrap($promises);
-        } else {
-            $httpResults = Utils::unwrap($promises);
-        }
+        $httpResults = Utils::unwrap($promises);
 
         $result = [];
         foreach ($httpResults as $name => $httpResult) {