chore: allow phpstan v1

sabre-io · Jul 26, 2024 · 5e0a90c · 5e0a90c
1 parent e0e1ccb
commit 5e0a90c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,13 +14,16 @@ jobs:
       matrix:
         php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         coverage: ['pcov']
+        code-style: ['no']
         code-analysis: ['no']
         include:
           - php-versions: '7.1'
             coverage: 'none'
+            code-style: 'yes'
             code-analysis: 'yes'
           - php-versions: '8.4'
             coverage: 'pcov'
+            code-style: 'no'
             code-analysis: 'yes'
     steps:
       - name: Checkout
@@ -51,7 +54,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Code Analysis (PHP CS-Fixer)
-        if: matrix.code-analysis == 'yes'
+        if: matrix.code-style == 'yes'
         run: PHP_CS_FIXER_IGNORE_ENV=true php vendor/bin/php-cs-fixer fix --dry-run --diff
 
       - name: Code Analysis (PHPStan)

diff --git a/composer.json b/composer.json
@@ -46,13 +46,14 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.17.1",
-        "phpstan/phpstan": "^0.12",
+        "friendsofphp/php-cs-fixer": "~2.17.1 || ^3.60",
+        "phpstan/phpstan": "^0.12 || ^1.1",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6"
     },
     "scripts": {
         "phpstan": [
-            "phpstan analyse lib tests"
+            "phpstan analyse lib",
+            "phpstan analyse tests"
         ],
         "cs-fixer": [
             "php-cs-fixer fix"