Remove CurrentRectorProvider and used for docblock changes report, re…

…turn bool value and node directly in the rector rule instead (#4982)
rectorphp · Sep 11, 2023 · 2e6fcde · 2e6fcde
1 parent 0bb2398
commit 2e6fcde
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 90 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -31,8 +31,6 @@
 use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\BetterPhpDocParser\ValueObject\Type\ShortenedIdentifierTypeNode;
-use Rector\ChangesReporting\Collector\RectorChangeCollector;
-use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
@@ -64,8 +62,6 @@ public function __construct(
         private readonly StaticTypeMapper $staticTypeMapper,
         private readonly \PhpParser\Node $node,
         private readonly AnnotationNaming $annotationNaming,
-        private readonly CurrentNodeProvider $currentNodeProvider,
-        private readonly RectorChangeCollector $rectorChangeCollector,
         private readonly PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder
     ) {
         $this->originalPhpDocNode = clone $phpDocNode;
@@ -386,11 +382,6 @@ public function getTemplateTagValueNodes(): array
     public function markAsChanged(): void
     {
         $this->hasChanged = true;
-
-        $node = $this->currentNodeProvider->getNode();
-        if ($node instanceof \PhpParser\Node) {
-            $this->rectorChangeCollector->notifyNodeFileInfo($node);
-        }
     }
 
     public function hasChanged(): bool

diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php
@@ -15,7 +15,6 @@
 use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
-use Rector\ChangesReporting\Collector\RectorChangeCollector;
 use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -34,7 +33,6 @@ public function __construct(
         private readonly BetterPhpDocParser $betterPhpDocParser,
         private readonly StaticTypeMapper $staticTypeMapper,
         private readonly AnnotationNaming $annotationNaming,
-        private readonly RectorChangeCollector $rectorChangeCollector,
         private readonly PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder
     ) {
     }
@@ -137,8 +135,6 @@ private function createFromPhpDocNode(
             $this->staticTypeMapper,
             $node,
             $this->annotationNaming,
-            $this->currentNodeProvider,
-            $this->rectorChangeCollector,
             $this->phpDocNodeByTypeFinder
         );
 

diff --git a/packages/ChangesReporting/Collector/RectorChangeCollector.php b/packages/ChangesReporting/Collector/RectorChangeCollector.php
diff --git a/packages/PostRector/Application/PostFileProcessor.php b/packages/PostRector/Application/PostFileProcessor.php
@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
-use Rector\Core\Logging\CurrentRectorProvider;
 use Rector\Core\Provider\CurrentFileProvider;
 use Rector\Core\ValueObject\Application\File;
 use Rector\PostRector\Contract\Rector\PostRectorInterface;
@@ -27,7 +26,6 @@ final class PostFileProcessor
     public function __construct(
         private readonly Skipper $skipper,
         private readonly CurrentFileProvider $currentFileProvider,
-        private readonly CurrentRectorProvider $currentRectorProvider,
         // set order here
         UseAddingPostRector $useAddingPostRector,
         NameImportingPostRector $nameImportingPostRector,
@@ -57,8 +55,6 @@ public function traverse(array $stmts): array
                 continue;
             }
 
-            $this->currentRectorProvider->changeCurrentRector($postRector);
-
             $nodeTraverser = new NodeTraverser();
             $nodeTraverser->addVisitor($postRector);
             $stmts = $nodeTraverser->traverse($stmts);

diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php
@@ -59,7 +59,6 @@
 use Rector\Core\Console\Style\SymfonyStyleFactory;
 use Rector\Core\Contract\DependencyInjection\ResetableInterface;
 use Rector\Core\Contract\Rector\RectorInterface;
-use Rector\Core\Logging\CurrentRectorProvider;
 use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
@@ -504,7 +503,6 @@ static function (AbstractRector $rector, Container $container): void {
                     $container->make(NodeFactory::class),
                     $container->make(PhpDocInfoFactory::class),
                     $container->make(StaticTypeMapper::class),
-                    $container->make(CurrentRectorProvider::class),
                     $container->make(Skipper::class),
                     $container->make(ValueResolver::class),
                     $container->make(BetterNodeFinder::class),

diff --git a/src/Logging/CurrentRectorProvider.php b/src/Logging/CurrentRectorProvider.php
diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -17,7 +17,6 @@
 use Rector\Core\Application\ChangedNodeScopeRefresher;
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
-use Rector\Core\Logging\CurrentRectorProvider;
 use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
@@ -71,8 +70,6 @@ abstract class AbstractRector extends NodeVisitorAbstract implements RectorInter
 
     private SimpleCallableNodeTraverser $simpleCallableNodeTraverser;
 
-    private CurrentRectorProvider $currentRectorProvider;
-
     private Skipper $skipper;
 
     private CurrentFileProvider $currentFileProvider;
@@ -93,7 +90,6 @@ public function autowire(
         NodeFactory $nodeFactory,
         PhpDocInfoFactory $phpDocInfoFactory,
         StaticTypeMapper $staticTypeMapper,
-        CurrentRectorProvider $currentRectorProvider,
         Skipper $skipper,
         ValueResolver $valueResolver,
         BetterNodeFinder $betterNodeFinder,
@@ -108,7 +104,6 @@ public function autowire(
         $this->nodeFactory = $nodeFactory;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->staticTypeMapper = $staticTypeMapper;
-        $this->currentRectorProvider = $currentRectorProvider;
         $this->skipper = $skipper;
         $this->valueResolver = $valueResolver;
         $this->betterNodeFinder = $betterNodeFinder;
@@ -147,7 +142,6 @@ final public function enterNode(Node $node): int|Node|null
             return null;
         }
 
-        $this->currentRectorProvider->changeCurrentRector($this);
         $this->changedNodeScopeRefresher->reIndexNodeAttributes($node);
 
         // ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN