Updated Rector to commit 5e5681d9edbb438b5782b45fde6e88650aa3843f

rectorphp/rector-src@5e5681d [NodeRemover] Use return null after ->removeNode() (#3558)

Author: TomasVotruba

rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php

@@ -125,7 +125,7 @@ public function refactor(Node $node) : ?Node
             return $this->cleanCastedExpr($node->expr);
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
     private function cleanCastedExpr(Expr $expr) : Expr
     {

rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php

@@ -89,7 +89,7 @@ public function refactor(Node $node) : ?Node
             return null;
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
     private function shouldSkipNonFinalNonPrivateClassMethod(Class_ $class, ClassMethod $classMethod) : bool
     {

rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php

@@ -84,7 +84,7 @@ public function refactor(Node $node) : ?Node
             return null;
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
     private function shouldSkip(ClassMethod $classMethod) : bool
     {

rules/DeadCode/Rector/For_/RemoveDeadLoopRector.php

@@ -54,6 +54,6 @@ public function refactor(Node $node) : ?Node
             return null;
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
 }

rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php

@@ -122,7 +122,7 @@ public function refactor(Node $node) : ?Node
             return null;
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
     private function resolveClassLike(MethodCall $methodCall) : ?ClassLike
     {

rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php

@@ -63,7 +63,7 @@ public function refactor(Node $node)
         }
         if ($this->isEmpty($node->stmts)) {
             $this->removeNode($node);
-            return $node;
+            return null;
         }
         if (\count($node->catches) !== 1) {
             return null;

rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php

@@ -85,6 +85,6 @@ public function refactor(Node $node) : ?Node
             return new Return_();
         }
         $this->removeNode($node);
-        return $node;
+        return null;
     }
 }

rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php

@@ -101,6 +101,7 @@ public function refactor(Node $node) : ?Node
         $newName = self::PREVIOUS_TO_NEW_FUNCTIONS[$this->getName($node)];
         $keyFuncCall->name = new Name($newName);
         $this->removeNode($node);
+        // change next node before remove, so it needs to return the Node
         return $node;
     }
     public function provideMinPhpVersion() : int

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3cbf7104d0b81ba1b930ce9a4cd3456e1c082b43';
+    public const PACKAGE_VERSION = '5e5681d9edbb438b5782b45fde6e88650aa3843f';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-04-02 21:40:41';
+    public const RELEASE_DATE = '2023-04-04 00:15:55';
     /**
      * @var int
      */

src/Rector/AbstractRector.php

@@ -50,14 +50,14 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
     private const EMPTY_NODE_ARRAY_MESSAGE = <<<CODE_SAMPLE
 Array of nodes cannot be empty. Ensure "%s->refactor()" returns non-empty array for Nodes.
 
-A) Return null for no change:
+A) Direct return null for no change:
 
     return null;
 
 B) Remove the Node:
 
     \$this->removeNode(\$node);
-    return \$node;
+    return null;
 CODE_SAMPLE;
     /**
      * @var \Rector\NodeNameResolver\NodeNameResolver
@@ -218,7 +218,7 @@ public final function enterNode(Node $node)
             $this->changedNodeScopeRefresher->reIndexNodeAttributes($node);
         }
         $refactoredNode = $this->refactor($node);
-        // nothing to change → continue
+        // nothing to change or just removed via removeNode() → continue
         if ($refactoredNode === null) {
             return null;
         }