From 53c4b4a42147bc8a1f55b465347610c365aabddf Mon Sep 17 00:00:00 2001
From: Lorenzo Ruozzi <lruozzi@webgriffe.com>
Date: Mon, 29 Apr 2024 12:19:54 +0200
Subject: [PATCH] Update CI to remove old PHP versions

---
 .github/workflows/ci.yml | 20 ++++++++++----------
 composer.json            | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ec23cd..dc9b240 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
         composer: ['']
         phpunit: ['']
         deprecation: ['']
@@ -32,25 +32,25 @@ jobs:
           - php: 8.0
             composer: --prefer-stable --prefer-lowest
             deprecation: max[direct]=0
-          - php: 7.1
+          - php: 7.4
             composer: --prefer-stable --prefer-lowest
             deprecation: max[direct]=0
 
           # symfony version
-          - php: 8.0
-            symfony: '^3.0'
-          - php: 8.0
-            symfony: '^4.0'
-          - php: 8.0
-            symfony: '^5.0'
+          - php: 8.3
+            symfony: '^5.4'
+          - php: 8.3
+            symfony: '^6.4'
+          - php: 8.3
+            symfony: '^7.0'
 
           # dev
-          - php: 8.0
+          - php: 8.3
             stability: 'dev'
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.7.0
+        uses: shivammathur/setup-php@2
         with:
           php-version: ${{ matrix.php }}
           coverage: none
diff --git a/composer.json b/composer.json
index 1189adc..a65dc33 100644
--- a/composer.json
+++ b/composer.json
@@ -13,26 +13,22 @@
         }
     ],
     "require": {
-        "php": "^7.1 | ^8.0",
-        "symfony/config": "^3.4|^4.0|^5.0|^6.0|^7.0",
-        "symfony/console": "^3.4|^4.0|^5.0|^6.0|^7.0",
-        "symfony/dependency-injection": "^3.4|^4.0|^5.0|^6.0|^7.0",
-        "symfony/event-dispatcher": "^3.4|^4.0|^5.0|^6.0|^7.0",
-        "symfony/http-kernel": "^3.4|^4.0|^5.0|^6.0|^7.0"
+        "php": "^7.4|^8.0",
+        "symfony/config": "^5.4|^6.4|^7.0",
+        "symfony/console": "^5.4|^6.4|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.4|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.4|^7.0",
+        "symfony/http-kernel": "^5.4|^6.4|^7.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0",
-        "symfony/framework-bundle": "^3.4|^4.0|^5.0|^6.0|^7.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
+        "symfony/framework-bundle": "^5.4|^6.4|^7.0",
         "symfony/phpunit-bridge": "^5.3|^6.0|^7.0",
-        "symfony/debug": ">3.4.21",
         "twig/twig": "^1.32|^2.4|^3.0",
-        "symfony/monolog-bundle": "^3.2"
-    },
-    "conflict": {
-        "twig/twig": "<1.32"
+        "symfony/monolog-bundle": "^3.10"
     },
     "suggest": {
-        "symfony/monolog-bundle": "^3.2"
+        "symfony/monolog-bundle": "^3.10"
     },
     "autoload": {
         "psr-4": { "Ekino\\NewRelicBundle\\": "" },