ci: add tests for PHP 8.5

.github/workflows/ci.yml

@@ -13,8 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 10
+      fail-fast: false
       matrix:
-        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Set up PHP
@@ -25,7 +26,7 @@ jobs:
           tools: flex
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
@@ -48,7 +49,7 @@ jobs:
           tools: flex
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable --prefer-lowest

.github/workflows/static.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
@@ -26,18 +26,18 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --dry-run
+          args: --diff --dry-run
 
   psalm:
     name: Psalm
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions

composer.json

@@ -17,7 +17,7 @@
         "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.3",
+        "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
         "php-http/client-integration-tests": "^3.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "php-http/message-factory": "^1.1"

src/Client.php

@@ -43,11 +43,13 @@ public static function createWithConfig(array $config): Client
         return new self(self::buildClient($config));
     }
 
+    #[\Override]
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         return $this->sendAsyncRequest($request)->wait();
     }
 
+    #[\Override]
     public function sendAsyncRequest(RequestInterface $request)
     {
         $promise = $this->guzzle->sendAsync($request);

src/Promise.php

@@ -70,16 +70,19 @@ public function __construct(PromiseInterface $promise, RequestInterface $request
         });
     }
 
+    #[\Override]
     public function then(?callable $onFulfilled = null, ?callable $onRejected = null)
     {
         return new static($this->promise->then($onFulfilled, $onRejected), $this->request);
     }
 
+    #[\Override]
     public function getState()
     {
         return $this->state;
     }
 
+    #[\Override]
     public function wait($unwrap = true)
     {
         $this->promise->wait(false);

tests/DefaultHttpAdapterWithConfigTest.php

@@ -13,7 +13,7 @@ class DefaultHttpAdapterWithConfigTest extends HttpClientTest
 {
     protected function createHttpAdapter(): ClientInterface
     {
-        $this->defaultHeaders['X-Test'] = 'configuration-value';
+        self::$defaultHeaders['X-Test'] = 'configuration-value';
 
         return Client::createWithConfig([
             'headers' => [

tests/PromiseExceptionTest.php

@@ -11,6 +11,7 @@
 use Http\Client\Exception\NetworkException;
 use Http\Client\Exception\RequestException;
 use Http\Client\Exception\TransferException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -24,10 +25,11 @@ final class PromiseExceptionTest extends TestCase
     /**
      * @dataProvider exceptionThatIsThrownForGuzzleExceptionProvider
      */
+    #[DataProvider('exceptionThatIsThrownForGuzzleExceptionProvider')]
     public function testExceptionThatIsThrownForGuzzleException(
         RequestInterface $request,
         $reason,
-        string $adapterExceptionClass,
+        string $adapterExceptionClass
     ): void {
         $guzzlePromise = new \GuzzleHttp\Promise\Promise();
         $guzzlePromise->reject($reason);
@@ -36,10 +38,10 @@ public function testExceptionThatIsThrownForGuzzleException(
         $promise->wait();
     }
 
-    public function exceptionThatIsThrownForGuzzleExceptionProvider(): array
+    public static function exceptionThatIsThrownForGuzzleExceptionProvider(): array
     {
-        $request = $this->getMockBuilder(RequestInterface::class)->getMock();
-        $response = $this->getMockBuilder(ResponseInterface::class)->getMock();
+        $request = (new PromiseExceptionTest)->getMockBuilder(RequestInterface::class)->getMock();
+        $response = (new PromiseExceptionTest)->getMockBuilder(ResponseInterface::class)->getMock();
 
         return [
             [$request, new GuzzleExceptions\ConnectException('foo', $request), NetworkException::class],