Merge pull request #444 from garak/sf6

allow Symfony 6
KnpLabs · Dec 8, 2021 · b4db557 · b4db557
2 parents 017b3c4 + 9f30329
commit b4db557
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,12 +32,15 @@ jobs:
             fail-fast: false
             matrix:
                 include:
+                    - description: 'Symfony 6.0'
+                      php: '8.0'
+                      symfony: '6.0.*@dev'
                     - description: 'Symfony 5.0'
                       php: '7.3'
                       symfony: '5.0.*'
                     - description: 'Symfony 4.4'
                       php: '7.1'
-                      symfony: '4.4.*'
+                      symfony: '4.3.*@dev'
                     - description: 'Symfony 3.4'
                       php: '7.3'
                       symfony: '3.4.*'
@@ -60,8 +63,14 @@ jobs:
             - run: |
                   sed -ri 's/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' composer.json;
               if: matrix.symfony
-            - run: composer config minimum-stability beta
+            - run: |
+                  composer config minimum-stability dev
+                  composer config prefer-stable true
               if: matrix.beta
+            - name: remove cs-fixer for Symfony 6
+              if: contains(matrix.symfony, '6.0.*@dev')
+              run: |
+                  composer remove --dev friendsofphp/php-cs-fixer pedrotroller/php-cs-custom-fixer --no-update
             - run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
             - run: vendor/bin/phpunit
             - run: vendor/bin/phpstan analyse --ansi --no-progress
diff --git a/composer.json b/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": ">=7.1",
-        "symfony/process": "~3.4||~4.3||~5.0",
+        "symfony/process": "~3.4||~4.3||~5.0||~6.0",
         "psr/log": "^1.0||^2.0||^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.4",
+        "phpunit/phpunit": "~7.4||~8.5",
         "phpstan/phpstan": "^0.12.7",
         "phpstan/phpstan-phpunit": "^0.12.6",
         "friendsofphp/php-cs-fixer": "^2.16||^3.0",