Merge pull request #106 from DaveLiddament/feature/add-symfony-6-depe…

…ndency UPDATE dependencies to allow Symfony 6 components
DaveLiddament · Nov 29, 2021 · 72bc655 · 72bc655
2 parents 3078203 + b2169de
commit 72bc655
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 145 deletions.
diff --git a/.github/workflows/full-checks.yml b/.github/workflows/full-checks.yml
@@ -64,9 +64,7 @@ jobs:
         run: "composer update --no-interaction --no-progress"
 
       - name: "Full CI"
-        run: |
-          export PHP_CS_FIXER_IGNORE_ENV=true
-          composer ci
+        run: "composer ci-${{ matrix.php-version }}"
 
 
   one-version-only:

diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
   },
   "require": {
     "php": ">=7.3 <8.2",
-    "symfony/config": "^3.4 || ^4.0 || ^5.0",
-    "symfony/console": "^3.4 || ^4.0 || ^5.0",
-    "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
-    "symfony/process": "^3.4 || ^4.0 || ^5.0",
-    "symfony/yaml": "^3.4 || ^4.0 || ^5.0",
+    "symfony/config": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/console": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/process": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
     "webmozart/assert": "^1.3",
     "webmozart/path-util": "^2.3"
   },
@@ -48,21 +48,59 @@
     }
   },
   "scripts": {
-    "ci" : [
+    "ci-7.3" : [
       "@composer-validate",
       "@lint",
       "@var-dump-checker",
       "@cs",
       "@test",
       "@psalm",
-      "@phpstan"
+      "@phpstan",
+      "@psalm-7.3"
+    ],
+    "ci-7.4" : [
+      "@composer-validate",
+      "@lint",
+      "@var-dump-checker",
+      "@cs",
+      "@test",
+      "@psalm",
+      "@phpstan",
+      "@psalm-7.4"
+    ],
+    "ci-8.0" : [
+      "@composer-validate",
+      "@lint",
+      "@var-dump-checker",
+      "@cs",
+      "@test",
+      "@psalm",
+      "@phpstan",
+      "@psalm-8.0"
+    ],
+    "ci-8.1" : [
+      "@composer-validate",
+      "@lint",
+      "@var-dump-checker",
+      "@cs-8.1",
+      "@test",
+      "@psalm",
+      "@phpstan",
+      "@psalm-8.1"
     ],
     "composer-validate" : "@composer validate --no-check-all --strict",
     "lint" : "parallel-lint src tests",
     "var-dump-checker" : "var-dump-check --ladybug --no-colors src",
     "cs" : "php-cs-fixer fix -v --dry-run",
     "cs-fix" : "php-cs-fixer fix -v",
-    "psalm" : "psalm --shepherd",
+    "cs-fix-8.1" : [
+      "@putenv PHP_CS_FIXER_IGNORE_ENV=true",
+      "php-cs-fixer fix -v"
+    ],
+    "psalm-7.3" : "psalm --php-version=7.3",
+    "psalm-7.4" : "psalm --php-version=7.4",
+    "psalm-8.0" : "psalm --php-version=8.0",
+    "psalm-8.1" : "psalm --php-version=8.1 --shepherd",
     "phpstan" : "phpstan -n --no-progress  analyse",
     "deptrac" : "deptrac",
     "test" : [