Bump minimum version of PHP to 8.1

Author: nicolas-grekas

AmpHttpClient.php

@@ -56,7 +56,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
      */
     public function __construct(array $defaultOptions = [], callable $clientConfigurator = null, int $maxHostConnections = 6, int $maxPendingPushes = 50)
     {
-        $this->defaultOptions['buffer'] = $this->defaultOptions['buffer'] ?? \Closure::fromCallable([__CLASS__, 'shouldBuffer']);
+        $this->defaultOptions['buffer'] ??= self::shouldBuffer(...);
 
         if ($defaultOptions) {
             [, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, $this->defaultOptions);

CurlHttpClient.php

@@ -64,7 +64,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
             throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\CurlHttpClient" as the "curl" extension is not installed.');
         }
 
-        $this->defaultOptions['buffer'] = $this->defaultOptions['buffer'] ?? \Closure::fromCallable([__CLASS__, 'shouldBuffer']);
+        $this->defaultOptions['buffer'] ??= self::shouldBuffer(...);
 
         if ($defaultOptions) {
             [, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, $this->defaultOptions);

Internal/AmpClientState.php

@@ -54,7 +54,7 @@ final class AmpClientState extends ClientState
     public function __construct(?callable $clientConfigurator, int $maxHostConnections, int $maxPendingPushes, ?LoggerInterface &$logger)
     {
         $clientConfigurator ??= static fn (PooledHttpClient $client) => new InterceptedHttpClient($client, new RetryRequests(2));
-        $this->clientConfigurator = $clientConfigurator instanceof \Closure ? $clientConfigurator : \Closure::fromCallable($clientConfigurator);
+        $this->clientConfigurator = $clientConfigurator(...);
 
         $this->maxHostConnections = $maxHostConnections;
         $this->maxPendingPushes = $maxPendingPushes;

MockHttpClient.php

@@ -56,7 +56,7 @@ public function setResponseFactory($responseFactory): void
             })();
         }
 
-        $this->responseFactory = !\is_callable($responseFactory) || $responseFactory instanceof \Closure ? $responseFactory : \Closure::fromCallable($responseFactory);
+        $this->responseFactory = !\is_callable($responseFactory) ? $responseFactory : $responseFactory(...);
     }
 
     /**

NativeHttpClient.php

@@ -47,7 +47,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
      */
     public function __construct(array $defaultOptions = [], int $maxHostConnections = 6)
     {
-        $this->defaultOptions['buffer'] = $this->defaultOptions['buffer'] ?? \Closure::fromCallable([__CLASS__, 'shouldBuffer']);
+        $this->defaultOptions['buffer'] ??= self::shouldBuffer(...);
 
         if ($defaultOptions) {
             [, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, $this->defaultOptions);

Tests/CurlHttpClientTest.php

@@ -38,7 +38,6 @@ public function testBindToPort()
         $response->getStatusCode();
 
         $r = new \ReflectionProperty($response, 'handle');
-        $r->setAccessible(true);
 
         $curlInfo = curl_getinfo($r->getValue($response));
 
@@ -60,7 +59,6 @@ public function testHandleIsReinitOnReset()
         $httpClient = $this->getHttpClient(__FUNCTION__);
 
         $r = new \ReflectionProperty($httpClient, 'multi');
-        $r->setAccessible(true);
         $clientState = $r->getValue($httpClient);
         $initialShareId = $clientState->share;
         $httpClient->reset();

Tests/HttpClientTestCase.php

@@ -321,7 +321,7 @@ private static function startVulcain(HttpClientInterface $client)
         ]);
         $process->start();
 
-        register_shutdown_function([$process, 'stop']);
+        register_shutdown_function($process->stop(...));
         sleep('\\' === \DIRECTORY_SEPARATOR ? 10 : 1);
 
         if (!$process->isRunning()) {
@@ -353,7 +353,6 @@ public function testHandleIsRemovedOnException()
             unset($e);
 
             $r = new \ReflectionProperty($client, 'multi');
-            $r->setAccessible(true);
             /** @var ClientState $clientState */
             $clientState = $r->getValue($client);
 

composer.json

@@ -21,7 +21,7 @@
         "symfony/http-client-implementation": "3.0"
     },
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "psr/log": "^1|^2|^3",
         "symfony/http-client-contracts": "^3",
         "symfony/service-contracts": "^1.0|^2|^3"