feat: JIRA-13971 Coding Style - Update to PHPStan 2.x

worksome · Dec 11, 2024 · 03f93f0 · 03f93f0
1 parent b99d48e
commit 03f93f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,10 +7,9 @@ jobs:
   setup:
     timeout-minutes: 30
     runs-on: ubuntu-latest
-    name: Pest ${{ matrix.test-suite }} on PHP ${{ matrix.php }}
+    name: Pest ${{ matrix.test-suite }}
     strategy:
       matrix:
-        php: ['8.3']
         test-suite: ['phpcsfixer', 'phpstan', 'rector', 'phpcs']
 
     steps:
@@ -20,10 +19,10 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
+          php-version: 8.3
           coverage: none
-          php-version: ${{ matrix.php }}
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v3

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -1,6 +1,7 @@
 name: Static Analysis
 
-on: [push]
+on:
+  push:
 
 jobs:
   ecs:
@@ -17,9 +18,11 @@ jobs:
         with:
           php-version: 8.3
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install Dependencies
-        run: composer update --prefer-dist --no-interaction --no-progress --ansi
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v3
 
       - name: Style
         run: composer test:lint
diff --git a/composer.json b/composer.json
@@ -5,11 +5,11 @@
     "require": {
         "php": "^8.2",
         "composer-plugin-api": "^2.0",
-        "canvural/larastan-strict-rules": "^2.1.10",
-        "larastan/larastan": "^2.9.11",
-        "phpstan/phpstan": "^1.12.11",
-        "phpstan/phpstan-mockery": "^1.1.3",
-        "rector/rector": "^1.2",
+        "canvural/larastan-strict-rules": "^3.0",
+        "larastan/larastan": "^3.0",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-mockery": "^2.0",
+        "rector/rector": "dev-main",
         "slevomat/coding-standard": "^8.15",
         "spaze/phpstan-disallowed-calls": "^4.0.1",
         "symplify/easy-coding-standard": "^12.3.6"
@@ -41,6 +41,10 @@
         {
             "name": "Owen Voke",
             "email": "[email protected]"
+        },
+        {
+            "name": "Odinn Adalsteinsson",
+            "email": "[email protected]"
         }
     ],
     "extra": {
@@ -66,5 +70,7 @@
             "@test:phpcsfixer",
             "@test:phpcs"
         ]
-    }
+    },
+    "minimum-stability": "stable",
+    "prefer-stable": true
 }