Skip to content

Move beforeTraverse() to global Node since beforeTraverse() not overrideable #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterfox merged 3 commits into from
Dec 9, 2025
Merged

Move beforeTraverse() to global Node since beforeTraverse() not overrideable #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdf4677
Move beforeTraverse() to global Node since beforeTraverse() not overr…
samsonasik Dec 7, 2025
9cc30cf
bump to rector ^2.2.13
samsonasik Dec 9, 2025
c1e50cc
Fix code compatible
samsonasik Dec 9, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Rector upgrades rules for Laravel Framework",
"require": {
"php": ">=8.3",
"rector/rector": "^2.2.7",
"rector/rector": "^2.2.13",
"webmozart/assert": "^1.11",
"symplify/rule-doc-generator-contracts": "^11.2"
},
Expand Down
5 changes: 2 additions & 3 deletions src/NodeAnalyzer/ExpectedClassMethodAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
final readonly class ExpectedClassMethodAnalyzer
{
public function __construct(
private SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
private NodeNameResolver $nodeNameResolver,
private NodeTypeResolver $nodeTypeResolver,
) {}
Expand All @@ -31,7 +30,7 @@ public function findExpectedJobCallsWithClassMethod(ClassMethod $classMethod): ?
$notExpectedMethodCalls = [];
$reasonsToNotContinue = false;

$this->simpleCallableNodeTraverser->traverseNodesWithCallable($classMethod, function (Node $node) use (
SimpleCallableNodeTraverser::traverseNodesWithCallable($classMethod, function (Node $node) use (
&$expectedMethodCalls,
&$notExpectedMethodCalls,
&$reasonsToNotContinue,
Expand Down Expand Up @@ -87,7 +86,7 @@ public function findExpectedEventCallsWithClassMethod(ClassMethod $classMethod):
$notExpectedMethodCalls = [];
$reasonsToNotContinue = false;

$this->simpleCallableNodeTraverser->traverseNodesWithCallable($classMethod, function (Node $node) use (
SimpleCallableNodeTraverser::traverseNodesWithCallable($classMethod, function (Node $node) use (
&$expectedMethodCalls,
&$notExpectedMethodCalls,
&$reasonsToNotContinue,
Expand Down
5 changes: 2 additions & 3 deletions src/NodeFactory/ModelFactoryNodeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function __construct(
private NodeNameResolver $nodeNameResolver,
private NodeFactory $nodeFactory,
private ValueResolver $valueResolver,
private SimpleCallableNodeTraverser $simpleCallableNodeTraverser
) {}

public function createEmptyFactory(string $name, Expr $expr): Class_
Expand Down Expand Up @@ -116,7 +115,7 @@ public function createEmptyConfigure(): ClassMethod

public function appendConfigure(ClassMethod $classMethod, string $name, Closure|ArrowFunction $callable): void
{
$this->simpleCallableNodeTraverser->traverseNodesWithCallable(
SimpleCallableNodeTraverser::traverseNodesWithCallable(
(array) $classMethod->stmts,
function (Node $node) use ($callable, $name): ?Return_ {
if (! $node instanceof Return_) {
Expand Down Expand Up @@ -145,7 +144,7 @@ function (Node $node) use ($callable, $name): ?Return_ {
*/
private function fakerVariableToPropertyFetch(array $stmts, Param $param): void
{
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($stmts, function (Node $node) use (
SimpleCallableNodeTraverser::traverseNodesWithCallable($stmts, function (Node $node) use (
$param
): ?PropertyFetch {
if (! $node instanceof Variable) {
Expand Down
64 changes: 27 additions & 37 deletions src/Rector/ArrayDimFetch/RequestVariablesToRequestFacadeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace RectorLaravel\Rector\ArrayDimFetch;

use Override;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
Expand All @@ -13,6 +12,8 @@
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar;
use PhpParser\Node\Scalar\String_;
use PHPStan\Analyser\Scope;
use Rector\NodeTypeResolver\Node\AttributeKey;
use RectorLaravel\AbstractRector;
use RectorLaravel\ValueObject\ReplaceRequestKeyAndMethodValue;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand Down Expand Up @@ -58,44 +59,39 @@ public function getRuleDefinition(): RuleDefinition
);
}

#[Override]
public function beforeTraverse(array $nodes): array
public function getNodeTypes(): array
{
return [Node::class, ArrayDimFetch::class, Variable::class, Isset_::class];
}

public function refactor(Node $node): StaticCall|NotIdentical|null
{
parent::beforeTraverse($nodes);
if (! $node instanceof ArrayDimFetch && ! $node instanceof Variable && ! $node instanceof Isset_) {
$scope = $node->getAttribute(AttributeKey::SCOPE);
if ($scope instanceof Scope && $scope->isInFirstLevelStatement()) {
$this->traverseNodesWithCallable($node, function (Node $subNode) {
if ($subNode instanceof ArrayDimFetch) {

$this->traverseNodesWithCallable($nodes, function (Node $node) {
if ($node instanceof ArrayDimFetch) {
if ($subNode->dim instanceof Scalar) {
return null;
}

if ($node->dim instanceof Scalar) {
return null;
}
$this->traverseNodesWithCallable($subNode, function (Node $subSubNode) {
if ($subSubNode instanceof Variable) {
$subSubNode->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_SCALAR, true);

$this->traverseNodesWithCallable($node, function (Node $subNode) {
if ($subNode instanceof Variable) {
$subNode->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_SCALAR, true);
return $subSubNode;
}

return $subNode;
return null;
});
}

return null;
});
}
});

return $nodes;
}

public function getNodeTypes(): array
{
return [ArrayDimFetch::class, Variable::class, Isset_::class];
}
return null;
}

/**
* @param ArrayDimFetch|Variable $node
* @return StaticCall|NotIdentical|1|null
*/
public function refactor(Node $node): StaticCall|NotIdentical|int|null
{
if ($node instanceof Variable) {
if ($node->getAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_SCALAR) === true) {
return null;
Expand All @@ -121,10 +117,7 @@ public function refactor(Node $node): StaticCall|NotIdentical|int|null
return $replaceValue;
}

/**
* @return ReplaceRequestKeyAndMethodValue|1|null
*/
public function findAllKeys(ArrayDimFetch $arrayDimFetch): ReplaceRequestKeyAndMethodValue|int|null
public function findAllKeys(ArrayDimFetch $arrayDimFetch): ?ReplaceRequestKeyAndMethodValue
{
if (! $arrayDimFetch->dim instanceof Scalar) {
return null;
Expand Down Expand Up @@ -177,10 +170,7 @@ private function getGetterMethodName(Variable $variable): ?string
};
}

/**
* @return StaticCall|NotIdentical|1|null
*/
private function processIsset(Isset_ $isset): StaticCall|NotIdentical|int|null
private function processIsset(Isset_ $isset): StaticCall|NotIdentical|null
{
if (count($isset->vars) < 1) {
return null;
Expand Down
47 changes: 22 additions & 25 deletions src/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace RectorLaravel\Rector\ArrayDimFetch;

use Override;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
Expand All @@ -12,6 +11,8 @@
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Scalar\InterpolatedString;
use PhpParser\Node\Stmt\Unset_;
use PHPStan\Analyser\Scope;
use Rector\NodeTypeResolver\Node\AttributeKey;
use RectorLaravel\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand Down Expand Up @@ -40,41 +41,37 @@ public function getRuleDefinition(): RuleDefinition

public function getNodeTypes(): array
{
return [ArrayDimFetch::class];
return [Node::class, ArrayDimFetch::class];
}

#[Override]
public function beforeTraverse(array $nodes): array
public function refactor(Node $node): ?StaticCall
{
parent::beforeTraverse($nodes);

$this->traverseNodesWithCallable($nodes, function (Node $node) {
if (in_array($node::class, [Assign::class, Isset_::class, Unset_::class, InterpolatedString::class], true)
&& (! $node instanceof Assign || $node->var instanceof ArrayDimFetch && $this->isName($node->var->var, '_SERVER'))) {
if (! $node instanceof ArrayDimFetch) {
$scope = $node->getAttribute(AttributeKey::SCOPE);
if ($scope instanceof Scope && $scope->isInFirstLevelStatement()) {
$this->traverseNodesWithCallable($node, function (Node $subNode) {
if (! $subNode instanceof ArrayDimFetch) {
return null;
}
if (in_array($subNode::class, [Assign::class, Isset_::class, Unset_::class, InterpolatedString::class], true)
&& (! $subNode instanceof Assign || $subNode->var instanceof ArrayDimFetch && $this->isName($subNode->var->var, '_SERVER'))) {
$this->traverseNodesWithCallable($subNode, function (Node $subSubNode) {
if (! $subSubNode instanceof ArrayDimFetch) {
return null;
}

$subNode->setAttribute(self::IS_IN_SERVER_VARIABLE, true);
$subSubNode->setAttribute(self::IS_IN_SERVER_VARIABLE, true);

return $subNode;
});
return $subSubNode;
});

return $subNode;
}

return $node;
return null;
});
}

return null;
});

return $nodes;
}
}

/**
* @param ArrayDimFetch $node
*/
public function refactor(Node $node): ?StaticCall
{
if (! $this->isName($node->var, '_SERVER')) {
return null;
}
Expand Down
65 changes: 33 additions & 32 deletions src/Rector/ArrayDimFetch/SessionVariableToSessionFacadeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace RectorLaravel\Rector\ArrayDimFetch;

use Override;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
Expand All @@ -14,6 +13,8 @@
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Unset_;
use PHPStan\Analyser\Scope;
use Rector\NodeTypeResolver\Node\AttributeKey;
use RectorLaravel\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand Down Expand Up @@ -56,40 +57,10 @@ public function getRuleDefinition(): RuleDefinition
);
}

#[Override]
public function beforeTraverse(array $nodes): array
{
parent::beforeTraverse($nodes);

$this->traverseNodesWithCallable($nodes, function (Node $node) {
if (! $node instanceof ArrayDimFetch) {
return null;
}

if (! $node->dim instanceof Expr) {
$node->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_EXPR, true);
$this->traverseNodesWithCallable($node, function (Node $subNode) {
if (! $subNode instanceof Variable) {
return null;
}

$subNode->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_EXPR, true);

return $subNode;
});

return $node;
}

return null;
});

return $nodes;
}

public function getNodeTypes(): array
{
return [
Node::class,
Isset_::class,
Unset_::class,
ArrayDimFetch::class,
Expand All @@ -104,6 +75,36 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): StaticCall|Expression|null
{
$scope = $node->getAttribute(AttributeKey::SCOPE);
if ($scope instanceof Scope && $scope->isInFirstLevelStatement()) {
$this->traverseNodesWithCallable($node, function (Node $subNode) {
if (! $subNode instanceof ArrayDimFetch) {
return null;
}

if (! $subNode->dim instanceof Expr) {
$subNode->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_EXPR, true);
$this->traverseNodesWithCallable($subNode, function (Node $subSubNode) {
if (! $subSubNode instanceof Variable) {
return null;
}

$subSubNode->setAttribute(self::IS_INSIDE_ARRAY_DIM_FETCH_WITH_DIM_NOT_EXPR, true);

return $subSubNode;
});

return $subNode;
}

return null;
});
}

if (! $node instanceof Isset_ && ! $node instanceof Unset_ && ! $node instanceof ArrayDimFetch && ! $node instanceof Assign && ! $node instanceof FuncCall && ! $node instanceof Variable) {
return null;
}

if ($node instanceof ArrayDimFetch) {
return $this->processDimFetch($node);
}
Expand Down
Loading