.github/workflows/static.yml

@@ -13,10 +13,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Remove phpspec
+        run: composer remove --dev friends-of-phpspec/phpspec-code-coverage phpspec/phpspec
 
       - name: PHPStan
-        uses: OskarStark/phpstan-ga@0.12.32
+        uses: docker://oskarstark/phpstan-ga
         env:
           REQUIRE_DEV: false
         with:
@@ -28,7 +31,7 @@ jobs:
 
       steps:
           - name: Checkout code
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
 
           - name: PHP-CS-Fixer
             uses: docker://oskarstark/php-cs-fixer-ga

.github/workflows/tests.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -25,11 +25,9 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Require PHPSpec 7.1 dependencies
-        run: |
-          composer require "phpspec/phpspec:^7.1@dev" --no-interaction --no-update
-          composer update --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php == '8.1'"
+      - 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
@@ -42,11 +40,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.4', '8.2']
+        php: ['7.1', '7.4', '8.2', '8.3']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -56,9 +54,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        run: |
-          composer require "sebastian/comparator:^3.0.2" --no-interaction --no-update
-          composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
+        run: composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
 
       - name: Execute tests
         run: composer test
@@ -69,16 +65,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - symfony: '4'
+          - symfony: '4.4.*'
             php-version: '7.1'
-          - symfony: '5'
+          - symfony: '5.4.*'
             php-version: '7.4'
-          - symfony: '6'
+          - symfony: '6.4.*'
+            php-version: '8.2'
+          - symfony: '7.0.*'
             php-version: '8.2'
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -87,16 +85,13 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Pin old packages
-        run: composer require "phpspec/phpspec:^2.5.8" --no-interaction --no-update
-        if: "matrix.symfony == '2'"
-
       - name: Install dependencies
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.symfony }}
         run: |
-          composer config --no-plugins allow-plugins.symfony/flex true
-          composer require --no-update --no-interaction --no-progress symfony/flex
-          composer config extra.symfony.require ${{ matrix.symfony}}
-          composer update --prefer-dist --no-interaction --prefer-stable --prefer-lowest --no-progress
+          composer global config --no-plugins allow-plugins.symfony/flex true
+          composer global require --no-progress --no-scripts --no-plugins symfony/flex
+          composer update --prefer-dist --no-interaction --prefer-stable --no-progress
 
       - name: Execute tests
         run: composer test
@@ -107,7 +102,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.7.2 - 2024-09-24
+
+- Updated code to not raise warnings for nullable parameters in PHP 8.4.
+- Cleaned up PHPDoc comments.
+
 ## 2.7.1 - 2023-11-30
 
 - Allow installation with Symfony 7.

src/Deferred.php

@@ -51,10 +51,7 @@ public function __construct(callable $waitCallback)
         $this->onRejectedCallbacks = [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    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);
 
@@ -86,9 +83,6 @@ public function then(callable $onFulfilled = null, callable $onRejected = null):
         return $deferred;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getState(): string
     {
         return $this->state;
@@ -128,9 +122,6 @@ public function reject(ClientExceptionInterface $exception): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function wait($unwrap = true)
     {
         if (Promise::PENDING === $this->state) {

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;
 

src/HttpAsyncClientDecorator.php

@@ -20,8 +20,6 @@ trait HttpAsyncClientDecorator
     protected $httpAsyncClient;
 
     /**
-     * {@inheritdoc}
-     *
      * @see HttpAsyncClient::sendAsyncRequest
      */
     public function sendAsyncRequest(RequestInterface $request)

src/HttpAsyncClientEmulator.php

@@ -17,15 +17,11 @@
 trait HttpAsyncClientEmulator
 {
     /**
-     * {@inheritdoc}
-     *
      * @see HttpClient::sendRequest
      */
     abstract public function sendRequest(RequestInterface $request): ResponseInterface;
 
     /**
-     * {@inheritdoc}
-     *
      * @see HttpAsyncClient::sendAsyncRequest
      */
     public function sendAsyncRequest(RequestInterface $request)

src/HttpClientDecorator.php

@@ -21,8 +21,6 @@ trait HttpClientDecorator
     protected $httpClient;
 
     /**
-     * {@inheritdoc}
-     *
      * @see ClientInterface::sendRequest
      */
     public function sendRequest(RequestInterface $request): ResponseInterface

src/HttpClientEmulator.php

@@ -15,8 +15,6 @@
 trait HttpClientEmulator
 {
     /**
-     * {@inheritdoc}
-     *
      * @see HttpClient::sendRequest
      */
     public function sendRequest(RequestInterface $request): ResponseInterface
@@ -27,8 +25,6 @@ public function sendRequest(RequestInterface $request): ResponseInterface
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @see HttpAsyncClient::sendAsyncRequest
      */
     abstract public function sendAsyncRequest(RequestInterface $request);

src/HttpClientPool/HttpClientPool.php

@@ -52,17 +52,11 @@ public function addHttpClient($client): void
      */
     abstract protected function chooseHttpClient(): HttpClientPoolItem;
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendAsyncRequest(RequestInterface $request)
     {
         return $this->chooseHttpClient()->sendAsyncRequest($request);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         return $this->chooseHttpClient()->sendRequest($request);

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(
@@ -69,9 +69,6 @@ public function __construct($client, int $reenableAfter = null)
         $this->reenableAfter = $reenableAfter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         if ($this->isDisabled()) {
@@ -92,9 +89,6 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         return $response;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendAsyncRequest(RequestInterface $request)
     {
         if ($this->isDisabled()) {

src/HttpClientPool/LeastUsedClientPool.php

@@ -15,9 +15,6 @@
  */
 final class LeastUsedClientPool extends HttpClientPool
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function chooseHttpClient(): HttpClientPoolItem
     {
         $clientPool = array_filter($this->clientPool, function (HttpClientPoolItem $clientPoolItem) {

src/HttpClientPool/RandomClientPool.php

@@ -7,15 +7,12 @@
 use Http\Client\Common\Exception\HttpClientNotFoundException;
 
 /**
- * RoundRobinClientPool will choose the next client in the pool.
+ * RandomClientPool will choose a random enabled client in the pool.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
 final class RandomClientPool extends HttpClientPool
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function chooseHttpClient(): HttpClientPoolItem
     {
         $clientPool = array_filter($this->clientPool, function (HttpClientPoolItem $clientPoolItem) {

src/HttpClientPool/RoundRobinClientPool.php

@@ -13,9 +13,6 @@
  */
 final class RoundRobinClientPool extends HttpClientPool
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function chooseHttpClient(): HttpClientPoolItem
     {
         $last = current($this->clientPool);

src/HttpClientRouter.php

@@ -12,8 +12,6 @@
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * {@inheritdoc}
- *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
 final class HttpClientRouter implements HttpClientRouterInterface
@@ -23,17 +21,11 @@ final class HttpClientRouter implements HttpClientRouterInterface
      */
     private $clients = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         return $this->chooseHttpClient($request)->sendRequest($request);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendAsyncRequest(RequestInterface $request)
     {
         return $this->chooseHttpClient($request)->sendAsyncRequest($request);

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(

src/Plugin/AddHostPlugin.php

@@ -48,9 +48,6 @@ public function __construct(UriInterface $host, array $config = [])
         $this->replace = $options['replace'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         if ($this->replace || '' === $request->getUri()->getHost()) {

src/Plugin/AuthenticationPlugin.php

@@ -26,9 +26,6 @@ public function __construct(Authentication $authentication)
         $this->authentication = $authentication;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         $request = $this->authentication->authenticate($request);

src/Plugin/BaseUriPlugin.php

@@ -24,7 +24,7 @@ final class BaseUriPlugin implements Plugin
     /**
      * @var AddPathPlugin|null
      */
-    private $addPathPlugin = null;
+    private $addPathPlugin;
 
     /**
      * @param UriInterface $uri        Has to contain a host name and can have a path
@@ -39,9 +39,6 @@ public function __construct(UriInterface $uri, array $hostConfig = [])
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         $addHostNext = function (RequestInterface $request) use ($next, $first) {