From c675e8a25f098cce8df0edc94232de5588dbe21d Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 19 Dec 2023 11:36:10 +0100
Subject: [PATCH] upgrade php versions

---
 .github/workflows/php.yml        | 21 ++++++++------------
 .github/workflows/spellcheck.yml |  2 +-
 CHANGELOG.md                     | 10 ++++++++++
 composer.json                    | 33 ++++++++++++++++++--------------
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 6c0087db..213183ea 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -17,30 +17,25 @@ jobs:
       matrix:
         include:
           # Test the latest stable release
-          - php-version: '7.3'
-          - php-version: '7.4'
-          - php-version: '8.0'
           - php-version: '8.1'
+          - php-version: '8.2'
+          - php-version: '8.3'
             dependencies: 'jean-beru/fos-http-cache-cloudfront'
-          - php-version: '7.4'
-            symfony-version: '4.*'
-          - php-version: '7.4'
-            symfony-version: '5.*'
-          - php-version: '8.0'
-            symfony-version: '6.*'
+          - php-version: '8.1'
+            symfony-version: '6.4'
           # Minimum supported dependencies with the oldest PHP version
-          - php-version: '7.3'
+          - php-version: '8.1'
             composer-flag: '--prefer-stable --prefer-lowest'
-            symfony-version: '4.4'
+            symfony-version: '6.*'
           # Test latest unreleased versions
-          - php-version: '8.0'
+          - php-version: '8.3'
             symfony-version: '6.*'
             stability: 'dev'
     name: PHP ${{ matrix.php-version }} Test on Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}} ${{ matrix.stability }} ${{ matrix.composer-flag }}
     steps:
 
       - name: Pull the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install PHP and Composer
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
index 299ae20d..f9e15d51 100644
--- a/.github/workflows/spellcheck.yml
+++ b/.github/workflows/spellcheck.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30087f45..ae7580da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+3.x
+===
+
+3.0.0 (unreleased)
+-----
+
+* Test with PHP 8.2 and 8.3
+* Drop support for PHP < 8.1
+* Drop support for Symfony < 6.4
+
 2.x
 ===
 
diff --git a/composer.json b/composer.json
index 85e279b8..25f2434a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,11 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "friendsofsymfony/http-cache": "^2.15",
-        "symfony/framework-bundle": "^4.4.0 || ^5.0 || ^6.0",
-        "symfony/http-foundation": "^4.4.0 || ^5.0 || ^6.0",
-        "symfony/http-kernel": "^4.4.0 || ^5.0 || ^6.0"
+        "symfony/framework-bundle": "^6.4",
+        "symfony/http-foundation": "^6.4",
+        "symfony/http-kernel": "^6.4"
     },
     "require-dev": {
         "php-http/guzzle7-adapter": "^0.1.1",
@@ -37,19 +37,19 @@
         "monolog/monolog": "*",
         "sensio/framework-extra-bundle": "^4.0 || ^5.5.1 || ^6.0",
         "doctrine/annotations": "^1.11",
-        "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
-        "symfony/console": "^4.4 || ^5.0 || ^6.0",
-        "symfony/finder": "^4.4 || ^5.0 || ^6.0",
+        "symfony/browser-kit": "^6.4",
+        "symfony/console": "^6.4",
+        "symfony/finder": "^6.4",
         "symfony/phpunit-bridge": "v5.3.7",
-        "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0",
-        "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/security-bundle": "^6.4",
+        "symfony/twig-bundle": "^6.4",
         "twig/twig": "^2.13",
-        "symfony/yaml": "^4.4 || ^5.0 || ^6.0",
-        "symfony/css-selector": "^4.4 || ^5.0 || ^6.0",
-        "symfony/expression-language": "^4.4 || ^5.0 || ^6.0",
+        "symfony/yaml": "^6.4",
+        "symfony/css-selector": "^6.4",
+        "symfony/expression-language": "^6.4",
         "symfony/monolog-bundle": "^3.0",
-        "symfony/routing": "^4.4 || ^5.0 || ^6.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "symfony/routing": "^6.4",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
         "sebastian/exporter": "^2.0"
     },
     "suggest": {
@@ -74,5 +74,10 @@
         "classmap": [
             "tests/Functional/Fixtures/app/AppKernel.php"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }