Skip to content

Remove NodeVisitor::DONT_TRAVERSE_* on ServerVariableToRequestFacadeRector (part 3) #439

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 3, 2025
Merged

Remove NodeVisitor::DONT_TRAVERSE_* on ServerVariableToRequestFacadeRector (part 3) #439

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2745013
Remove NodeVisitor::DONT_TRAVERSE_* on ServerVariableToRequestFacadeR…
samsonasik Dec 3, 2025
36952c4
clean up set attribute
samsonasik Dec 3, 2025
99ff5d6
clean up set node definiton
samsonasik Dec 3, 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
50 changes: 35 additions & 15 deletions src/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace RectorLaravel\Rector\ArrayDimFetch;

use Override;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
Expand All @@ -11,7 +12,6 @@
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Scalar\InterpolatedString;
use PhpParser\Node\Stmt\Unset_;
use PhpParser\NodeVisitor;
use RectorLaravel\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand All @@ -21,6 +21,8 @@
*/
class ServerVariableToRequestFacadeRector extends AbstractRector
{
private const string IS_IN_SERVER_VARIABLE = 'is_in_server_variable';

public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
Expand All @@ -38,27 +40,41 @@ public function getRuleDefinition(): RuleDefinition

public function getNodeTypes(): array
{
return [Assign::class, Isset_::class, Unset_::class, InterpolatedString::class, ArrayDimFetch::class];
return [ArrayDimFetch::class];
}

/**
* @param ArrayDimFetch|Assign|Isset_|Unset_|InterpolatedString $node
* @return StaticCall|NodeVisitor::DONT_TRAVERSE_CHILDREN|null
*/
public function refactor(Node $node): StaticCall|int|null
#[Override]
public function beforeTraverse(array $nodes): array
{
if (! $node instanceof ArrayDimFetch) {
if (! $node instanceof Assign) {
return NodeVisitor::DONT_TRAVERSE_CHILDREN;
}
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'))) {
$this->traverseNodesWithCallable($node, function (Node $subNode) {
if (! $subNode instanceof ArrayDimFetch) {
return null;
}

if (! $node->var instanceof ArrayDimFetch || ! $this->isName($node->var->var, '_SERVER')) {
return null;
$subNode->setAttribute(self::IS_IN_SERVER_VARIABLE, true);

return $subNode;
});

return $node;
}

return NodeVisitor::DONT_TRAVERSE_CHILDREN;
}
return null;
});

return $nodes;
}

/**
* @param ArrayDimFetch $node
*/
public function refactor(Node $node): ?StaticCall
{
if (! $this->isName($node->var, '_SERVER')) {
return null;
}
Expand All @@ -67,6 +83,10 @@ public function refactor(Node $node): StaticCall|int|null
return null;
}

if ($node->getAttribute(self::IS_IN_SERVER_VARIABLE) === true) {
return null;
}

return $this->nodeFactory->createStaticCall('Illuminate\Support\Facades\Request', 'server', [
new Arg($node->dim),
]);
Expand Down