upgrade to integration tests 4

Author: dbu

.github/workflows/ci.yml

@@ -24,6 +24,7 @@ jobs:
     needs:
       - supported-versions-matrix
     strategy:
+      fail-fast: false
       matrix:
         php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
 
@@ -56,6 +57,7 @@ jobs:
     needs:
       - supported-versions-matrix
     strategy:
+      fail-fast: false
       matrix:
         php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
 

composer.json

@@ -18,10 +18,10 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.51",
-        "php-http/client-integration-tests": "^3.1.1",
+        "php-http/client-integration-tests": "dev-cleanup-major",
         "php-http/message": "^1.16",
         "php-http/client-common": "^2.7",
-        "phpunit/phpunit": "^8.5.23 || ~9.5",
+        "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
         "php-http/message-factory": "^1.1"
     },
     "provide": {

src/Client.php

@@ -28,16 +28,16 @@ class Client implements HttpClient
     use ResponseReader;
 
     /**
-     * @var array{remote_socket: string|null, timeout: int, stream_context: resource, stream_context_options: array<string, mixed>, stream_context_param: array<string, mixed>, ssl: ?boolean, write_buffer_size: int, ssl_method: int}
+     * @var array{remote_socket: string|null, timeout: int, stream_context: resource, stream_context_options: array<string, mixed>, stream_context_param: array<string, mixed>, ssl: ?bool, write_buffer_size: int, ssl_method: int}
      */
     private $config;
 
     /**
      * Constructor.
      *
-     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?boolean, write_buffer_size?: int, ssl_method?: int}|ResponseFactoryInterface $config1
-     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?boolean, write_buffer_size?: int, ssl_method?: int}|null                     $config2 Mistake when refactoring the constructor from version 1 to version 2 - used as $config if set and $configOrResponseFactory is a response factory instance
-     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?boolean, write_buffer_size?: int, ssl_method?: int}                          $config  intended for version 1 BC, used as $config if $config2 is not set and $configOrResponseFactory is a response factory instance
+     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?bool, write_buffer_size?: int, ssl_method?: int}|ResponseFactoryInterface $config1
+     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?bool, write_buffer_size?: int, ssl_method?: int}|null                     $config2 Mistake when refactoring the constructor from version 1 to version 2 - used as $config if set and $configOrResponseFactory is a response factory instance
+     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?bool, write_buffer_size?: int, ssl_method?: int}                          $config  intended for version 1 BC, used as $config if $config2 is not set and $configOrResponseFactory is a response factory instance
      *
      * string|null          remote_socket          Remote entrypoint (can be a tcp or unix domain address)
      * int                  timeout                Timeout before canceling request
@@ -141,9 +141,9 @@ protected function closeSocket($socket)
     /**
      * Return configuration for the socket client.
      *
-     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?boolean, write_buffer_size?: int, ssl_method?: int} $config
+     * @param array{remote_socket?: string|null, timeout?: int, stream_context?: resource, stream_context_options?: array<string, mixed>, stream_context_param?: array<string, mixed>, ssl?: ?bool, write_buffer_size?: int, ssl_method?: int} $config
      *
-     * @return array{remote_socket: string|null, timeout: int, stream_context: resource, stream_context_options: array<string, mixed>, stream_context_param: array<string, mixed>, ssl: ?boolean, write_buffer_size: int, ssl_method: int}
+     * @return array{remote_socket: string|null, timeout: int, stream_context: resource, stream_context_options: array<string, mixed>, stream_context_param: array<string, mixed>, ssl: ?bool, write_buffer_size: int, ssl_method: int}
      */
     protected function configure(array $config = [])
     {

tests/SocketHttpClientTest.php

@@ -7,15 +7,16 @@
 use Http\Client\Socket\Exception\NetworkException;
 use Http\Client\Socket\Exception\TimeoutException;
 use Nyholm\Psr7\Factory\Psr17Factory;
+use Psr\Http\Message\ResponseInterface;
 
 class SocketHttpClientTest extends BaseTestCase
 {
-    public function createClient($options = [])
+    public function createClient($options = []): HttpMethodsClient
     {
         return new HttpMethodsClient(new SocketHttpClient($options), new Psr17Factory());
     }
 
-    public function testTcpSocketDomain()
+    public function testTcpSocketDomain(): void
     {
         $this->startServer('tcp-server');
         $client = $this->createClient(['remote_socket' => '127.0.0.1:19999']);
@@ -73,7 +74,7 @@ public function testSslRemoteInUri(): void
         ]);
         $response = $client->get('/', []);
 
-        $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
+        $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(200, $response->getStatusCode());
     }