Fix missing stmt on adding a new node (#6383)

Co-authored-by: kaizen-ci <info@kaizen-ci.org>
rectorphp · May 7, 2021 · b1b5f95 · b1b5f95
1 parent 20f9bb7
commit b1b5f95
Show file tree

Hide file tree

Showing 7 changed files with 204 additions and 5 deletions.
diff --git a/packages/PostRector/Collector/NodesToAddCollector.php b/packages/PostRector/Collector/NodesToAddCollector.php
@@ -12,6 +12,7 @@
 use Rector\ChangesReporting\Collector\RectorChangeCollector;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PostRector\Contract\Collector\NodeCollectorInterface;
 
@@ -37,10 +38,19 @@ final class NodesToAddCollector implements NodeCollectorInterface
      */
     private $rectorChangeCollector;
 
-    public function __construct(BetterNodeFinder $betterNodeFinder, RectorChangeCollector $rectorChangeCollector)
-    {
+    /**
+     * @var BetterStandardPrinter
+     */
+    private $betterStandardPrinter;
+
+    public function __construct(
+        BetterNodeFinder $betterNodeFinder,
+        RectorChangeCollector $rectorChangeCollector,
+        BetterStandardPrinter $betterStandardPrinter
+    ) {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->rectorChangeCollector = $rectorChangeCollector;
+        $this->betterStandardPrinter = $betterStandardPrinter;
     }
 
     public function isActive(): bool
@@ -132,14 +142,22 @@ private function resolveNearestExpressionPosition(Node $node): string
             return spl_object_hash($node);
         }
 
+        $currentStmt = $node->getAttribute(AttributeKey::CURRENT_STATEMENT);
+        if ($currentStmt instanceof Stmt) {
+            return spl_object_hash($currentStmt);
+        }
+
         $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
         if ($parent instanceof Return_) {
             return spl_object_hash($parent);
         }
 
         $foundNode = $this->betterNodeFinder->findParentTypes($node, [Expression::class, Stmt::class]);
-        if ($foundNode === null) {
-            $foundNode = $node;
+
+        if (! $foundNode instanceof Stmt) {
+            $printedNode = $this->betterStandardPrinter->print($node);
+            $errorMessage = sprintf('Could not find parent Stmt of "%s" node', $printedNode);
+            throw new ShouldNotHappenException($errorMessage);
         }
 
         return spl_object_hash($foundNode);

diff --git a/rules/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector.php b/rules/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector.php
@@ -74,6 +74,7 @@ public function refactor(Node $node): ?Node
     private function refactorArrayKeyFirst(FuncCall $funcCall): FuncCall
     {
         $array = $funcCall->args[0]->value;
+
         $resetFuncCall = $this->nodeFactory->createFuncCall('reset', [$array]);
         $this->addNodeBeforeNode($resetFuncCall, $funcCall);
 

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -68,6 +68,7 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
         AttributeKey::USE_NODES,
         AttributeKey::SCOPE,
         AttributeKey::RESOLVED_NAME,
+        AttributeKey::PARENT_NODE,
     ];
 
     /**
@@ -350,7 +351,6 @@ final public function enterNode(Node $node)
 
             // update parents relations
             $this->connectParentNodes($node);
-
             $this->mirrorAttributes($originalAttributes, $node);
         }
 

diff --git a/tests/Issues/CovariantTrioTest.php b/tests/Issues/CovariantTrioTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class CovariantTrioTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/covariant_trio.php';
+    }
+}
diff --git a/tests/Issues/Fixture/coariant_mixture.php.inc b/tests/Issues/Fixture/coariant_mixture.php.inc
@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\Fixture;
+
+final class CoriantMixture
+{
+    private function parseArgument(string $token, array $all)
+    {
+        if (($inputArgument = $all[$key = array_key_first($all)] ?? null) && 'command' === $inputArgument->getName()) {
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\Issues\Fixture;
+
+final class CoriantMixture
+{
+    /**
+     * @param string $token
+     */
+    private function parseArgument($token, array $all)
+    {
+        reset($all);
+        if (($inputArgument = isset($all[$key = key($all)]) ? $all[$key = key($all)] : null) && 'command' === $inputArgument->getName()) {
+        }
+    }
+}
+
+?>
diff --git a/tests/Issues/Fixture/input_interface.php.inc b/tests/Issues/Fixture/input_interface.php.inc
@@ -0,0 +1,94 @@
+<?php
+
+class ArgvInput extends Input
+{
+    /**
+     * Parses an argument.
+     *
+     * @throws RuntimeException When too many arguments are given
+     */
+    private function parseArgument(string $token, array $all)
+    {
+        if (($inputArgument = $all[$key = array_key_first($all)] ?? null) && 'command' === $inputArgument->getName()) {
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasParameterOption($values, bool $onlyParams = false)
+    {
+    }
+}
+
+abstract class Input implements InputInterface
+{
+
+}
+
+class ArrayInput extends Input
+{
+    public function hasParameterOption($values, bool $onlyParams = false)
+    {
+
+    }
+}
+
+interface InputInterface
+{
+    public function hasParameterOption($values, bool $onlyParams = false);
+}
+
+?>
+-----
+<?php
+
+class ArgvInput extends Input
+{
+    /**
+     * Parses an argument.
+     *
+     * @throws RuntimeException When too many arguments are given
+     * @param string $token
+     */
+    private function parseArgument($token, array $all)
+    {
+        reset($all);
+        if (($inputArgument = isset($all[$key = key($all)]) ? $all[$key = key($all)] : null) && 'command' === $inputArgument->getName()) {
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     * @param bool $onlyParams
+     */
+    public function hasParameterOption($values, $onlyParams = false)
+    {
+    }
+}
+
+abstract class Input implements InputInterface
+{
+
+}
+
+class ArrayInput extends Input
+{
+    /**
+     * @param bool $onlyParams
+     */
+    public function hasParameterOption($values, $onlyParams = false)
+    {
+
+    }
+}
+
+interface InputInterface
+{
+    /**
+     * @param bool $onlyParams
+     */
+    public function hasParameterOption($values, $onlyParams = false);
+}
+
+?>
diff --git a/tests/Issues/config/covariant_trio.php b/tests/Issues/config/covariant_trio.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Core\ValueObject\PhpVersion;
+use Rector\DowngradePhp70\Rector\Coalesce\DowngradeNullCoalesceRector;
+use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeTypeDeclarationRector;
+use Rector\DowngradePhp73\Rector\FuncCall\DowngradeArrayKeyFirstLastRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_70);
+
+    $services = $containerConfigurator->services();
+    $services->set(DowngradeArrayKeyFirstLastRector::class);
+    $services->set(DowngradeTypeDeclarationRector::class);
+    $services->set(DowngradeNullCoalesceRector::class);
+};