Merge pull request #26 from TransitScreen/add_guzzle_psr7_2_support

Switch to guzzlehttp/psr7:^2.2.1 and use its official HTTP factories
TransitScreen · Apr 29, 2022 · 15d0b66 · 15d0b66
2 parents d63d62c + 49e7738
commit 15d0b66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,10 @@
     ],
     "require": {
         "php": "^7.3||^8.0",
-        "guzzlehttp/psr7": "^1.0",
+        "guzzlehttp/psr7": "^2.0",
         "php-http/message": "^1.5",
         "php-http/curl-client": "^2.1",
-        "psr/http-message": "^1.0",
-        "http-interop/http-factory-guzzle": "^1.0"
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
         "php-http/mock-client": "^1.0",

diff --git a/src/Client.php b/src/Client.php
@@ -2,15 +2,14 @@
 
 namespace HerokuClient;
 
+use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Request;
 use HerokuClient\Exception\BadHttpStatusException;
 use HerokuClient\Exception\JsonDecodingException;
 use HerokuClient\Exception\JsonEncodingException;
 use HerokuClient\Exception\MissingApiKeyException;
 use Http\Client\Curl\Client as CurlHttpClient;
 use Http\Client\HttpClient;
-use Http\Factory\Guzzle\ResponseFactory;
-use Http\Factory\Guzzle\StreamFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -269,8 +268,8 @@ protected function processResponse(ResponseInterface $httpResponse)
     protected function buildHttpClient()
     {
         return new CurlHttpClient(
-            new ResponseFactory(),
-            new StreamFactory(),
+            new HttpFactory(),
+            new HttpFactory(),
             $this->curlOptions
         );
     }