Updated Rector to commit 970310935d35fcb15108280c272b5e9798c69395

rectorphp/rector-src@9703109 [perf] Drop AstResolver from named-arg position resolution (#8099)

Author: TomasVotruba

rules/Arguments/ArgumentDefaultValueReplacer.php

@@ -11,16 +11,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;
@@ -39,10 +40,6 @@ final class ArgumentDefaultValueReplacer
      * @readonly
      */
     private ArgsAnalyzer $argsAnalyzer;
-    /**
-     * @readonly
-     */
-    private AstResolver $astResolver;
     /**
      * @readonly
      */
@@ -51,12 +48,11 @@ final class ArgumentDefaultValueReplacer
      * @readonly
      */
     private ReflectionResolver $reflectionResolver;
-    public function __construct(NodeFactory $nodeFactory, ValueResolver $valueResolver, ArgsAnalyzer $argsAnalyzer, AstResolver $astResolver, NodeTypeResolver $nodeTypeResolver, ReflectionResolver $reflectionResolver)
+    public function __construct(NodeFactory $nodeFactory, ValueResolver $valueResolver, ArgsAnalyzer $argsAnalyzer, NodeTypeResolver $nodeTypeResolver, ReflectionResolver $reflectionResolver)
     {
         $this->nodeFactory = $nodeFactory;
         $this->valueResolver = $valueResolver;
         $this->argsAnalyzer = $argsAnalyzer;
-        $this->astResolver = $astResolver;
         $this->nodeTypeResolver = $nodeTypeResolver;
         $this->reflectionResolver = $reflectionResolver;
     }
@@ -128,18 +124,15 @@ private function processArgs($expr, ReplaceArgumentDefaultValueInterface $replac
         // 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) {
                 return null;

rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php

@@ -6,12 +6,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 RectorPrefix202606\Webmozart\Assert\Assert;
@@ -24,7 +26,7 @@ final class RemoveMethodCallParamRector extends AbstractRector implements Config
     /**
      * @readonly
      */
-    private AstResolver $astResolver;
+    private ReflectionResolver $reflectionResolver;
     /**
      * @readonly
      */
@@ -33,9 +35,9 @@ final class RemoveMethodCallParamRector extends AbstractRector implements Config
      * @var RemoveMethodCallParam[]
      */
     private array $removeMethodCallParams = [];
-    public function __construct(AstResolver $astResolver, ArgsAnalyzer $argsAnalyzer)
+    public function __construct(ReflectionResolver $reflectionResolver, ArgsAnalyzer $argsAnalyzer)
     {
-        $this->astResolver = $astResolver;
+        $this->reflectionResolver = $reflectionResolver;
         $this->argsAnalyzer = $argsAnalyzer;
     }
     public function getRuleDefinition(): RuleDefinition
@@ -91,18 +93,15 @@ 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) {
                     return null;

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '0df45b4d4d6bb849eff6b0f1b8ac39a6088b9492';
+    public const PACKAGE_VERSION = '970310935d35fcb15108280c272b5e9798c69395';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-28 16:34:26';
+    public const RELEASE_DATE = '2026-06-28 21:10:14';
     /**
      * @var int
      */