Skip to content

[perf] Drop AstResolver from named-arg position resolution #8099

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
TomasVotruba merged 1 commit into from
Jun 28, 2026
+28 −24
Merged

[perf] Drop AstResolver from named-arg position resolution #8099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions rules/Arguments/ArgumentDefaultValueReplacer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\FunctionReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use Rector\Arguments\Contract\ReplaceArgumentDefaultValueInterface;
use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue;
use Rector\NodeAnalyzer\ArgsAnalyzer;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\PhpParser\AstResolver;
use Rector\PhpParser\Node\NodeFactory;
use Rector\PhpParser\Node\Value\ValueResolver;
use Rector\Reflection\ReflectionResolver;
Expand All @@ -33,7 +34,6 @@ public function __construct(
private NodeFactory $nodeFactory,
private ValueResolver $valueResolver,
private ArgsAnalyzer $argsAnalyzer,
private AstResolver $astResolver,
private NodeTypeResolver $nodeTypeResolver,
private ReflectionResolver $reflectionResolver
) {
Expand Down Expand Up @@ -125,20 +125,21 @@ private function processArgs(
// if it is, we use the position of the named argyment as the position to replace
// if it is not, we cannot replace it
if ($firstNamedArgPosition !== null && $position >= $firstNamedArgPosition) {
$call = $this->astResolver->resolveClassMethodOrFunctionFromCall($expr);
if ($call === null) {
$reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($expr);
if (! $reflection instanceof MethodReflection && ! $reflection instanceof FunctionReflection) {
return null;
}

$paramName = null;
$variable = $call->params[$position]->var;
if ($variable instanceof Variable) {
$paramName = $variable->name;
}
$parametersAcceptor = ParametersAcceptorSelector::combineAcceptors($reflection->getVariants());
$parameterReflection = $parametersAcceptor->getParameters()[$position] ?? null;

$newPosition = -1;
if (is_string($paramName)) {
$newPosition = $this->argsAnalyzer->resolveArgPosition($arguments, $paramName, $newPosition);
if ($parameterReflection !== null) {
$newPosition = $this->argsAnalyzer->resolveArgPosition(
$arguments,
$parameterReflection->getName(),
$newPosition
);
}

if ($newPosition === -1) {
Expand Down
27 changes: 15 additions & 12 deletions rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PHPStan\Reflection\FunctionReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use Rector\Arguments\ValueObject\RemoveMethodCallParam;
use Rector\Contract\Rector\ConfigurableRectorInterface;
use Rector\NodeAnalyzer\ArgsAnalyzer;
use Rector\PhpParser\AstResolver;
use Rector\Rector\AbstractRector;
use Rector\Reflection\ReflectionResolver;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;
Expand All @@ -29,7 +31,7 @@ final class RemoveMethodCallParamRector extends AbstractRector implements Config
private array $removeMethodCallParams = [];

public function __construct(
private readonly AstResolver $astResolver,
private readonly ReflectionResolver $reflectionResolver,
private readonly ArgsAnalyzer $argsAnalyzer,
) {
}
Expand Down Expand Up @@ -100,20 +102,21 @@ public function refactor(Node $node): ?Node
// if it is, we use the position of the named argument as the position to remove
// if it is not, we cannot remove it
if ($firstNamedArgPosition !== null && $position >= $firstNamedArgPosition) {
$call = $this->astResolver->resolveClassMethodOrFunctionFromCall($node);
if ($call === null) {
$reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($node);
if (! $reflection instanceof MethodReflection && ! $reflection instanceof FunctionReflection) {
return null;
}

$paramName = null;
$variable = $call->params[$position]->var;
if ($variable instanceof Variable) {
$paramName = $variable->name;
}
$parametersAcceptor = ParametersAcceptorSelector::combineAcceptors($reflection->getVariants());
$parameterReflection = $parametersAcceptor->getParameters()[$position] ?? null;

$newPosition = -1;
if (is_string($paramName)) {
$newPosition = $this->argsAnalyzer->resolveArgPosition($args, $paramName, $newPosition);
if ($parameterReflection !== null) {
$newPosition = $this->argsAnalyzer->resolveArgPosition(
$args,
$parameterReflection->getName(),
$newPosition
);
}

if ($newPosition === -1) {
Expand Down
Loading