Upgrade to Rector 2.0 with PHPStan 2 and PHPParser 5

composer.json

@@ -38,9 +38,9 @@
         "league/flysystem": "^2.0 || ^3.0",
         "league/flysystem-memory": "^2.0 || ^3.0",
         "nette/utils": "^3.2.10 || ^4.0.4",
-        "nikic/php-parser": "^4.18.0",
-        "phpstan/phpstan": "^1.10.56",
-        "rector/rector": "^1.1.0",
+        "nikic/php-parser": "^5.3.1",
+        "phpstan/phpstan": "^2.0.3",
+        "rector/rector": "^2.0.0",
         "symfony/console": "^5.4 || ^6.4 || ^7.0",
         "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
         "symfony/finder": "^5.4 || ^6.4 || ^7.0",
@@ -53,8 +53,8 @@
         "ergebnis/composer-normalize": "^2.42.0",
         "php-parallel-lint/php-parallel-lint": "^1.3.2",
         "phpstan/extension-installer": "^1.3.1",
-        "phpstan/phpstan-deprecation-rules": "^1.1.4",
-        "phpstan/phpstan-phpunit": "^1.3.16",
+        "phpstan/phpstan-deprecation-rules": "^2.0.1",
+        "phpstan/phpstan-phpunit": "^2.0.1",
         "phpunit/phpunit": "^9.6.17 || ^10.0",
         "symfony/config": "^5.0 || ^6.0 || ^7.0",
         "symfony/dependency-injection": "^5.4.36 || ^6.4.2 || ^7.0.2",

phpstan.neon

@@ -7,6 +7,8 @@ parameters:
     editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
     level: 8
 
+    treatPhpDocTypesAsCertain: false
+
     paths:
         - bin
         - config
@@ -29,10 +31,6 @@ parameters:
         # static reflection
         - stubs
 
-    # see https://github.com/rectorphp/rector/issues/3490#issue-634342324
-    featureToggles:
-        disableRuntimeReflectionProvider: true
-
     bootstrapFiles:
          - tests/bootstrap-phpstan.php
 
@@ -50,3 +48,23 @@ parameters:
 
         - '#^Call to method needs\(\) on an unknown class Illuminate\\Contracts\\Container\\ContextualBindingBuilder.$#'
         - '#^Parameter \#1 \$node \(PhpParser\\Node\\Stmt\\Return_\) of method Ssch\\TYPO3Rector\\TYPO310\\v3\\RemoveExcludeOnTransOrigPointerFieldRector::refactor\(\)#'
+
+        -
+            identifier: phpunit.dataProviderMethod
+
+        -
+            identifier: return.type
+
+        -
+            identifier: method.childReturnType
+
+        -
+            identifier: return.unusedType
+
+        -
+            identifier: assign.propertyType
+
+        -
+            identifier: argument.type
+
+        - '#Method .*::provideMinPhpVersion\(\) never returns#'

rules/CodeQuality/General/AddErrorCodeToExceptionRector.php

@@ -6,8 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
-use PhpParser\Node\Expr\Throw_ as ThrowExpression;
-use PhpParser\Node\Stmt\Throw_ as ThrowStatement;
+use PhpParser\Node\Expr\Throw_;
 use Rector\Rector\AbstractRector;
 use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
 use Ssch\TYPO3Rector\Contract\NoChangelogRequiredInterface;
@@ -37,11 +36,11 @@ public function getRuleDefinition(): RuleDefinition
      */
     public function getNodeTypes(): array
     {
-        return [ThrowStatement::class, ThrowExpression::class];
+        return [Throw_::class];
     }
 
     /**
-     * @param ThrowStatement|ThrowExpression $node
+     * @param Throw_ $node
      */
     public function refactor(Node $node): ?Node
     {
@@ -63,10 +62,7 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
-    /**
-     * @param ThrowStatement|ThrowExpression $node
-     */
-    private function shouldSkip($node): bool
+    private function shouldSkip(Throw_ $node): bool
     {
         if (! $node->expr instanceof New_) {
             return true;

rules/CodeQuality/General/ExtEmConfRector.php

@@ -5,10 +5,10 @@
 namespace Ssch\TYPO3Rector\CodeQuality\General;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayDimFetch;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Scalar\String_;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
@@ -111,7 +111,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($node->expr->items === [] || $node->expr->items === null) {
+        if ($node->expr->items === []) {
             return null;
         }
 
@@ -142,7 +142,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if ($item->value->items === null) {
+            if ($item->value->items === []) {
                 continue;
             }
 
@@ -160,7 +160,7 @@ public function refactor(Node $node): ?Node
                     continue;
                 }
 
-                if ($constraintItem->value->items === null) {
+                if ($constraintItem->value->items === []) {
                     continue;
                 }
 

rules/CodeQuality/General/InjectMethodToConstructorInjectionRector.php

@@ -4,6 +4,7 @@
 
 namespace Ssch\TYPO3Rector\CodeQuality\General;
 
+use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -142,7 +143,7 @@ public function refactor(Node $node): ?Node
 
             $this->classDependencyManipulator->addConstructorDependency(
                 $node,
-                new PropertyMetadata($paramName, new ObjectType((string) $param->type), Class_::MODIFIER_PROTECTED)
+                new PropertyMetadata($paramName, new ObjectType((string) $param->type), Modifiers::PROTECTED)
             );
             $this->removeNodeFromStatements($node, $injectMethod);
         }

rules/CodeQuality/General/MoveExtensionManagementUtilityAddStaticFileIntoTCAOverridesRector.php

@@ -9,7 +9,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Rector\AbstractRector;
@@ -126,7 +126,7 @@ public function refactor(Node $node)
             );
         }
 
-        return NodeTraverser::REMOVE_NODE;
+        return NodeVisitor::REMOVE_NODE;
     }
 
     private function shouldSkip(StaticCall $staticMethodCall): bool

rules/CodeQuality/General/MoveExtensionManagementUtilityAddToAllTCAtypesIntoTCAOverridesRector.php

@@ -9,7 +9,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
@@ -131,7 +131,7 @@ public function refactor(Node $node)
             );
         }
 
-        return NodeTraverser::REMOVE_NODE;
+        return NodeVisitor::REMOVE_NODE;
     }
 
     private function shouldSkip(StaticCall $staticMethodCall): bool

rules/CodeQuality/General/MoveExtensionUtilityRegisterPluginIntoTCAOverridesRector.php

@@ -9,7 +9,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Rector\AbstractRector;
@@ -126,7 +126,7 @@ public function refactor(Node $node)
             );
         }
 
-        return NodeTraverser::REMOVE_NODE;
+        return NodeVisitor::REMOVE_NODE;
     }
 
     private function shouldSkip(StaticCall $staticMethodCall): bool

rules/TYPO310/v0/RemoveFormatConstantsEmailFinisherRector.php

@@ -5,9 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO310\v0;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\ClassConstFetch;

rules/TYPO310/v0/UseControllerClassesInExtbasePluginsAndModulesRector.php

@@ -5,9 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO310\v0;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\BinaryOp\Concat;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;

rules/TYPO310/v1/SendNotifyEmailToMailApiRector.php

@@ -18,7 +18,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
@@ -270,21 +270,21 @@ private function messageParts(): Expression
     {
         return new Expression(new Assign(new Variable(self::MESSAGE_PARTS), $this->nodeFactory->createFuncCall(
             'explode',
-            [new ConstFetch(new Name('LF')), new Variable(self::MESSAGE), new LNumber(2)]
+            [new ConstFetch(new Name('LF')), new Variable(self::MESSAGE), new Int_(2)]
         )));
     }
 
     private function subjectFromMessageParts(): Expression
     {
         return new Expression(new Assign(new Variable(self::SUBJECT), $this->nodeFactory->createFuncCall(self::TRIM, [
-            new ArrayDimFetch(new Variable(self::MESSAGE_PARTS), new LNumber(0)),
+            new ArrayDimFetch(new Variable(self::MESSAGE_PARTS), new Int_(0)),
         ])));
     }
 
     private function bodyFromMessageParts(): Expression
     {
         return new Expression(new Assign(new Variable('plainMessage'), $this->nodeFactory->createFuncCall(self::TRIM, [
-            new ArrayDimFetch(new Variable(self::MESSAGE_PARTS), new LNumber(1)),
+            new ArrayDimFetch(new Variable(self::MESSAGE_PARTS), new Int_(1)),
         ])));
     }
 

rules/TYPO310/v3/RemoveExcludeOnTransOrigPointerFieldRector.php

@@ -5,9 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO310\v3;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Stmt\Return_;
 use Ssch\TYPO3Rector\Rector\AbstractTcaRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;

rules/TYPO310/v4/SubstituteGeneralUtilityMethodsWithNativePhpFunctionsRector.php

@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Mul;
 use PhpParser\Node\Expr\StaticCall;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -70,7 +70,7 @@ public function refactor(Node $node): ?Node
                 new Mul($this->nodeFactory->createFuncCall(
                     'microtime',
                     [$this->nodeFactory->createArg($this->nodeFactory->createTrue())]
-                ), new LNumber(1000)),
+                ), new Int_(1000)),
             ]);
         }
 

rules/TYPO311/v0/ExtbaseControllerActionsMustReturnResponseInterfaceRector.php

@@ -5,18 +5,19 @@
 namespace Ssch\TYPO3Rector\TYPO311\v0;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Exit_;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Throw_;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Return_;
-use PhpParser\Node\Stmt\Throw_;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Rector\AbstractRector;
@@ -66,7 +67,7 @@ public function refactor(Node $node): ?Node
 
         $this->traverseNodesWithCallable($node, function (Node $node) {
             if ($node instanceof Class_ || $node instanceof Function_ || $node instanceof Closure) {
-                return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
             }
 
             if (! $node instanceof Return_) {
@@ -75,13 +76,13 @@ public function refactor(Node $node): ?Node
 
             $responseObjectType = new ObjectType('Psr\\Http\\Message\\ResponseInterface');
 
-            if ($node->expr !== null && $this->isObjectType($node->expr, $responseObjectType)) {
+            if ($node->expr instanceof Expr && $this->isObjectType($node->expr, $responseObjectType)) {
                 return null;
             }
 
             $returnCallExpression = $node->expr;
 
-            if ($returnCallExpression !== null && $this->isObjectType(
+            if ($returnCallExpression instanceof Expr && $this->isObjectType(
                 $returnCallExpression,
                 new ObjectType('Psr\Http\Message\ResponseInterface')
             )) {
@@ -174,7 +175,7 @@ public function configure(array $configuration): void
 
     private function shouldSkip(ClassMethod $classMethod): bool
     {
-        if ($classMethod->returnType !== null && $this->isObjectType(
+        if ($classMethod->returnType instanceof Node && $this->isObjectType(
             $classMethod->returnType,
             new ObjectType('Psr\\Http\\Message\\ResponseInterface')
         )) {
@@ -243,7 +244,7 @@ private function lastStatementIsExitCall(Node $lastStatement): bool
 
     private function hasExceptionCall(Node $lastStatement): bool
     {
-        if (! $lastStatement instanceof Throw_) {
+        if (! ($lastStatement instanceof Expression && $lastStatement->expr instanceof Throw_)) {
             return false;
         }
 

rules/TYPO311/v0/ForwardResponseInsteadOfForwardMethodRector.php

@@ -176,7 +176,7 @@ public function createForwardResponseNode(MethodCall $forwardMethodCall)
 
     private function changeActionMethodReturnTypeIfPossible(ClassMethod $actionMethodNode): void
     {
-        if ($actionMethodNode->returnType instanceof Identifier && $actionMethodNode->returnType->name !== null && $actionMethodNode->returnType->name === 'void') {
+        if ($actionMethodNode->returnType instanceof Identifier && $actionMethodNode->returnType->name === 'void') {
             $actionMethodNode->returnType = null;
         }
 
@@ -188,7 +188,7 @@ private function changeActionMethodReturnTypeIfPossible(ClassMethod $actionMetho
         $actionMethodNode->setAttribute(AttributeKey::COMMENTS, $comments);
 
         // Add returnType only if it is the only statement, otherwise it is not reliable
-        if (is_countable($actionMethodNode->stmts) && count((array) $actionMethodNode->stmts) === 1) {
+        if (is_countable($actionMethodNode->stmts) && count($actionMethodNode->stmts) === 1) {
             $actionMethodNode->returnType = new FullyQualified('Psr\Http\Message\ResponseInterface');
         }
     }

rules/TYPO311/v2/MigrateFrameModuleToSvgTreeRector.php

@@ -5,9 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO311\v2;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\ObjectType;