Remove our own ParentConnectorVisitor and use nikic-phpparser's one

infection · May 21, 2024 · 04292d0 · 04292d0
1 parent 80a1579
commit 04292d0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 377 deletions.
diff --git a/src/PhpParser/NodeTraverserFactory.php b/src/PhpParser/NodeTraverserFactory.php
@@ -41,12 +41,12 @@
 use Infection\PhpParser\Visitor\IgnoreNode\InterfaceIgnorer;
 use Infection\PhpParser\Visitor\IgnoreNode\NodeIgnorer;
 use Infection\PhpParser\Visitor\NonMutableNodesIgnorerVisitor;
-use Infection\PhpParser\Visitor\ParentConnectorVisitor;
 use Infection\PhpParser\Visitor\ReflectionVisitor;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeTraverserInterface;
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitor\NameResolver;
+use PhpParser\NodeVisitor\ParentConnectingVisitor;
 use SplObjectStorage;
 
 /**
@@ -77,7 +77,7 @@ public function create(NodeVisitor $mutationVisitor, array $nodeIgnorers): NodeT
                 'replaceNodes' => false,
             ]),
         );
-        $traverser->addVisitor(new ParentConnectorVisitor());
+        $traverser->addVisitor(new ParentConnectingVisitor());
         $traverser->addVisitor(new ReflectionVisitor());
         $traverser->addVisitor($mutationVisitor);
 

diff --git a/src/PhpParser/Visitor/ParentConnectorVisitor.php b/src/PhpParser/Visitor/ParentConnectorVisitor.php
diff --git a/tests/phpunit/Fixtures/PhpParser/ParentConnectorSpyVisitor.php b/tests/phpunit/Fixtures/PhpParser/ParentConnectorSpyVisitor.php
@@ -5,10 +5,8 @@
 namespace Infection\Tests\Fixtures\PhpParser;
 
 use Infection\PhpParser\Visitor\ParentConnector;
-use Infection\PhpParser\Visitor\ParentConnectorVisitor;
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
-use function array_unshift;
 
 final class ParentConnectorSpyVisitor extends NodeVisitorAbstract
 {

diff --git a/tests/phpunit/Fixtures/PhpParser/StackSpyVisitor.php b/tests/phpunit/Fixtures/PhpParser/StackSpyVisitor.php
@@ -4,11 +4,8 @@
 
 namespace Infection\Tests\Fixtures\PhpParser;
 
-use Infection\PhpParser\Visitor\ParentConnectorVisitor;
 use PhpParser\Node;
 use PhpParser\NodeVisitor;
-use PhpParser\NodeVisitorAbstract;
-use function array_unshift;
 
 final class StackSpyVisitor implements NodeVisitor
 {

diff --git a/tests/phpunit/PhpParser/NodeTraverserFactoryTest.php b/tests/phpunit/PhpParser/NodeTraverserFactoryTest.php
@@ -42,12 +42,12 @@
 use Infection\PhpParser\Visitor\IgnoreNode\ChangingIgnorer;
 use Infection\PhpParser\Visitor\IgnoreNode\InterfaceIgnorer;
 use Infection\PhpParser\Visitor\NonMutableNodesIgnorerVisitor;
-use Infection\PhpParser\Visitor\ParentConnectorVisitor;
 use Infection\PhpParser\Visitor\ReflectionVisitor;
 use Infection\Tests\Fixtures\PhpParser\FakeIgnorer;
 use Infection\Tests\Fixtures\PhpParser\FakeVisitor;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
+use PhpParser\NodeVisitor\ParentConnectingVisitor;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
@@ -75,7 +75,7 @@ public function test_it_can_create_a_traverser(): void
                 IgnoreAllMutationsAnnotationReaderVisitor::class,
                 NonMutableNodesIgnorerVisitor::class,
                 NameResolver::class,
-                ParentConnectorVisitor::class,
+                ParentConnectingVisitor::class,
                 ReflectionVisitor::class,
                 FakeVisitor::class,
             ],
@@ -102,7 +102,7 @@ public function test_it_can_create_a_traverser_with_node_ignorers(): void
                 IgnoreAllMutationsAnnotationReaderVisitor::class,
                 NonMutableNodesIgnorerVisitor::class,
                 NameResolver::class,
-                ParentConnectorVisitor::class,
+                ParentConnectingVisitor::class,
                 ReflectionVisitor::class,
                 FakeVisitor::class,
             ],