[NodeRemoval] Refactor NodeRemover to always use removeNode() method to ensure Node in NodesToRemoveCollector (rectorphp#3255)

Author: samsonasik

packages/NodeRemoval/NodeRemover.php

@@ -48,6 +48,7 @@ public function removeNodeFromStatements(
                 continue;
             }
 
+            $this->removeNode($stmt);
             unset($nodeWithStatements->stmts[$key]);
             break;
         }
@@ -76,9 +77,7 @@ public function removeParam(ClassMethod $classMethod, int | Param $keyOrParam):
             return;
         }
 
-        // notify about remove node
-        $this->rectorChangeCollector->notifyNodeFileInfo($classMethod->params[$key]);
-
+        $this->removeNode($classMethod->params[$key]);
         unset($classMethod->params[$key]);
     }
 
@@ -93,9 +92,7 @@ public function removeArg(FuncCall | MethodCall | StaticCall $node, int $key): v
             return;
         }
 
-        // notify about remove node
-        $this->rectorChangeCollector->notifyNodeFileInfo($node->args[$key]);
-
+        $this->removeNode($node->args[$key]);
         unset($node->args[$key]);
     }
 
@@ -108,9 +105,12 @@ public function removeStmt(Closure | ClassMethod | Function_ $functionLike, int
             throw new ShouldNotHappenException();
         }
 
-        // notify about remove node
-        $this->rectorChangeCollector->notifyNodeFileInfo($functionLike->stmts[$key]);
+        // already removed
+        if (! isset($functionLike->stmts[$key])) {
+            return;
+        }
 
+        $this->removeNode($functionLike->stmts[$key]);
         unset($functionLike->stmts[$key]);
     }
 }