Merge branch '2.x' into feature/php-81

Author: Chris53897

Diff for: .github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code
@@ -25,6 +25,10 @@ jobs:
           tools: composer:v2
           coverage: none
 
+      - name: Emulate PHP 8.3
+        run: composer config platform.php 8.3.999
+        if: matrix.php == '8.4'
+
       - name: Install PHP dependencies
         run: composer update --prefer-dist --no-interaction --no-progress
 

Diff for: CHANGELOG.md

@@ -1,10 +1,11 @@
 # Change Log
 
-## unreleased
+## 2.7.2 - 2024-09-24
 
+- Updated code to not raise warnings for nullable parameters in PHP 8.4.
 - drop support for php < 8.1
 - drop support for symfony < 5.4
-- Cleaned up phpdoc.
+- Cleaned up PHPDoc comments.
 
 ## 2.7.1 - 2023-11-30
 

Diff for: src/Deferred.php

@@ -51,7 +51,7 @@ public function __construct(callable $waitCallback)
         $this->onRejectedCallbacks = [];
     }
 
-    public function then(callable $onFulfilled = null, callable $onRejected = null): Promise
+    public function then(?callable $onFulfilled = null, ?callable $onRejected = null): Promise
     {
         $deferred = new self($this->waitCallback);
 

Diff for: src/Exception/HttpClientNoMatchException.php

@@ -19,7 +19,7 @@ final class HttpClientNoMatchException extends TransferException
      */
     private $request;
 
-    public function __construct(string $message, RequestInterface $request, \Exception $previous = null)
+    public function __construct(string $message, RequestInterface $request, ?\Exception $previous = null)
     {
         $this->request = $request;
 

Diff for: src/HttpClientPool/HttpClientPoolItem.php

@@ -57,7 +57,7 @@ class HttpClientPoolItem implements HttpClient, HttpAsyncClient
      * @param ClientInterface|HttpAsyncClient $client
      * @param int|null                        $reenableAfter Number of seconds until this client is enabled again after an error
      */
-    public function __construct($client, int $reenableAfter = null)
+    public function __construct($client, ?int $reenableAfter = null)
     {
         if (!$client instanceof ClientInterface && !$client instanceof HttpAsyncClient) {
             throw new \TypeError(

Diff for: src/HttpMethodsClient.php

@@ -33,7 +33,7 @@ final class HttpMethodsClient implements HttpMethodsClientInterface
     /**
      * @param RequestFactory|RequestFactoryInterface $requestFactory
      */
-    public function __construct(ClientInterface $httpClient, $requestFactory, StreamFactoryInterface $streamFactory = null)
+    public function __construct(ClientInterface $httpClient, $requestFactory, ?StreamFactoryInterface $streamFactory = null)
     {
         if (!$requestFactory instanceof RequestFactory && !$requestFactory instanceof RequestFactoryInterface) {
             throw new \TypeError(

Diff for: src/Plugin/CookiePlugin.php

@@ -164,7 +164,7 @@ private function createCookie(RequestInterface $request, string $setCookieHeader
      *
      * @param string $part A single cookie value in format key=value
      *
-     * @return array{0:string, 1:?string}
+     * @return array{0:string, 1:string|null}
      */
     private function createValueKey(string $part): array
     {

Diff for: src/Plugin/RedirectPlugin.php

@@ -113,7 +113,7 @@ final class RedirectPlugin implements Plugin
     private $streamFactory;
 
     /**
-     * @param array{'preserve_header'?: bool|string[], 'use_default_for_multiple'?: bool, 'strict'?: bool} $config
+     * @param array{'preserve_header'?: bool|string[], 'use_default_for_multiple'?: bool, 'strict'?: bool, 'stream_factory'?:StreamFactoryInterface} $config
      *
      * Configuration options:
      *   - preserve_header: True keeps all headers, false remove all of them, an array is interpreted as a list of header names to keep
@@ -218,7 +218,7 @@ public function guessStreamFactory(): ?StreamFactoryInterface
             return new Psr17Factory();
         }
         if (class_exists(Utils::class)) {
-            return new class() implements StreamFactoryInterface {
+            return new class implements StreamFactoryInterface {
                 public function createStream(string $content = ''): StreamInterface
                 {
                     return Utils::streamFor($content);

Diff for: src/Plugin/RequestMatcherPlugin.php

@@ -31,7 +31,7 @@ final class RequestMatcherPlugin implements Plugin
      */
     private $failurePlugin;
 
-    public function __construct(RequestMatcher $requestMatcher, ?Plugin $delegateOnMatch, Plugin $delegateOnNoMatch = null)
+    public function __construct(RequestMatcher $requestMatcher, ?Plugin $delegateOnMatch, ?Plugin $delegateOnNoMatch = null)
     {
         $this->requestMatcher = $requestMatcher;
         $this->successPlugin = $delegateOnMatch;

Diff for: tests/HttpMethodsClientTest.php

@@ -73,7 +73,7 @@ public function testOptions(): void
      *
      * As there is no data provider in phpspec, we keep separate methods to get new mocks for each test.
      */
-    private function expectSendRequest(string $method, string $body = null): void
+    private function expectSendRequest(string $method, ?string $body = null): void
     {
         $response = new Response();
         $this->httpClient->expects($this->once())

Diff for: tests/Plugin/RedirectPluginTest.php

@@ -93,7 +93,7 @@ public static function provideRedirections(): array
             'relative-path with ./' => ['https://example.com:8000/path/', './other?query=value', 'https://example.com:8000/path/other?query=value'],
             'relative-path with //' => ['https://example.com:8000/path/', 'other//sub?query=value', 'https://example.com:8000/path/other//sub?query=value'],
             'relative-path redirect with only query' => ['https://example.com:8000/path', '?query=value', 'https://example.com:8000/path?query=value'],
-       ];
+        ];
     }
 
     /**

Diff for: tests/PluginClientTest.php

@@ -33,14 +33,14 @@ public function testRestartChain(PluginClient $client, string $method, string $r
 
     public static function clientAndMethodProvider()
     {
-        $syncClient = new class() implements ClientInterface {
+        $syncClient = new class implements ClientInterface {
             public function sendRequest(RequestInterface $request): ResponseInterface
             {
                 return new Response();
             }
         };
 
-        $asyncClient = new class() implements HttpAsyncClient {
+        $asyncClient = new class implements HttpAsyncClient {
             public function sendAsyncRequest(RequestInterface $request)
             {
                 return new HttpFulfilledPromise(new Response());
@@ -49,7 +49,7 @@ public function sendAsyncRequest(RequestInterface $request)
 
         $headerAppendPlugin = new HeaderAppendPlugin(['Content-Type' => 'text/html']);
         $redirectPlugin = new RedirectPlugin();
-        $restartOncePlugin = new class() implements Plugin {
+        $restartOncePlugin = new class implements Plugin {
             private $firstRun = true;
 
             public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise