Merge pull request #717 from KnpLabs/symfony6

allow Symfony 6
KnpLabs · Oct 30, 2021 · 216b9d5 · 216b9d5
2 parents d5608ab + b0e1467
commit 216b9d5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,12 +37,12 @@ jobs:
                     - description: 'Symfony 4.4'
                       php: '7.3'
                       composer_option: '--prefer-lowest'
-                    - description: 'Symfony 5.1'
+                    - description: 'Symfony 5.3'
                       php: '7.4'
-                      symfony: 5.1.*
-                    - description: 'Symfony 5.2'
+                      symfony: 5.3.*
+                    - description: 'Symfony 6.0'
                       php: '8.0'
-                      symfony: 5.2.*
+                      symfony: 6.0.*-dev
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout
@@ -58,6 +58,9 @@ jobs:
                   php-version: ${{ matrix.php }}
             - run: |
                   sed -ri 's/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' composer.json;
+              if: contains(matrix.symfony, '-dev')
+            - run: composer config minimum-stability dev
+            - run: composer config prefer-stable true
               if: matrix.symfony
             - run: composer update --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
             - run: vendor/bin/phpunit

diff --git a/composer.json b/composer.json
@@ -18,20 +18,20 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "knplabs/knp-components": "^2.4 || ^3.0",
-        "symfony/config": "^4.4 || ^5.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.0",
-        "symfony/http-foundation": "^4.4 || ^5.0",
-        "symfony/http-kernel": "^4.4 || ^5.0",
-        "symfony/routing": "^4.4 || ^5.0",
-        "symfony/translation": "^4.4 || ^5.0",
+        "symfony/config": "^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/http-foundation": "^4.4 || ^5.3 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0",
+        "symfony/routing": "^4.4 || ^5.3 || ^6.0",
+        "symfony/translation": "^4.4 || ^5.3 || ^6.0",
         "twig/twig": "^2.0 || ^3.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.93",
-        "phpunit/phpunit": "^8.5 || ^9.4",
-        "symfony/expression-language": "^4.4 || ^5.0",
-        "symfony/templating": "^4.4 || ^5.0"
+        "phpunit/phpunit": "^8.5 || ^9.5",
+        "symfony/expression-language": "^4.4 || ^5.3 || ^6.0",
+        "symfony/templating": "^4.4 || ^5.3 || ^6.0"
     },
     "autoload": {
         "psr-4": {