From 530bae66fa12a4d3f20a81227e3cb6dd272df9ad Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Sat, 4 May 2024 21:51:37 +0200
Subject: [PATCH] allow symfony 7

---
 .github/workflows/test-application.yaml |  5 +++--
 CHANGELOG.md                            |  7 ++++---
 composer.json                           | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
index 83be137..c63d621 100644
--- a/.github/workflows/test-application.yaml
+++ b/.github/workflows/test-application.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
     test:
         name: 'PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}}'
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         env:
             SYMFONY_PHPUNIT_VERSION: 9
             SYMFONY_DEPRECATIONS_HELPER: "/.*each.*/"
@@ -27,6 +27,7 @@ jobs:
                     - php-version: '8.2'
                     - php-version: '8.3'
                       symfony-version: 6.4.*
+                    - php-version: '8.3'
 
         steps:
             - name: Checkout project
@@ -44,7 +45,7 @@ jobs:
                 composer global config --no-plugins allow-plugins.symfony/flex true
 
             - name: Install dependencies with Composer
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: ${{ matrix.dependencies }}
                   composer-options: --prefer-dist
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e14ae70..40fb2b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,12 @@ Changelog
 3.0.0 (unreleased)
 -----
 
-* Support Symfony 6
-* Use DateTimeInterface instead of DateTime.
-* Adjust to doctrine and twig BC breaks. If you extended classes or customized services, check for old `Twig_*` classes or `Doctrine\Common\Persistence` namespace.
+* Support Symfony 6 & 7
 * Drop support for old Symfony versions
+* Supprt PHP 8.1 - 8.3
 * Drop support for old PHP versions
+* Use DateTimeInterface instead of DateTime.
+* Adjust to doctrine and twig BC breaks. If you extended classes or customized services, check for old `Twig_*` classes or `Doctrine\Common\Persistence` namespace.
 
 2.1.1
 -----
diff --git a/composer.json b/composer.json
index 25423cb..0ac017b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,8 @@
     ],
     "require": {
         "php": "^8.1",
-        "symfony/framework-bundle": "^6.4",
-        "symfony/security-core": "^6.4"
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/security-core": "^6.4 || ^7.0"
     },
     "require-dev": {
         "ext-dom": "*",
@@ -28,18 +28,18 @@
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/phpcr-bundle": "^3.0",
         "doctrine/phpcr-odm": "^1.4 || ^2.0 ",
-        "symfony/browser-kit": "^6.4",
-        "symfony/form": "^6.4",
-        "symfony/monolog-bridge": "^6.4",
+        "symfony/browser-kit": "^6.4 || ^7.0",
+        "symfony/form": "^6.4 || ^7.0",
+        "symfony/monolog-bridge": "^6.4 || ^7.0",
         "symfony/monolog-bundle": "^3.0",
         "symfony/phpunit-bridge": "^7.0.3",
-        "symfony/security-bundle": "^6.4",
-        "symfony/templating": "^6.4",
-        "symfony/translation": "^6.4",
-        "symfony/twig-bundle": "^6.4",
-        "symfony/validator": "^6.4",
-        "symfony/yaml": "^6.4",
-        "symfony/asset": "^6.4"
+        "symfony/security-bundle": "^6.4 || ^7.0",
+        "symfony/templating": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0",
+        "symfony/asset": "^6.4 || ^7.0"
     },
     "suggest": {
         "symfony/twig-bundle": "To get access to the CMF twig extension",