feat: Update to PHPStan 2.x

WIP
worksome · Nov 29, 2024 · 87bfaaa · 87bfaaa
1 parent 520259d
commit 87bfaaa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -16,8 +16,10 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install composer dependencies
         uses: ramsey/composer-install@v2

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,10 +12,10 @@ jobs:
     env:
       PREVENT_OUTPUT: true
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.3]
+        php: [8.3]
         laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
@@ -35,6 +35,8 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup problem matchers
         run: |

diff --git a/composer.json b/composer.json
@@ -19,15 +19,15 @@
         "php": "^8.2",
         "illuminate/contracts": "^10.0 || ^11.0",
         "illuminate/http": "^10.0 || ^11.0",
-        "phpstan/phpstan": "^1.10.57",
+        "larastan/larastan": "^3.0",
+        "phpstan/phpstan": "^2.0",
+        "worksome/coding-style": "dev-feature/phpstan-2.x",
         "worksome/request-factories": "^3.2"
     },
     "require-dev": {
         "nunomaduro/collision": "^7.10 || ^8.1",
-        "larastan/larastan": "^2.6",
         "orchestra/testbench": "^8.5.8 || ^9.0",
-        "pestphp/pest": "^2.33",
-        "worksome/coding-style": "^2.8"
+        "pestphp/pest": "^2.33"
     },
     "autoload": {
         "psr-4": {
@@ -52,6 +52,12 @@
             "@test:unit"
         ]
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/odinns/larastan-strict-rules"
+        }
+    ],
     "config": {
         "sort-packages": true,
         "allow-plugins": {

diff --git a/src/RequireRequestFactoryRule.php b/src/RequireRequestFactoryRule.php
@@ -33,7 +33,9 @@ public function getNodeType(): string
 
     /**
      * @param Class_ $node
-     */
+     *
+     * @return array<int, \PHPStan\Rules\RuleError>
+    */
     public function processNode(Node $node, Scope $scope): array
     {
         if ($node->namespacedName === null) {
@@ -57,6 +59,7 @@ public function processNode(Node $node, Scope $scope): array
         return $this->checkForCorrespondingFactory($className);
     }
 
+    /** @return array<int, \PHPStan\Rules\RuleError> */
     public function checkForCorrespondingFactory(string $className): array
     {
         $subName = Str::after($className, "{$this->requestsNamespace}\\");
@@ -69,7 +72,7 @@ public function checkForCorrespondingFactory(string $className): array
         return [
             RuleErrorBuilder::message(
                 "Request \"{$className}\" does not have a corresponding Request Factory at \"{$factoryName}\"."
-            )->build()
+            )->build(),
         ];
     }
 }