Merge pull request #92 from niels-nijens/add-symfony-7-support

Add Symfony 7 support
nijens · Apr 9, 2024 · 0c282f5 · 0c282f5
2 parents 5cdab01 + f06c4aa
commit 0c282f5
Show file tree

Hide file tree

Showing 10 changed files with 354 additions and 266 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -10,7 +10,7 @@ jobs:
         strategy:
             matrix:
                 php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
-                symfony-version: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
+                symfony-version: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4', '7.0']
                 test-options: ['']
                 coverage: [false]
                 include:
@@ -31,6 +31,8 @@ jobs:
                       symfony-version: '6.3'
                     - php-version: '7.4'
                       symfony-version: '6.4'
+                    - php-version: '7.4'
+                      symfony-version: '7.0'
                     - php-version: '8.0'
                       symfony-version: '6.1'
                     - php-version: '8.0'
@@ -39,6 +41,10 @@ jobs:
                       symfony-version: '6.3'
                     - php-version: '8.0'
                       symfony-version: '6.4'
+                    - php-version: '8.0'
+                      symfony-version: '7.0'
+                    - php-version: '8.1'
+                      symfony-version: '7.0'
 
         steps:
             - uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ ifeq ($(filter $(version),6.2 6.3 6.4),)
 	sed -i -e "s/\(\s\+\)\(handle_all_throwables:\)/\1# \2/" tests/Functional/App/config.yaml
 endif
 
-ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4),)
+ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4 7.0),)
 	sed -i -e "s/\(\s\+\)# \(storage_id:\)/\1\2/" tests/Functional/App/config.yaml
 	sed -i -e "s/\(\s\+\)\(storage_factory_id:\)/\1# \2/" tests/Functional/App/config.yaml
 	sed -i -e "s/\(\s\+\)\(lazy:\)/\1# \2/" tests/Functional/App/config.yaml

diff --git a/composer.json b/composer.json
@@ -15,27 +15,27 @@
         "justinrainbow/json-schema": "^5.2",
         "league/uri": "^6.3",
         "seld/jsonlint": "^1.7",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
+        "symfony/config": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.5 || ^3.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/serializer": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0"
+        "symfony/event-dispatcher": "^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/http-kernel": "^5.4 || ^6.0 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
+        "symfony/routing": "^5.4 || ^6.0 || ^7.0",
+        "symfony/serializer": "^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
         "masterminds/html5": "^2.7",
         "monolog/monolog": "^1.27 || ^2.6 || ^3.0",
         "phpunit/phpunit": "^9.6",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/process": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^5.4 || ^6.0"
+        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
+        "symfony/process": "^5.4 || ^6.0 || ^7.0",
+        "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {