Add Symfony 6 support

thephpleague · Nov 23, 2021 · de58094 · de58094
1 parent 320a440
commit de58094
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 9 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -35,7 +35,7 @@ jobs:
                   composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
                   php vendor/bin/simple-phpunit
 
-    tests-php-7-4-symfony-5-0:
+    tests-php-7-3-symfony-5-0:
         runs-on: ubuntu-latest
         env:
             SYMFONY_VERSION: 5.0.*
@@ -66,3 +66,35 @@ jobs:
                   composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
                   composer update --prefer-dist --no-interaction --no-ansi --no-progress
                   php vendor/bin/simple-phpunit
+
+    tests-php-7-4-symfony-6-0:
+        runs-on: ubuntu-latest
+        env:
+            SYMFONY_VERSION: 6.0.*
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+            - name: PHPUnit
+              run: |
+                  composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
+                  composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
+                  composer update --prefer-dist --no-interaction --no-ansi --no-progress
+                  php vendor/bin/simple-phpunit
+
+    tests-php-8-0-symfony-6-0:
+        runs-on: ubuntu-latest
+        env:
+            SYMFONY_VERSION: 6.0.*
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.0'
+            - name: PHPUnit
+              run: |
+                  composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
+                  composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
+                  composer update --prefer-dist --no-interaction --no-ansi --no-progress
+                  php vendor/bin/simple-phpunit
diff --git a/composer.json b/composer.json
@@ -22,10 +22,10 @@
     "require": {
         "php": ">=7.2",
         "league/flysystem": "^2.0",
-        "symfony/config": "^4.2|^5.0",
-        "symfony/http-kernel": "^4.2|^5.0",
-        "symfony/dependency-injection": "^4.2|^5.0",
-        "symfony/options-resolver": "^4.2|^5.0"
+        "symfony/config": "^4.2|^5.0|^6.0",
+        "symfony/http-kernel": "^4.2|^5.0|^6.0",
+        "symfony/dependency-injection": "^4.2|^5.0|^6.0",
+        "symfony/options-resolver": "^4.2|^5.0|^6.0"
     },
     "require-dev": {
         "league/flysystem-async-aws-s3": "^2.0",
@@ -34,11 +34,11 @@
         "league/flysystem-google-cloud-storage": "^2.0",
         "league/flysystem-memory": "^2.0",
         "league/flysystem-sftp": "^2.0",
-        "symfony/dotenv": "^4.2|^5.0",
-        "symfony/framework-bundle": "^4.2|^5.0",
+        "symfony/dotenv": "^4.2|^5.0|^6.0",
+        "symfony/framework-bundle": "^4.2|^5.0|^6.0",
         "symfony/phpunit-bridge": "^5.2",
-        "symfony/var-dumper": "^4.1|^5.0",
-        "symfony/yaml": "^4.2|^5.0"
+        "symfony/var-dumper": "^4.1|^5.0|^6.0",
+        "symfony/yaml": "^4.2|^5.0|^6.0"
     },
     "conflict": {
         "league/flysystem-cached-adapter": "<1.0.9"