Remove unused addNodeAfterNode(), return nodes instead (#4023)

rectorphp · May 30, 2023 · e2213f2 · e2213f2
1 parent b97fe19
commit e2213f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 51 deletions.
diff --git a/packages/PostRector/Collector/NodesToAddCollector.php b/packages/PostRector/Collector/NodesToAddCollector.php
@@ -23,11 +23,6 @@
  */
 final class NodesToAddCollector implements NodeCollectorInterface
 {
-    /**
-     * @var Stmt[][]
-     */
-    private array $nodesToAddAfter = [];
-
     /**
      * @var Stmt[][]
      */
@@ -43,7 +38,7 @@ public function __construct(
 
     public function isActive(): bool
     {
-        return $this->nodesToAddAfter !== [] || $this->nodesToAddBefore !== [];
+        return $this->nodesToAddBefore !== [];
     }
 
     /**
@@ -67,39 +62,6 @@ public function addNodeBeforeNode(Node $addedNode, Node $positionNode): void
         $this->rectorChangeCollector->notifyNodeFileInfo($positionNode);
     }
 
-    /**
-     * @api Used in downgrade still
-     * @deprecated
-     * Better return created nodes right in refactor() method to keep context
-     * @internal
-     */
-    public function addNodeAfterNode(Node $addedNode, Node $positionNode): void
-    {
-        if ($positionNode->getAttributes() === []) {
-            $message = sprintf('Switch arguments in "%s()" method', __METHOD__);
-            throw new ShouldNotHappenException($message);
-        }
-
-        /** @var MutatingScope|null $currentScope */
-        $currentScope = $positionNode->getAttribute(AttributeKey::SCOPE);
-
-        $this->changedNodeScopeRefresher->refresh($addedNode, $currentScope);
-
-        $position = $this->resolveNearestStmtPosition($positionNode);
-        $this->nodesToAddAfter[$position][] = $this->wrapToExpression($addedNode);
-
-        $this->rectorChangeCollector->notifyNodeFileInfo($positionNode);
-    }
-
-    /**
-     * @return Stmt[]
-     */
-    public function getNodesToAddAfterNode(Node $node): array
-    {
-        $position = spl_object_hash($node);
-        return $this->nodesToAddAfter[$position] ?? [];
-    }
-
     /**
      * @return Stmt[]
      */
@@ -109,12 +71,6 @@ public function getNodesToAddBeforeNode(Node $node): array
         return $this->nodesToAddBefore[$position] ?? [];
     }
 
-    public function clearNodesToAddAfter(Node $node): void
-    {
-        $objectHash = spl_object_hash($node);
-        unset($this->nodesToAddAfter[$objectHash]);
-    }
-
     public function clearNodesToAddBefore(Node $node): void
     {
         $objectHash = spl_object_hash($node);

diff --git a/packages/PostRector/Rector/NodeAddingPostRector.php b/packages/PostRector/Rector/NodeAddingPostRector.php
@@ -39,12 +39,6 @@ public function leaveNode(Node $node): array | Node
     {
         $newNodes = [$node];
 
-        $nodesToAddAfter = $this->nodesToAddCollector->getNodesToAddAfterNode($node);
-        if ($nodesToAddAfter !== []) {
-            $this->nodesToAddCollector->clearNodesToAddAfter($node);
-            $newNodes = array_merge($newNodes, $nodesToAddAfter);
-        }
-
         $nodesToAddBefore = $this->nodesToAddCollector->getNodesToAddBeforeNode($node);
         if ($nodesToAddBefore !== []) {
             $this->nodesToAddCollector->clearNodesToAddBefore($node);