Phpstan 2

.github/workflows/phpstan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,18 +13,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.2, 8.3 ]
-        laravel: [ 10.*, 11.* ]
+        php: [ 8.3, 8.4 ]
+        laravel: [ ^11.0 ]
         carbon: [ ^2.0, ^3.0 ]
         stability: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 10.*
-            testbench: 8.*
-          - laravel: 11.*
-            testbench: 9.*
+          - laravel: ^11.0
+            testbench: ^9.0
         exclude:
-          - laravel: 10.*
-            carbon: ^3.0
+          - php: 8.4
+            stability: prefer-lowest
+          - php: 8.4
+            carbon: ^2.0
+
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - C${{ matrix.carbon }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

README.md

@@ -1,9 +1,9 @@
 # Extra rules for phpstan analysis
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/soyhuce/phpstan-extension.svg?style=flat-square)](https://packagist.org/packages/soyhuce/phpstan-extension)
-[![GitHub Tests Action Status](https://img.shields.io/github/workflow/status/soyhuce/phpstan-extension/run-tests?label=tests)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3Arun-tests+branch%3Amain)
-[![GitHub Code Style Action Status](https://img.shields.io/github/workflow/status/soyhuce/phpstan-extension/Check%20&%20fix%20styling?label=code%20style)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3A"Check+%26+fix+styling"+branch%3Amain)
-[![GitHub PHPStan Action Status](https://img.shields.io/github/workflow/status/soyhuce/phpstan-extension/PHPStan?label=phpstan)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3APHPStan+branch%3Amain)
+[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/soyhuce/phpstan-extension/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3Arun-tests+branch%3Amain)
+[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/soyhuce/phpstan-extension/php-cs-fixer.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
+[![GitHub PHPStan Action Status](https://img.shields.io/github/actions/workflow/status/soyhuce/phpstan-extension/phpstan.yml?branch=main&label=phpstan)](https://github.com/soyhuce/phpstan-extension/actions?query=workflow%3APHPStan+branch%3Amain)
 [![Total Downloads](https://img.shields.io/packagist/dt/soyhuce/phpstan-extension.svg?style=flat-square)](https://packagist.org/packages/soyhuce/phpstan-extension)
 
 Strict rules for PHPStan and helpers for Laravel

composer.json

@@ -16,22 +16,21 @@
         }
     ],
     "require": {
-        "php": "^8.2",
-        "illuminate/support": "^10.0 || ^11.0",
+        "php": "^8.3",
+        "illuminate/support": "^11.0",
         "nesbot/carbon": "^2.0 || ^3.0",
-        "phpstan/phpstan": "^1.10.57"
+        "phpstan/phpstan": "^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.7",
-        "larastan/larastan": "^2.0.1",
-        "nunomaduro/collision": "^7.10 || ^8.0",
-        "orchestra/testbench": "^8.0 || ^9.0",
-        "pestphp/pest": "^2.24",
-        "pestphp/pest-plugin-laravel": "^2.2",
+        "larastan/larastan": "^3.0",
+        "nunomaduro/collision": "^8.0",
+        "orchestra/testbench": "^9.0",
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^10.4"
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon.dist

@@ -7,5 +7,4 @@ parameters:
         - src
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: true
 

src/Rules/CarbonCopyRule.php

@@ -7,6 +7,8 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleError;
+use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\ObjectType;
@@ -30,7 +32,7 @@ public function getNodeType(): string
 
     /**
      * @param MethodCall $node
-     * @return array<string>
+     * @return list<RuleError>
      */
     public function processNode(Node $node, Scope $scope): array
     {
@@ -67,7 +69,9 @@ static function (Type $type) use ($name): bool {
         }
 
         return [
-            "Usage of \\Carbon\\CarbonInterface::{$name}() is prohibited. You should use CarbonImmutable and remove {$name}() call.",
+            RuleErrorBuilder::message("Usage of \\Carbon\\CarbonInterface::{$name}() is prohibited. You should use CarbonImmutable and remove {$name}() call.")
+                ->identifier('carbon.copy')
+                ->build(),
         ];
     }
 }

src/Rules/NoAliasUseRule.php

@@ -4,9 +4,11 @@
 
 use Illuminate\Foundation\AliasLoader;
 use PhpParser\Node;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleError;
+use PHPStan\Rules\RuleErrorBuilder;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\UseUse>
@@ -23,12 +25,12 @@ public function __construct()
 
     public function getNodeType(): string
     {
-        return UseUse::class;
+        return UseItem::class;
     }
 
     /**
-     * @param UseUse $node
-     * @return array<string>
+     * @param UseItem $node
+     * @return list<RuleError>
      */
     public function processNode(Node $node, Scope $scope): array
     {
@@ -40,6 +42,10 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        return ["Usage of alias {$usedClass} is prohibited, prefer the use of {$aliasedClass}."];
+        return [
+            RuleErrorBuilder::message("Usage of alias {$usedClass} is prohibited, prefer the use of {$aliasedClass}.")
+                ->identifier('alias.use')
+                ->build(),
+        ];
     }
 }

src/Rules/NoMutableDateTimeStaticCallRule.php

@@ -6,21 +6,29 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleError;
+use PHPStan\Rules\RuleErrorBuilder;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Expr\StaticCall>
  */
 class NoMutableDateTimeStaticCallRule implements Rule
 {
+    public function __construct(
+        private ReflectionProvider $reflectionProvider,
+    ) {
+    }
+
     public function getNodeType(): string
     {
         return StaticCall::class;
     }
 
     /**
      * @param StaticCall $node
-     * @return array<string>
+     * @return list<RuleError>
      */
     public function processNode(Node $node, Scope $scope): array
     {
@@ -35,16 +43,14 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         return [
-            "Static calls of mutable DateTime is forbidden, currently using {$class}.",
+            RuleErrorBuilder::message("Static calls of mutable DateTime is forbidden, currently using {$class}.")
+                ->identifier('mutable.datetime.static.call')
+                ->build(),
         ];
     }
 
     private function isAllowed(string $class): bool
     {
-        if ($class === DateTime::class) {
-            return false;
-        }
-
-        return !is_subclass_of($class, DateTime::class);
+        return !$this->reflectionProvider->getClass($class)->is(DateTime::class);
     }
 }

src/Rules/NoMutableDateTimeUseRule.php

@@ -4,41 +4,49 @@
 
 use DateTime;
 use PhpParser\Node;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleError;
+use PHPStan\Rules\RuleErrorBuilder;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\UseUse>
  */
 class NoMutableDateTimeUseRule implements Rule
 {
+    public function __construct(
+        private ReflectionProvider $reflectionProvider,
+    ) {
+    }
+
     public function getNodeType(): string
     {
-        return UseUse::class;
+        return UseItem::class;
     }
 
     /**
-     * @param UseUse $node
-     * @return array<string>
+     * @param UseItem $node
+     * @return list<RuleError>
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        $usedClass = $node->name->toString();
+        $class = $node->name->toString();
 
-        if ($this->isAllowed($usedClass)) {
+        if ($this->isAllowed($class)) {
             return [];
         }
 
-        return ["Usage of mutable DateTime is forbidden, currently using {$usedClass}."];
+        return [
+            RuleErrorBuilder::message("Usage of mutable DateTime is forbidden, currently using {$class}.")
+                ->identifier('mutable.datetime.use')
+                ->build(),
+        ];
     }
 
     private function isAllowed(string $class): bool
     {
-        if ($class === DateTime::class) {
-            return false;
-        }
-
-        return !is_subclass_of($class, DateTime::class);
+        return !$this->reflectionProvider->getClass($class)->is(DateTime::class);
     }
 }

src/Rules/NoNewMutableDateTimeRule.php

@@ -6,21 +6,29 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleError;
+use PHPStan\Rules\RuleErrorBuilder;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Expr\New_>
  */
 class NoNewMutableDateTimeRule implements Rule
 {
+    public function __construct(
+        private ReflectionProvider $reflectionProvider,
+    ) {
+    }
+
     public function getNodeType(): string
     {
         return New_::class;
     }
 
     /**
      * @param New_ $node
-     * @return array<string>
+     * @return list<RuleError>
      */
     public function processNode(Node $node, Scope $scope): array
     {
@@ -35,16 +43,14 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         return [
-            "Instanciations of mutable DateTime is forbidden, currently using {$class}.",
+            RuleErrorBuilder::message("Instanciations of mutable DateTime is forbidden, currently using {$class}.")
+                ->identifier('mutable.datetime.new')
+                ->build(),
         ];
     }
 
     private function isAllowed(string $class): bool
     {
-        if ($class === DateTime::class) {
-            return false;
-        }
-
-        return !is_subclass_of($class, DateTime::class);
+        return !$this->reflectionProvider->getClass($class)->is(DateTime::class);
     }
 }

tests/ExecutesLarastan.php

@@ -3,6 +3,7 @@
 namespace Soyhuce\PhpstanExtension\Tests;
 
 use function dirname;
+use function sprintf;
 
 trait ExecutesLarastan
 {