[2.x] Min PHP version 8.1, Symfony 6.4 / 7.1+

.github/workflows/continuous-integration.yml

@@ -22,21 +22,12 @@ jobs:
         include:
           # Minimum supported Symfony version and lowest PHP version
           - dependencies: "php-http/guzzle7-adapter php-http/discovery:^1.12"
-            php-version: "7.3"
+            php-version: "8.1"
             dependency-versions: "lowest"
             symfony-deprecations-helper: "weak"
             stability: "stable"
 
           # Test the latest stable release
-          - dependencies: "php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
-            php-version: "7.3"
-            symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle6-adapter"
-            php-version: "7.4"
-            symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle7-adapter"
-            php-version: "8.0"
-            symfony-deprecations-helper: "weak"
           - dependencies: "php-http/guzzle7-adapter"
             php-version: "8.1"
             symfony-deprecations-helper: "weak"
@@ -49,7 +40,7 @@ jobs:
 
           # Test with httplug 2.x clients
           - dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev php-http/socket-client:^2.0"
-            php-version: "7.3"
+            php-version: "8.1"
             symfony-deprecations-helper: "weak"
 
           # Latest commit to master
@@ -63,17 +54,17 @@ jobs:
             symfony-deprecations-helper: "weak"
 
           # Test maintained versions of Symfony
-          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^5.4"
-            symfony-require: "5.4.*"
-            php-version: "7.3"
+          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^6.4"
+            symfony-require: "6.4.*"
+            php-version: "8.1"
             symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^6.0"
-            symfony-require: "6.3.*"
+          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^6.4"
+            symfony-require: "6.4.*"
             php-version: "8.2"
             symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^6.0"
-            symfony-require: "6.4.*"
-            php-version: "8.1"
+          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.1"
+            symfony-require: "7.1.*"
+            php-version: "8.2"
             symfony-deprecations-helper: "weak"
 
     steps:

.github/workflows/php-cs-fixer.yml

@@ -17,6 +17,6 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v3"
       - name: "PHP-CS-Fixer"
-        uses: "docker://oskarstark/php-cs-fixer-ga:2.19.0"
+        uses: "docker://oskarstark/php-cs-fixer-ga:3.26.0"
         with:
           args: --diff --dry-run

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,18 +1,19 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->exclude('src/Resources')
     ->exclude('vendor')
     ->in(__DIR__)
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
         'declare_strict_types' => true,
         'single_line_throw' => false,
+        'nullable_type_declaration_for_default_null_value' => true,
         'visibility_required' => [
             'elements' => [
                 'const',

CHANGELOG.md

@@ -5,6 +5,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 # Version 2
 
 # 2.0.0 - (unreleased)
+- Increased min PHP version to 8.1
 - Fixed a deprecation when creating a `HttpMethodsClient` via `http_methods_client: true`. Only PSR-17 factories are now passed as constructor arguments.
 - Changed the default stream factory argument for the cache plugin. This now requires a PSR-17 StreamFactoryInterface instance.
 - Creating a client using the `BuzzFactory` no longer accepts `verify_peer` and `verify_host` config options. Only a boolean `verify` flag is accepted, covering both previous options.

composer.json

@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "php-http/client-common": "^2.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.14",
@@ -35,11 +35,11 @@
         "php-http/stopwatch-plugin": "^1.2",
         "psr/http-factory-implementation": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
-        "symfony/config": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
-        "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
+        "symfony/config": "^6.4 || ^7.1",
+        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/event-dispatcher": "^6.4 || ^7.1",
+        "symfony/http-kernel": "^6.4 || ^7.1",
+        "symfony/options-resolver": "^6.4 || ^7.1"
     },
     "conflict": {
         "php-http/guzzle6-adapter": "<1.1",
@@ -51,21 +51,23 @@
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.7 || ^2.0",
+        "matthiasnoback/symfony-config-test": "^5.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.2.1",
         "php-http/cache-plugin": "^1.7",
         "php-http/mock-client": "^1.2",
         "php-http/promise": "^1.0",
-        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
-        "symfony/cache": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^7.0.3",
-        "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0",
+        "phpunit/phpunit": "^9",
+        "symfony/browser-kit": "^6.4 || ^7.1",
+        "symfony/cache": "^6.4 || ^7.1",
+        "symfony/dom-crawler": "^6.4 || ^7.1",
+        "symfony/framework-bundle": "^6.4 || ^7.1",
+        "symfony/http-foundation": "^6.4 || ^7.1",
+        "symfony/phpunit-bridge": "^7.1",
+        "symfony/stopwatch": "^6.4 || ^7.1",
+        "symfony/twig-bundle": "^6.4 || ^7.1",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1",
         "twig/twig": "^1.41 || ^2.10 || ^3.0"
     },
     "suggest": {

src/ClientFactory/AutoDiscoveryFactory.php

@@ -13,9 +13,6 @@
  */
 class AutoDiscoveryFactory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         return Psr18ClientDiscovery::find();

src/ClientFactory/BuzzFactory.php

@@ -13,19 +13,10 @@
  */
 class BuzzFactory implements ClientFactory
 {
-    /**
-     * @var ResponseFactoryInterface
-     */
-    private $responseFactory;
-
-    public function __construct(ResponseFactoryInterface $responseFactory)
+    public function __construct(private readonly ResponseFactoryInterface $responseFactory)
     {
-        $this->responseFactory = $responseFactory;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Buzz\Client\FileGetContents')) {
@@ -43,9 +34,9 @@ private function getOptions(array $config = [])
         $resolver = new OptionsResolver();
 
         $resolver->setDefaults([
-          'timeout' => 5,
-          'verify' => true,
-          'proxy' => null,
+            'timeout' => 5,
+            'verify' => true,
+            'proxy' => null,
         ]);
 
         $resolver->setAllowedTypes('timeout', 'int');

src/ClientFactory/CurlFactory.php

@@ -13,25 +13,12 @@
  */
 class CurlFactory implements ClientFactory
 {
-    /**
-     * @var ResponseFactoryInterface
-     */
-    private $responseFactory;
-
-    /**
-     * @var StreamFactoryInterface
-     */
-    private $streamFactory;
-
-    public function __construct(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
-    {
-        $this->responseFactory = $responseFactory;
-        $this->streamFactory = $streamFactory;
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+        private readonly StreamFactoryInterface $streamFactory
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Http\Client\Curl\Client')) {

src/ClientFactory/Guzzle6Factory.php

@@ -11,9 +11,6 @@
  */
 class Guzzle6Factory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Http\Adapter\Guzzle6\Client')) {

src/ClientFactory/Guzzle7Factory.php

@@ -11,9 +11,6 @@
  */
 class Guzzle7Factory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Http\Adapter\Guzzle7\Client')) {

src/ClientFactory/MockFactory.php

@@ -12,10 +12,7 @@
  */
 final class MockFactory implements ClientFactory
 {
-    /**
-     * @var ClientInterface
-     */
-    private $client;
+    private ?ClientInterface $client = null;
 
     /**
      * Set the client instance that this factory should return.
@@ -27,9 +24,6 @@ public function setClient(ClientInterface $client)
         $this->client = $client;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists(Client::class)) {

src/ClientFactory/PluginClientFactory.php

@@ -19,14 +19,13 @@
 final class PluginClientFactory
 {
     /**
-     * @param Plugin[]               $plugins
-     * @param ClientFactory|callable $factory
-     * @param array                  $config              config to the client factory
-     * @param array                  $pluginClientOptions config forwarded to the PluginClient
+     * @param Plugin[] $plugins
+     * @param array    $config              config to the client factory
+     * @param array    $pluginClientOptions config forwarded to the PluginClient
      *
      * @return PluginClient
      */
-    public static function createPluginClient(array $plugins, $factory, array $config, array $pluginClientOptions = [])
+    public static function createPluginClient(array $plugins, ClientFactory|callable $factory, array $config, array $pluginClientOptions = [])
     {
         if ($factory instanceof ClientFactory) {
             $client = $factory->createClient($config);

src/ClientFactory/ReactFactory.php

@@ -11,9 +11,6 @@
  */
 class ReactFactory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Http\Adapter\React\Client')) {

src/ClientFactory/SocketFactory.php

@@ -11,9 +11,6 @@
  */
 class SocketFactory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists('Http\Client\Socket\Client')) {

src/ClientFactory/SymfonyFactory.php

@@ -14,25 +14,12 @@
  */
 class SymfonyFactory implements ClientFactory
 {
-    /**
-     * @var ResponseFactoryInterface
-     */
-    private $responseFactory;
-
-    /**
-     * @var StreamFactoryInterface
-     */
-    private $streamFactory;
-
-    public function __construct(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
-    {
-        $this->responseFactory = $responseFactory;
-        $this->streamFactory = $streamFactory;
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+        private readonly StreamFactoryInterface $streamFactory
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createClient(array $config = [])
     {
         if (!class_exists(HttplugClient::class)) {