Ensure removing visitor does not leave holes

nikic · May 21, 2023 · 8bc6982 · 8bc6982
1 parent fb2c3ac
commit 8bc6982
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/PhpParser/NodeTraverser.php b/lib/PhpParser/NodeTraverser.php
@@ -48,11 +48,9 @@ public function addVisitor(NodeVisitor $visitor): void {
      * @param NodeVisitor $visitor
      */
     public function removeVisitor(NodeVisitor $visitor): void {
-        foreach ($this->visitors as $index => $storedVisitor) {
-            if ($storedVisitor === $visitor) {
-                unset($this->visitors[$index]);
-                break;
-            }
+        $index = array_search($visitor, $this->visitors);
+        if ($index !== false) {
+            array_splice($this->visitors, $index, 1, []);
         }
     }
 

diff --git a/test/PhpParser/NodeTraverserTest.php b/test/PhpParser/NodeTraverserTest.php
@@ -348,7 +348,7 @@ public function testRemovingVisitor() {
 
         $traverser->removeVisitor($visitor2);
 
-        $postExpected = [0 => $visitor1, 2 => $visitor3];
+        $postExpected = [$visitor1, $visitor3];
         $this->assertSame($postExpected, $getVisitors());
     }