re-enable and fix tests for guzzle integration

Author: dbu

composer.json

@@ -25,7 +25,7 @@
         "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^1.0",
+        "guzzlehttp/psr7": "^2.0",
         "php-http/client-integration-tests": "^3.0",
         "phpunit/phpunit": "^7.5 || ^9.4",
         "laminas/laminas-diactoros": "^2.0",

phpunit.xml.dist

@@ -14,9 +14,6 @@
 
         <testsuite name="All">
             <directory>tests</directory>
-            <!-- Exclude till https://github.com/php-http/message/issues/105 resolved. -->
-            <exclude>tests/Functional/HttpAsyncClientGuzzleTest.php</exclude>
-            <exclude>tests/Functional/HttpClientGuzzleTest.php</exclude>
         </testsuite>
 
         <testsuite name="Unit">
@@ -25,9 +22,6 @@
 
         <testsuite name="Functional">
             <directory>tests/Functional</directory>
-            <!-- Exclude till https://github.com/php-http/message/issues/105 resolved. -->
-            <exclude>tests/Functional/HttpAsyncClientGuzzleTest.php</exclude>
-            <exclude>tests/Functional/HttpClientGuzzleTest.php</exclude>
         </testsuite>
 
     </testsuites>

tests/Functional/HttpAsyncClientGuzzleTest.php

@@ -4,10 +4,9 @@
 
 namespace Http\Client\Curl\Tests\Functional;
 
+use GuzzleHttp\Psr7\HttpFactory;
 use Http\Client\Curl\Client;
 use Http\Client\HttpAsyncClient;
-use Http\Message\MessageFactory\GuzzleMessageFactory;
-use Http\Message\StreamFactory\GuzzleStreamFactory;
 
 /**
  * @covers \Http\Client\Curl\Client
@@ -19,6 +18,6 @@ class HttpAsyncClientGuzzleTest extends HttpAsyncClientTestCase
      */
     protected function createHttpAsyncClient(): HttpAsyncClient
     {
-        return new Client(new GuzzleMessageFactory(), new GuzzleStreamFactory());
+        return new Client(new HttpFactory(), new HttpFactory());
     }
 }

tests/Functional/HttpClientGuzzleTest.php

@@ -4,11 +4,10 @@
 
 namespace Http\Client\Curl\Tests\Functional;
 
+use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Stream;
 use Http\Client\Curl\Client;
-use Http\Client\HttpClient;
-use Http\Message\MessageFactory\GuzzleMessageFactory;
-use Http\Message\StreamFactory\GuzzleStreamFactory;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -19,9 +18,9 @@ class HttpClientGuzzleTest extends HttpClientTestCase
     /**
      * {@inheritdoc}
      */
-    protected function createHttpAdapter(): HttpClient
+    protected function createHttpAdapter(): ClientInterface
     {
-        return new Client(new GuzzleMessageFactory(), new GuzzleStreamFactory());
+        return new Client(new HttpFactory(), new HttpFactory());
     }
 
     /**