Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,7 @@ parameters:
-
identifier: offsetAccess.nonArray
path: src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php
-
message: '#Property PhpParser\\Node\\Stmt\\ClassMethod\:\:\$stmts \(array<PhpParser\\Node\\Stmt>\|null\) does not accept array<PhpParser\\Node>#'
path: scripts/create-immutable-node-visitor.php

-
message: '#Property Rector\\PhpParser\\NodeTraverser\\AbstractImmutableNodeTraverser\:\:\$visitors \(list<PhpParser\\NodeVisitor>\) does not accept array<int\|string, PhpParser\\NodeVisitor>#'
path: src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php
Expand Down
263 changes: 0 additions & 263 deletions scripts/create-immutable-node-visitor.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,9 @@ public function __construct(NodeVisitor ...$visitors)
$this->visitors = $visitors;
}

/**
* Adds a visitor.
*
* @param NodeVisitor $visitor Visitor to add
*/
public function addVisitor(NodeVisitor $visitor): void
{
$this->visitors[] = $visitor;
throw new ShouldNotHappenException('The immutable node traverser does not support adding visitors.');
}

public function removeVisitor(NodeVisitor $visitor): void
Expand Down
7 changes: 7 additions & 0 deletions src/PhpParser/NodeTraverser/RectorNodeTraverser.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\PhpParser\Node\FileNode;
use Rector\VersionBonding\PhpVersionedFilter;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\PhpParser\NodeTraverser\RectorNodeTraverserTest
Expand Down Expand Up @@ -50,14 +51,20 @@ public function traverse(array $nodes): array
/**
* @param RectorInterface[] $rectors
* @api used in tests to update the active rules
*
* @internal Used only in Rector core, not supported outside. Might change any time.
*/
public function refreshPhpRectors(array $rectors): void
{
Assert::allIsInstanceOf($rectors, RectorInterface::class);

$this->rectors = $rectors;
$this->visitors = [];
$this->visitorsPerNodeClass = [];

$this->areNodeVisitorsPrepared = false;

$this->prepareNodeVisitors();
}

/**
Expand Down
14 changes: 9 additions & 5 deletions tests/PhpParser/NodeTraverser/RectorNodeTraverserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function testGetVisitorsForNodeWhenNoVisitorsAvailable(): void
public function testGetVisitorsForNodeWhenNoVisitorsMatch(): void
{
$class = new Class_('test');
$this->rectorNodeTraverser->addVisitor($this->ruleUsingFunctionRector);
$this->rectorNodeTraverser->refreshPhpRectors([$this->ruleUsingFunctionRector]);

$visitors = $this->rectorNodeTraverser->getVisitorsForNode($class);

Expand All @@ -58,8 +58,10 @@ public function testGetVisitorsForNodeWhenNoVisitorsMatch(): void
public function testGetVisitorsForNodeWhenSomeVisitorsMatch(): void
{
$class = new Class_('test');
$this->rectorNodeTraverser->addVisitor($this->ruleUsingFunctionRector);
$this->rectorNodeTraverser->addVisitor($this->ruleUsingClassRector);
$this->rectorNodeTraverser->refreshPhpRectors([
$this->ruleUsingFunctionRector,
$this->ruleUsingClassRector,
]);

$visitors = $this->rectorNodeTraverser->getVisitorsForNode($class);

Expand All @@ -69,8 +71,10 @@ public function testGetVisitorsForNodeWhenSomeVisitorsMatch(): void
public function testGetVisitorsForNodeWhenAllVisitorsMatch(): void
{
$class = new Class_('test');
$this->rectorNodeTraverser->addVisitor($this->ruleUsingClassRector);
$this->rectorNodeTraverser->addVisitor($this->ruleUsingClassLikeRector);
$this->rectorNodeTraverser->refreshPhpRectors([
$this->ruleUsingClassRector,
$this->ruleUsingClassLikeRector,
]);

$visitors = $this->rectorNodeTraverser->getVisitorsForNode($class);

Expand Down