Add support for Symfony 6 (#942)

sonata-project · Oct 24, 2021 · 0f17677 · 0f17677
1 parent c42e865
commit 0f17677
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -53,6 +53,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 5.4.*
                       variant: symfony/symfony:"5.4.*"
+                    - php-version: '8.0'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.0.*
+                      variant: symfony/symfony:"6.0.*"
 
         steps:
             - name: Checkout

diff --git a/composer.json b/composer.json
@@ -28,18 +28,18 @@
         "sonata-project/doctrine-extensions": "^1.10.1",
         "sonata-project/form-extensions": "^1.4",
         "sonata-project/twig-extensions": "^1.0",
-        "symfony/asset": "^4.4 || ^5.3",
-        "symfony/config": "^4.4 || ^5.3",
-        "symfony/console": "^4.4 || ^5.3",
-        "symfony/dependency-injection": "^4.4 || ^5.3",
-        "symfony/event-dispatcher": "^4.4 || ^5.3",
+        "symfony/asset": "^4.4 || ^5.3 || ^6.0",
+        "symfony/config": "^4.4 || ^5.3 || ^6.0",
+        "symfony/console": "^4.4 || ^5.3 || ^6.0",
+        "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.3 || ^6.0",
         "symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
-        "symfony/form": "^4.4 || ^5.3",
-        "symfony/framework-bundle": "^4.4 || ^5.3",
-        "symfony/http-foundation": "^4.4 || ^5.3",
-        "symfony/http-kernel": "^4.4 || ^5.3",
-        "symfony/options-resolver": "^4.4 || ^5.3",
-        "symfony/twig-bundle": "^4.4 || ^5.3",
+        "symfony/form": "^4.4 || ^5.3 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
+        "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0",
+        "symfony/options-resolver": "^4.4 || ^5.3 || ^6.0",
+        "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0",
         "twig/twig": "^2.12.1 || ^3.0"
     },
     "conflict": {
@@ -54,10 +54,10 @@
         "phpstan/phpstan-symfony": "^0.12.10",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-symfony": "^2.0",
-        "symfony/browser-kit": "^4.4 || ^5.3",
-        "symfony/debug": "^4.4 || ^5.3",
-        "symfony/phpunit-bridge": "^5.3",
-        "symfony/stopwatch": "^4.4 || ^5.3",
+        "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
+        "symfony/debug": "^4.4 || ^5.3 || ^6.0",
+        "symfony/phpunit-bridge": "^5.3 || ^6.0",
+        "symfony/stopwatch": "^4.4 || ^5.3 || ^6.0",
         "vimeo/psalm": "^4.1"
     },
     "suggest": {