From 21cab305a669280bc3ea8e8d48342d9342d302b8 Mon Sep 17 00:00:00 2001
From: Jonathan LELIEVRE <jonathan.lelievre@prestashop.com>
Date: Thu, 21 Nov 2024 10:21:46 +0100
Subject: [PATCH] Update Symfony client compatibility in composer.json

---
 .github/workflows/php.yml | 21 ++++++---------------
 composer.json             | 26 ++++++++++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d2c5b3b..eaecd6f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,11 +19,14 @@ jobs:
       - name: PHP CS Fixer
         run: ./vendor/bin/php-cs-fixer fix --dry-run
 
+      - name: Run ergebnis/composer-normalize
+        run: composer normalize --dry-run --no-check-lock
+
   tests-common:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -52,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -81,19 +84,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         symfony-http-client-versions: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
         exclude:
-          - php-versions: '7.2'
-            symfony-http-client-versions: '6.0'
-          - php-versions: '7.3'
-            symfony-http-client-versions: '6.0'
           - php-versions: '7.4'
             symfony-http-client-versions: '6.0'
-          - php-versions: '7.2'
-            symfony-http-client-versions: '6.1'
-          - php-versions: '7.3'
-            symfony-http-client-versions: '6.1'
           - php-versions: '7.4'
             symfony-http-client-versions: '6.1'
           - php-versions: '8.0'
@@ -114,10 +109,6 @@ jobs:
             symfony-http-client-versions: '6.3'
           - php-versions: '8.0'
             symfony-http-client-versions: '6.3'
-          - php-versions: '7.2'
-            symfony-http-client-versions: '6.4'
-          - php-versions: '7.3'
-            symfony-http-client-versions: '6.4'
           - php-versions: '7.4'
             symfony-http-client-versions: '6.4'
           - php-versions: '8.0'
diff --git a/composer.json b/composer.json
index 27af0b3..e1cdbf6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "prestashop/circuit-breaker",
     "description": "A circuit breaker implementation for PHP",
-    "type": "library",
     "license": "MIT",
+    "type": "library",
     "authors": [
         {
             "name": "PrestaShop SA",
@@ -14,23 +14,24 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
-        "symfony/http-client": "^5.4"
+        "php": ">=7.4",
+        "ergebnis/composer-normalize": "^2.44",
+        "symfony/http-client": "^5.4 || ^6"
     },
     "require-dev": {
+        "doctrine/cache": "^1.10.2",
         "guzzlehttp/guzzle": "^7.3",
         "phpunit/phpunit": "^8",
-        "doctrine/cache": "^1.10.2",
-        "symfony/cache": "^4.4",
-        "symfony/event-dispatcher": "^4.4",
+        "prestashop/php-dev-tools": "^4.1",
         "psr/simple-cache": "^1.0",
-        "prestashop/php-dev-tools": "^4.1"
+        "symfony/cache": "^4.4",
+        "symfony/event-dispatcher": "^4.4"
     },
     "suggest": {
-        "symfony/cache": "Allows use of Symfony Cache adapters to store transactions",
-        "doctrine/cache": "Allows use of Doctrine Cache adapters to store transactions",
         "ext-apcu": "Allows use of APCu adapter (performant) to store transactions",
-        "guzzlehttp/guzzle": "Allows use of Guzzle to perform HTTP requests instead of Symfony HttpClient"
+        "doctrine/cache": "Allows use of Doctrine Cache adapters to store transactions",
+        "guzzlehttp/guzzle": "Allows use of Guzzle to perform HTTP requests instead of Symfony HttpClient",
+        "symfony/cache": "Allows use of Symfony Cache adapters to store transactions"
     },
     "autoload": {
         "psr-4": {
@@ -42,6 +43,11 @@
             "Tests\\PrestaShop\\CircuitBreaker\\": "tests/"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        }
+    },
     "scripts": {
         "cs-fix": "@php ./vendor/bin/php-cs-fixer fix",
         "test": "@php ./vendor/bin/phpunit",