Merge pull request #146 from WandiParis/stable

chore: symfony 6 support
greg0ire · May 24, 2023 · 26eed5c · 26eed5c
2 parents 617e44d + ddb0830
commit 26eed5c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -51,8 +51,16 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "${{ inputs.composer-options }}"
 
-      - name: "Run PHPUnit"
+      - name: "Run PHPUnit for PHP 7x"
+        if: "${{ startsWith(matrix.php-version, '7') }}"
         run: >
              SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
              SYMFONY_PHPUNIT_VERSION=8.5.13
              vendor/bin/simple-phpunit
+
+      -   name: "Run PHPUnit for PHP 8.0"
+          if: "${{ ! startsWith(matrix.php-version, '7') }}"
+          run: >
+            SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
+            SYMFONY_PHPUNIT_VERSION=9.5.28
+            vendor/bin/simple-phpunit
diff --git a/composer.json b/composer.json
@@ -25,22 +25,22 @@
         "doctrine/inflector": "^1.4 || ^2.0"
     },
     "conflict": {
-        "symfony/form": "<3.2 || >=6.0 <999",
-        "symfony/validator": "<3.2 || >=6.0 <999"
+        "symfony/form": "<3.2 || >=7.0 <999",
+        "symfony/validator": "<3.2 || >=7.0 <999"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "symfony/config": "^4.2 || ^5.0",
-        "symfony/dependency-injection": "^4.2 || ^5.0",
-        "symfony/form": "^4.2.5 || ^5.0",
-        "symfony/framework-bundle": "^4.2 || ^5.0",
-        "symfony/http-kernel": "^4.2 || ^5.1.5",
-        "symfony/options-resolver": "^4.2 || ^5.0",
-        "symfony/phpunit-bridge": "^5.0",
-        "symfony/translation": "^4.2 || ^5.0",
+        "symfony/config": "^4.2 || ^5.0 || ^6.0",
+        "symfony/dependency-injection": "^4.2 || ^5.0 || ^6.0",
+        "symfony/form": "^4.2.5 || ^5.0 || ^6.0",
+        "symfony/framework-bundle": "^4.2 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^4.2 || ^5.1.5 || ^6.0",
+        "symfony/options-resolver": "^4.2 || ^5.0 || ^6.0",
+        "symfony/phpunit-bridge": "^5.0 || ^6.0",
+        "symfony/translation": "^4.2 || ^5.0 || ^6.0",
         "symfony/translation-contracts": "^2.0",
-        "symfony/twig-bundle": "^4.2 || ^5.0",
-        "symfony/validator": "^4.3.6 || ^5.0",
+        "symfony/twig-bundle": "^4.2 || ^5.0 || ^6.0",
+        "symfony/validator": "^4.3.6 || ^5.0 || ^6.0",
         "twig/twig": "^2.4.2 || ^3.0"
     },
     "suggest": {