re-enable and fix tests for guzzle integration

Author: dbu

.github/workflows/Build-Test.yml

@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-22.04]
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
         include:
           - operating-system: ubuntu-20.04
-            php-versions: '7.1'
+            php-versions: '7.4'
             COMPOSER_FLAGS: '--prefer-stable --prefer-lowest'
             PHPUNIT_FLAGS: '--coverage-clover build/coverage.xml'
 

composer.json

@@ -15,7 +15,7 @@
     "prefer-stable": true,
     "minimum-stability": "dev",
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-curl": "*",
         "php-http/discovery": "^1.6",
         "php-http/httplug": "^2.0",
@@ -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());
     }
 
     /**

tests/Unit/ClientTest.php

@@ -4,6 +4,7 @@
 
 namespace Http\Client\Curl\Tests\Unit;
 
+use GuzzleHttp\Psr7\Utils;
 use Http\Client\Curl\Client;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -83,14 +84,13 @@ public function testRewindLargeStream(): void
         }
 
         $length = strlen($content);
-        $body = \GuzzleHttp\Psr7\stream_for($content);
+        $body = Utils::streamFor($content);
         $body->seek(40);
         $request = new Request('http://foo.com', 'POST', $body);
         $options = $bodyOptions->invoke($client, $request, []);
 
-        static::assertTrue(
-            false !== strstr($options[CURLOPT_READFUNCTION](null, null, $length), 'abcdef'),
-            'Steam was not rewinded'
+        static::assertNotFalse(
+            strpos($options[CURLOPT_READFUNCTION](null, null, $length), 'abcdef'), 'Steam was not rewinded'
         );
     }
 
@@ -101,7 +101,7 @@ public function testRewindStream(): void
         $bodyOptions = new \ReflectionMethod(Client::class, 'addRequestBodyOptions');
         $bodyOptions->setAccessible(true);
 
-        $body = \GuzzleHttp\Psr7\stream_for('abcdef');
+        $body = Utils::streamFor('abcdef');
         $body->seek(3);
         $request = new Request('http://foo.com', 'POST', $body);
         $options = $bodyOptions->invoke($client, $request, []);