Use rector-src#dev-upgrade-to-php-parser5-and-phpstan-2

composer.json

@@ -8,14 +8,11 @@
     },
     "require-dev": {
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^10.5",
-        "rector/rector-src": "dev-main",
-        "rector/type-perfect": "^1.0",
+        "rector/rector-src": "dev-upgrade-to-php-parser5-and-phpstan-2",
         "symplify/easy-coding-standard": "^12.3",
-        "symplify/phpstan-extensions": "^11.4",
-        "symplify/phpstan-rules": "^13.0",
         "symplify/rule-doc-generator": "^12.2",
         "symplify/vendor-patches": "^11.3",
         "tomasvotruba/class-leak": "^1.0",
@@ -33,7 +30,7 @@
         "classmap": ["stubs"]
     },
     "scripts": {
-        "phpstan": "vendor/bin/phpstan analyse --ansi --error-format symplify",
+        "phpstan": "vendor/bin/phpstan analyse --ansi",
         "check-cs": "vendor/bin/ecs check --ansi",
         "fix-cs": "vendor/bin/ecs check --fix --ansi"
     },

phpstan.neon

@@ -1,6 +1,7 @@
-includes:
-    - vendor/symplify/phpstan-rules/config/symplify-rules.neon
-    - vendor/symplify/phpstan-rules/config/rector-rules.neon
+# to be enabled later once rector upgraded to use phpstan v2
+# includes:
+#    - vendor/symplify/phpstan-rules/config/symplify-rules.neon
+#    - vendor/symplify/phpstan-rules/config/rector-rules.neon
 
 parameters:
     level: 8
@@ -10,6 +11,8 @@ parameters:
     # requires exact closure types
     checkMissingCallableSignature: true
 
+    treatPhpDocTypesAsCertain: false
+
     paths:
         - src
         - config
@@ -24,11 +27,12 @@ parameters:
         - '*/Source/*'
 
     # see https://github.com/rectorphp/type-perfect/
-    type_perfect:
-        no_mixed: true
-        null_over_false: true
-        narrow_param: true
-        narrow_return: true
+# to be enabled later once rector upgraded to use phpstan v2
+#    type_perfect:
+#        no_mixed: true
+#        null_over_false: true
+#        narrow_param: true
+#        narrow_return: true
 
     ignoreErrors:
         # php enum value minus
@@ -55,3 +59,18 @@ parameters:
             message: '#Parameter \#1 \$attributeClass of class Rector\\DowngradePhp80\\ValueObject\\DowngradeAttributeToAnnotation constructor expects class\-string, string given#'
             path: "config/*"
 
+        # more advanced usage, but not always working
+        # see https://github.com/rectorphp/rector-src/actions/runs/11798721617/job/32865546672?pr=6422#step:5:110
+        - '#Doing instanceof PHPStan\\Type\\.+ is error\-prone and deprecated#'
+
+        # phpstan instanceof
+        -
+            identifier: phpstanApi.instanceofAssumption
+
+        -
+            identifier: phpstanApi.varTagAssumption
+
+        -
+            identifier: argument.type
+
+        - '#Asking about instanceof PHPStan\\.* is not covered by backward compatibility promise#'

rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/Fixture/fixture.php.inc

@@ -42,13 +42,11 @@ SQL;
 SELECT *
 FROM `table`
 WHERE `column` = true;
-SQL
-);
+SQL);
         $this->setOnClick(<<<JAVASCRIPT
 document.getElementById('{$this->getHtmlId()}').value = '';
 document.getElementById('{$this->getHtmlId()}').onchange();
-JAVASCRIPT
-);
+JAVASCRIPT);
     }
 }
 

rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/Fixture/line_ends_with_newline_or_semicolon.php.inc

@@ -46,13 +46,11 @@ EOS
 
         $needsDowngrade1 = sprintf(<<<EOS
 test %s
-EOS
-, 'more');
+EOS, 'more');
 
         $needsDowngrade2 = <<<EOS
 test
-EOS
-; $z = '';
+EOS; $z = '';
     }
 }
 

rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/Fixture/arrow_function_inside_call_like.php.inc

@@ -33,8 +33,8 @@ class ErrorsConsoleStyle
 
     public function table(int $terminalWidth, int $maxHeaderWidth): void
     {
-        $f = static function ($rows) use ($terminalWidth, $maxHeaderWidth) : array {
-            return array_map(static function ($row) use ($terminalWidth, $maxHeaderWidth) : array {
+        $f = static function ($rows) use ($terminalWidth, $maxHeaderWidth): array {
+            return array_map(static function ($row) use ($terminalWidth, $maxHeaderWidth): array {
                 return array_map(static function ($s) use ($terminalWidth, $maxHeaderWidth) {
                     if ($terminalWidth > $maxHeaderWidth + 5) {
                         return wordwrap(

rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/Fixture/preserve-by-ref-closureuse.php.inc

@@ -37,7 +37,7 @@ class PreserveByRefClosureUse
         $nameScopeMap = [];
         $f = function () use ($j, &$nameScopeMap): ?int {
             $nameScopeMap[] = function () use ($j): callable {
-                return static function (int $i) use ($j) : int {
+                return static function (int $i) use ($j): int {
                     return $i + $j;
                 };
             };

rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/Fixture/with_nullable_return_type.php.inc

@@ -20,7 +20,7 @@ class WithNullableReturnType
 {
     public function run()
     {
-        $callable = function () : ?string {
+        $callable = function (): ?string {
             return 'Hello world';
         };
     }

rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/Fixture/with_return_type.php.inc

@@ -20,7 +20,7 @@ class WithReturnType
 {
     public function run()
     {
-        $callable = function () : string {
+        $callable = function (): string {
             return 'Hello world';
         };
     }

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/in_arrow_function.php.inc

@@ -36,7 +36,7 @@ final class InArrowFunction
         ];
 
         $mapped = array_map(
-            static function (mixed $default) : mixed {
+            static function (mixed $default): mixed {
                 switch (true) {
                     case is_string($default):
                         return sprintf('"%s"', $default);

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/in_arrow_function2.php.inc

@@ -23,7 +23,7 @@ final class InArrowFunction2
 {
     public function run($value)
     {
-        $mapped = static function (mixed $default) : mixed {
+        $mapped = static function (mixed $default): mixed {
             switch (true) {
                 case is_string($default):
                     return sprintf('"%s"', $default);

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/in_arrow_function_as_invokable.php.inc

@@ -21,7 +21,7 @@ final class InArrowFunctionAsInvokable
 {
     public function run($value)
     {
-        (static function (mixed $default) : mixed {
+        (static function (mixed $default): mixed {
             switch (true) {
                 case is_string($default):
                     return sprintf('"%s"', $default);

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/in_arrow_function_in_expression.php.inc

@@ -21,7 +21,7 @@ final class InArrowFunctionInExpression
 {
     public function run($value)
     {
-        static function (mixed $default) : mixed {
+        static function (mixed $default): mixed {
             switch (true) {
                 case is_string($default):
                     return sprintf('"%s"', $default);

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/in_arrow_function_in_return.php.inc

@@ -21,7 +21,7 @@ final class InArrowFunctionInReturn
 {
     public function run($value)
     {
-        return static function (mixed $default) : mixed {
+        return static function (mixed $default): mixed {
             switch (true) {
                 case is_string($default):
                     return sprintf('"%s"', $default);

rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/Fixture/do_not_change_correct_union_array_docblock_on_param.php.inc

@@ -7,14 +7,14 @@ use PhpParser\Node\Stmt;
 final class DoNotChangeCorrectUnionArrayDocblockOnParam
 {
     /**
-     * @param int|string[]
+     * @param int|string[] $data
      */
     public function run(int|array $data)
     {
     }
 
     /**
-     * @param Node|null|Stmt[]
+     * @param Node|null|Stmt[] $data
      */
     public function run2(Node|null|array $data)
     {
@@ -32,14 +32,14 @@ use PhpParser\Node\Stmt;
 final class DoNotChangeCorrectUnionArrayDocblockOnParam
 {
     /**
-     * @param int|string[]
+     * @param int|string[] $data
      */
     public function run($data)
     {
     }
 
     /**
-     * @param Node|null|Stmt[]
+     * @param Node|null|Stmt[] $data
      */
     public function run2($data)
     {

rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/Fixture/fixture.php.inc

@@ -10,7 +10,7 @@ array_is_list([1 => 'apple', 'orange']);
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeArrayIsListRector\Fixture;
 
-$arrayIsListFunction = function (array $array) : bool {
+$arrayIsListFunction = function (array $array): bool {
     if (function_exists('array_is_list')) {
         return array_is_list($array);
     }

rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/Fixture/inside_if.php.inc

@@ -16,7 +16,7 @@ namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeArrayIsListRector
 
 function insideIf($arguments)
 {
-    $arrayIsListFunction = function (array $array) : bool {
+    $arrayIsListFunction = function (array $array): bool {
         if (function_exists('array_is_list')) {
             return array_is_list($array);
         }

rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/Fixture/inside_return.php.inc

@@ -15,7 +15,7 @@ namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeArrayIsListRector
 
 function insideReturn($arguments)
 {
-    $arrayIsListFunction = function (array $array) : bool {
+    $arrayIsListFunction = function (array $array): bool {
         if (function_exists('array_is_list')) {
             return array_is_list($array);
         }

rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/Fixture/no_scope_parent_assign_from_func_call.php.inc

@@ -41,7 +41,7 @@ final class Loop
         }
 
         register_shutdown_function(function () {
-            $arrayIsListFunction = function (array $array) : bool {
+            $arrayIsListFunction = function (array $array): bool {
                 if (function_exists('array_is_list')) {
                     return array_is_list($array);
                 }

rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php

@@ -8,7 +8,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
 use PhpParser\Node\Expr\ConstFetch;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use Rector\Enum\JsonConstant;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -35,19 +35,19 @@ public function clean(ConstFetch|BitwiseOr $node, array $constants): Expr|null
     /**
      * @param array<JsonConstant::*> $constants
      */
-    private function cleanByConstFetch(ConstFetch $constFetch, array $constants): ?LNumber
+    private function cleanByConstFetch(ConstFetch $constFetch, array $constants): ?Int_
     {
         if (! $this->nodeNameResolver->isNames($constFetch, $constants)) {
             return null;
         }
 
-        return new LNumber(0);
+        return new Int_(0);
     }
 
     /**
      * @param array<JsonConstant::*> $constants
      */
-    private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): null|Expr|LNumber
+    private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): null|Expr|Int_
     {
         $isLeftTransformed = $this->isTransformed($bitwiseOr->left, $constants);
         $isRightTransformed = $this->isTransformed($bitwiseOr->right, $constants);
@@ -64,7 +64,7 @@ private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): null|
             return $bitwiseOr->right;
         }
 
-        return new LNumber(0);
+        return new Int_(0);
     }
 
     /**

rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp72\PhpDoc;
 
+use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -29,7 +30,7 @@ public function __construct(
 
     public function decorate(ClassMethod $classMethod, Param $param): void
     {
-        if ($param->type === null) {
+        if (! $param->type instanceof Node) {
             return;
         }
 

rules/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector.php

@@ -67,7 +67,7 @@ public function getNodeTypes(): array
     /**
      * @param ConstFetch|BitwiseOr|If_ $node
      */
-    public function refactor(Node $node): Expr|If_|null|int
+    public function refactor(Node $node): Expr|If_|null
     {
         if ($node instanceof If_) {
             return $this->refactorIf($node);

rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php

@@ -14,7 +14,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Param;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassConst;
@@ -150,7 +150,7 @@ private function refactorClassConst(ClassConst $classConst): ?ClassConst
                 continue;
             }
 
-            $classConst->consts[$key]->value = new LNumber(512);
+            $classConst->consts[$key]->value = new Int_(512);
             return $classConst;
         }