Fix use of removed parent attribute on StaticConnectionHelperRector

src/Rector/Rector/MethodCall/StaticConnectionHelperRector.php

@@ -10,8 +10,8 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\Expression;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -40,18 +40,18 @@ public function getRuleDefinition(): RuleDefinition
 
     public function getNodeTypes(): array
     {
-        return [MethodCall::class, Assign::class];
+        return [Expression::class, MethodCall::class];
     }
 
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): int|Node|null
     {
-        if ($node instanceof Assign) {
-            if ($node->expr instanceof New_ && $this->isName($node->expr->class, 'ConnectionHelper')) {
-                // Remove the instantiation statement
-                $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
-                if ($parent instanceof Expression) {
-                    $this->removeNode($parent);
-                }
+        if ($node instanceof Expression) {
+            if (
+                $node->expr instanceof Assign &&
+                $node->expr->expr instanceof New_ &&
+                $this->isName($node->expr->expr->class, ConnectionHelper::class)
+            ) {
+                return NodeVisitor::REMOVE_NODE;
             }
 
             return null;

tests/TestCase/Rector/MethodCall/StaticConnectionHelperRector/Fixture/fixture.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\StaticConnectionHelperRector\Fixture;
+
+class Fixture
+{
+    public function run()
+    {
+        $connectionHelper = new \Cake\TestSuite\ConnectionHelper();
+        $connection = $connectionHelper->getConnection('default');
+
+        return $connection;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\StaticConnectionHelperRector\Fixture;
+
+class Fixture
+{
+    public function run()
+    {
+        $connection = \Cake\TestSuite\ConnectionHelper::getConnection('default');
+
+        return $connection;
+    }
+}
+
+?>

tests/TestCase/Rector/MethodCall/StaticConnectionHelperRector/StaticConnectionHelperRectorTest.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\StaticConnectionHelperRector;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class StaticConnectionHelperRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

tests/TestCase/Rector/MethodCall/StaticConnectionHelperRector/config/configured_rule.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Cake\Upgrade\Rector\Rector\MethodCall\StaticConnectionHelperRector;
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(StaticConnectionHelperRector::class);
+};

tests/test_apps/upgraded/RectorCommand-testApply51/src/SomeTest.php

@@ -27,7 +27,6 @@ public function testSomething()
 
     public function testConnectionHelper()
     {
-        $connectionHelper = new ConnectionHelper();
         $connection = ConnectionManager::get('test');
         \Cake\TestSuite\ConnectionHelper::runWithoutConstraints($connection, function ($connection) {
             $connection->execute('SELECT * FROM table');