[Core] Always reset stopTraversal to false on next Rector visit (#4182)

* [Core] Always reset stopTraversal to false on next Rector visit * [ci-review] Rector Rectify * [ci-review] Rector Rectify * rename property Conflicts: src/PhpParser/NodeTraverser/RectorNodeTraverser.php * update fixture * Fix phpstan * remove just reprinted verify on RectifiedAnalyzer * increase kernel cache key * clean up * Revert "remove just reprinted verify on RectifiedAnalyzer" This reverts commit 66ba1ba. * remove docblock update after refactor * [ci-review] Rector Rectify * update kernel cache key * final touch: comment --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Jun 11, 2023 · bb609b2 · bb609b2
1 parent 405d9f8
commit bb609b2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 37 deletions.
diff --git a/packages/Comments/NodeDocBlock/DocBlockUpdater.php b/packages/Comments/NodeDocBlock/DocBlockUpdater.php
@@ -39,23 +39,6 @@ public function updateNodeWithPhpDocInfo(Node $node): void
         $node->setDocComment(new Doc($phpDoc));
     }
 
-    public function updateRefactoredNodeWithPhpDocInfo(Node $node): void
-    {
-        // nothing to change? don't save it
-        $phpDocInfo = $this->resolveChangedPhpDocInfo($node);
-        if (! $phpDocInfo instanceof PhpDocInfo) {
-            return;
-        }
-
-        $phpDocNode = $phpDocInfo->getPhpDocNode();
-        if ($phpDocNode->children === []) {
-            $this->setCommentsAttribute($node);
-            return;
-        }
-
-        $node->setDocComment(new Doc((string) $phpDocNode));
-    }
-
     private function setCommentsAttribute(Node $node): void
     {
         if ($node->hasAttribute(AttributeKey::PREVIOUS_DOCS_AS_COMMENTS)) {

diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v94';
+    private const CACHE_KEY = 'v96';
 
     private ContainerInterface|null $container = null;
 

diff --git a/src/PhpParser/NodeFinder/PropertyFetchFinder.php b/src/PhpParser/NodeFinder/PropertyFetchFinder.php
@@ -170,7 +170,11 @@ private function isInAnonymous(PropertyFetch $propertyFetch, Class_|Trait_ $clas
             return false;
         }
 
-        return $classReflection->getName() !== $this->nodeNameResolver->getName($class) && ! $hasTrait;
+        if ($classReflection->getName() === $this->nodeNameResolver->getName($class)) {
+            return false;
+        }
+
+        return ! $hasTrait;
     }
 
     private function isNamePropertyNameEquals(

diff --git a/src/PhpParser/NodeTraverser/RectorNodeTraverser.php b/src/PhpParser/NodeTraverser/RectorNodeTraverser.php
@@ -6,13 +6,17 @@
 
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use Rector\Core\Contract\Rector\PhpRectorInterface;
 use Rector\VersionBonding\PhpVersionedFilter;
 
 final class RectorNodeTraverser extends NodeTraverser
 {
     private bool $areNodeVisitorsPrepared = false;
 
+    /** @var PhpRectorInterface[]|NodeVisitor[] */
+    private array $activePhpRectors = [];
+
     /**
      * @param PhpRectorInterface[] $phpRectors
      */
@@ -31,7 +35,16 @@ public function __construct(
     public function traverse(array $nodes): array
     {
         $this->prepareNodeVisitors();
-        return parent::traverse($nodes);
+
+        foreach ($this->activePhpRectors as $activePhpRector) {
+            $this->visitors = [$activePhpRector];
+
+            // call parent::traverse() on loop to ensure
+            // stopTraversal always reset to false before run on next Rector rule
+            $nodes = parent::traverse($nodes);
+        }
+
+        return $nodes;
     }
 
     /**
@@ -48,9 +61,7 @@ private function prepareNodeVisitors(): void
 
         // filer out by version
         $activePhpRectors = $this->phpVersionedFilter->filter($this->phpRectors);
-        $this->visitors = $this->visitors === []
-            ? $activePhpRectors
-            : array_merge($this->visitors, $activePhpRectors);
+        $this->activePhpRectors = array_merge($this->visitors, $activePhpRectors);
 
         $this->areNodeVisitorsPrepared = true;
     }

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -19,7 +19,6 @@
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
-use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Core\Application\ChangedNodeScopeRefresher;
 use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\Core\Console\Output\RectorOutputStyle;
@@ -104,8 +103,6 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
 
     private FilePathHelper $filePathHelper;
 
-    private DocBlockUpdater $docBlockUpdater;
-
     private NodeConnectingTraverser $nodeConnectingTraverser;
 
     private ?string $toBeRemovedNodeHash = null;
@@ -130,7 +127,6 @@ public function autowire(
         ChangedNodeScopeRefresher $changedNodeScopeRefresher,
         RectorOutputStyle $rectorOutputStyle,
         FilePathHelper $filePathHelper,
-        DocBlockUpdater $docBlockUpdater,
         NodeConnectingTraverser $nodeConnectingTraverser
     ): void {
         $this->nodeNameResolver = $nodeNameResolver;
@@ -151,7 +147,6 @@ public function autowire(
         $this->changedNodeScopeRefresher = $changedNodeScopeRefresher;
         $this->rectorOutputStyle = $rectorOutputStyle;
         $this->filePathHelper = $filePathHelper;
-        $this->docBlockUpdater = $docBlockUpdater;
         $this->nodeConnectingTraverser = $nodeConnectingTraverser;
     }
 
@@ -392,12 +387,6 @@ private function refreshScopeNodes(array | Node $node, string $filePath, ?Mutati
         $nodes = $node instanceof Node ? [$node] : $node;
 
         foreach ($nodes as $node) {
-            /**
-             * Early refresh Doc Comment of Node before refresh Scope to ensure doc node is latest update
-             * to make PHPStan type can be correctly detected
-             */
-            $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
-
             $this->changedNodeScopeRefresher->refresh($node, $mutatingScope, $filePath);
         }
     }

diff --git a/tests/Issues/DowngradeNewInArrayInitializerPromotion/Fixture/new_in_array.php.inc b/tests/Issues/DowngradeNewInArrayInitializerPromotion/Fixture/new_in_array.php.inc
@@ -33,12 +33,12 @@ class NewInArray
     /**
      * @param array<string, object> $property
      */
-    public function __construct(array $property = null)
+    public function __construct(?array $property = null)
     {
-        $property ??= [
+        $this->property = $property;
+        $this->property = $property ?? [
             'a' => new stdClass()
         ];
-        $this->property = $property;
     }
 }