ci: add tests for PHP 8.5 (#19)

Chris53897 · Chris8934 · web-flow · commit ffeed582ccbc · 2025-12-09T16:49:43.000+01:00
Co-authored-by: Christopher Georg &lt;christopher.georg@sr-travel.de&gt;
diff --git a/.github/workflows/ci.yml b/.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@v6
 
       - 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@v6
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable --prefer-lowest
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - 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@v6
       - 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@v6
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -9,4 +9,5 @@
     ->setRules([
          '@Symfony' => true,
          'array_syntax' => ['syntax' => 'short'],
+         'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match']]
     ]);
diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
     ],
     "require": {
         "php": "^7.3 | ^8.0",
-        "php-http/httplug": "^2.0",
-        "psr/http-client": "^1.0",
-        "guzzlehttp/guzzle": "^7.0"
+        "php-http/httplug": "^2.4",
+        "psr/http-client": "^1.0.3",
+        "guzzlehttp/guzzle": "^7.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.3",
-        "php-http/client-integration-tests": "^3.0",
-        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.6.31 || ^10.0 || ^11.0 || ^12.0",
+        "php-http/client-integration-tests": "^3.0 || ^4.0",
+        "phpspec/prophecy-phpunit": "^2.4",
         "php-http/message-factory": "^1.1"
     },
     "provide": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     colors="true"
     bootstrap="vendor/autoload.php"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
   <coverage>
     <include>
       <directory suffix=".php">src/</directory>
diff --git a/src/Client.php b/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);
diff --git a/src/Promise.php b/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);
diff --git a/tests/AbstractHttpAdapter.php b/tests/AbstractHttpAdapter.php
@@ -12,7 +12,7 @@
 /**
  * @author GeLo <geloen.eric@gmail.com>
  */
-abstract class HttpAdapterTest extends HttpClientTest
+abstract class AbstractHttpAdapter extends HttpClientTest
 {
     protected function createHttpAdapter(): ClientInterface
     {
diff --git a/tests/AbstractHttpAsyncAdapter.php b/tests/AbstractHttpAsyncAdapter.php
@@ -12,7 +12,7 @@
 /**
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
-abstract class HttpAsyncAdapterTest extends HttpAsyncClientTest
+abstract class AbstractHttpAsyncAdapter extends HttpAsyncClientTest
 {
     protected function createHttpAsyncClient(): HttpAsyncClient
     {
diff --git a/tests/CurlHttpAdapter.php b/tests/CurlHttpAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author GeLo <geloen.eric@gmail.com>
  */
-class CurlHttpAdapterTest extends HttpAdapterTest
+class CurlHttpAdapter extends AbstractHttpAdapter
 {
     protected function createHandler()
     {
diff --git a/tests/CurlHttpAsyncAdapter.php b/tests/CurlHttpAsyncAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
-class CurlHttpAsyncAdapterTest extends HttpAsyncAdapterTest
+class CurlHttpAsyncAdapter extends AbstractHttpAsyncAdapter
 {
     protected function createHandler()
     {
diff --git a/tests/DefaultHttpAdapterWithConfigTest.php b/tests/DefaultHttpAdapterWithConfigTest.php
@@ -13,7 +13,16 @@ class DefaultHttpAdapterWithConfigTest extends HttpClientTest
 {
     protected function createHttpAdapter(): ClientInterface
     {
-        $this->defaultHeaders['X-Test'] = 'configuration-value';
+        $reflected = new ReflectionClass(HttpClientTest::class);
+        $property = $reflected->getProperty('defaultHeaders');
+
+        // version >= 4
+        if ($property->isStatic()) {
+            self::$defaultHeaders['X-Test'] = 'configuration-value';
+        } else {
+            // version < 4
+            $this->defaultHeaders['X-Test'] = 'configuration-value';
+        }
 
         return Client::createWithConfig([
             'headers' => [
diff --git a/tests/MultiCurlHttpAdapter.php b/tests/MultiCurlHttpAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author GeLo <geloen.eric@gmail.com>
  */
-class MultiCurlHttpAdapterTest extends HttpAdapterTest
+class MultiCurlHttpAdapter extends AbstractHttpAdapter
 {
     protected function createHandler()
     {
diff --git a/tests/MultiCurlHttpAsyncAdapter.php b/tests/MultiCurlHttpAsyncAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
-class MultiCurlHttpAsyncAdapterTest extends HttpAsyncAdapterTest
+class MultiCurlHttpAsyncAdapter extends AbstractHttpAsyncAdapter
 {
     protected function createHandler()
     {
diff --git a/tests/PromiseExceptionTest.php b/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('request'))->getMockBuilder(RequestInterface::class)->getMock();
+        $response = (new PromiseExceptionTest('response'))->getMockBuilder(ResponseInterface::class)->getMock();
 
         return [
             [$request, new GuzzleExceptions\ConnectException('foo', $request), NetworkException::class],
diff --git a/tests/StreamHttpAdapter.php b/tests/StreamHttpAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author GeLo <geloen.eric@gmail.com>
  */
-class StreamHttpAdapterTest extends HttpAdapterTest
+class StreamHttpAdapter extends AbstractHttpAdapter
 {
     protected function createHandler()
     {
diff --git a/tests/StreamHttpAsyncAdapter.php b/tests/StreamHttpAsyncAdapter.php
@@ -9,7 +9,7 @@
 /**
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
-class StreamHttpAsyncAdapterTest extends HttpAsyncAdapterTest
+class StreamHttpAsyncAdapter extends AbstractHttpAsyncAdapter
 {
     protected function createHandler()
     {

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,13 @@ public static function createWithConfig(array $config): Client`
`43`	`43`	`return new self(self::buildClient($config));`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ #[\Override]`
`46`	`47`	`public function sendRequest(RequestInterface $request): ResponseInterface`
`47`	`48`	`{`
`48`	`49`	`return $this->sendAsyncRequest($request)->wait();`
`49`	`50`	`}`
`50`	`51`
	`52`	`+ #[\Override]`
`51`	`53`	`public function sendAsyncRequest(RequestInterface $request)`
`52`	`54`	`{`
`53`	`55`	`$promise = $this->guzzle->sendAsync($request);`
Original file line number	Diff line number	Diff line change
`@@ -70,16 +70,19 @@ public function __construct(PromiseInterface $promise, RequestInterface $request`
`70`	`70`	`});`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ #[\Override]`
`73`	`74`	`public function then(?callable $onFulfilled = null, ?callable $onRejected = null)`
`74`	`75`	`{`
`75`	`76`	`return new static($this->promise->then($onFulfilled, $onRejected), $this->request);`
`76`	`77`	`}`
`77`	`78`
	`79`	`+ #[\Override]`
`78`	`80`	`public function getState()`
`79`	`81`	`{`
`80`	`82`	`return $this->state;`
`81`	`83`	`}`
`82`	`84`
	`85`	`+ #[\Override]`
`83`	`86`	`public function wait($unwrap = true)`
`84`	`87`	`{`
`85`	`88`	`$this->promise->wait(false);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/**`
`13`	`13`	`* @author GeLo <[email protected]>`
`14`	`14`	`*/`
`15`		`-abstract class HttpAdapterTest extends HttpClientTest`
	`15`	`+abstract class AbstractHttpAdapter extends HttpClientTest`
`16`	`16`	`{`
`17`	`17`	`protected function createHttpAdapter(): ClientInterface`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`/**`
`10`	`10`	`* @author GeLo <[email protected]>`
`11`	`11`	`*/`
`12`		`-class CurlHttpAdapterTest extends HttpAdapterTest`
	`12`	`+class CurlHttpAdapter extends AbstractHttpAdapter`
`13`	`13`	`{`
`14`	`14`	`protected function createHandler()`
`15`	`15`	`{`