Updated Rector to commit 7891d874ac7cc0f7b3a0dc2dc128085f9038bfa9

TomasVotruba · TomasVotruba · commit cffe29bfca82 · 2026-01-13T14:18:30.000Z
rectorphp/rector-src@7891d87 Manage named arguments when replacing a value (#7784)
diff --git a/rules/Arguments/ArgumentDefaultValueReplacer.php b/rules/Arguments/ArgumentDefaultValueReplacer.php
@@ -11,9 +11,12 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Arguments\Contract\ReplaceArgumentDefaultValueInterface;
 use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue;
+use Rector\NodeAnalyzer\ArgsAnalyzer;
+use Rector\PhpParser\AstResolver;
 use Rector\PhpParser\Node\NodeFactory;
 use Rector\PhpParser\Node\Value\ValueResolver;
 final class ArgumentDefaultValueReplacer
@@ -26,10 +29,20 @@ final class ArgumentDefaultValueReplacer
      * @readonly
      */
     private ValueResolver $valueResolver;
-    public function __construct(NodeFactory $nodeFactory, ValueResolver $valueResolver)
+    /**
+     * @readonly
+     */
+    private ArgsAnalyzer $argsAnalyzer;
+    /**
+     * @readonly
+     */
+    private AstResolver $astResolver;
+    public function __construct(NodeFactory $nodeFactory, ValueResolver $valueResolver, ArgsAnalyzer $argsAnalyzer, AstResolver $astResolver)
     {
         $this->nodeFactory = $nodeFactory;
         $this->valueResolver = $valueResolver;
+        $this->argsAnalyzer = $argsAnalyzer;
+        $this->astResolver = $astResolver;
     }
     /**
      * @template TCall as (MethodCall|StaticCall|ClassMethod|FuncCall|New_)
@@ -45,9 +58,6 @@ public function processReplaces($node, ReplaceArgumentDefaultValueInterface $rep
             }
             return $this->processParams($node, $replaceArgumentDefaultValue);
         }
-        if (!isset($node->args[$replaceArgumentDefaultValue->getPosition()])) {
-            return null;
-        }
         return $this->processArgs($node, $replaceArgumentDefaultValue);
     }
     /**
@@ -89,13 +99,47 @@ private function processArgs($expr, ReplaceArgumentDefaultValueInterface $replac
             return null;
         }
         $position = $replaceArgumentDefaultValue->getPosition();
-        $particularArg = $expr->getArgs()[$position] ?? null;
+        $arguments = $expr->getArgs();
+        $firstNamedArgPosition = $this->argsAnalyzer->resolveFirstNamedArgPosition($arguments);
+        // if the call has named argyments and we want to replace an array of values
+        // we cannot replace it as we cannot really match this array of values to
+        // the existing arguments, it would be too complex
+        if ($firstNamedArgPosition !== null && is_array($replaceArgumentDefaultValue->getValueBefore())) {
+            return null;
+        }
+        // if the call has named arguments and the argument that we want to replace is not
+        // before any named argument, we need to check if it is in the list of named arguments
+        // 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) {
+                return null;
+            }
+            $paramName = null;
+            $variable = $call->params[$position]->var;
+            if ($variable instanceof Variable) {
+                $paramName = $variable->name;
+            }
+            $newPosition = -1;
+            if (is_string($paramName)) {
+                $newPosition = $this->argsAnalyzer->resolveArgPosition($arguments, $paramName, $newPosition);
+            }
+            if ($newPosition === -1) {
+                return null;
+            }
+            $position = $newPosition;
+        }
+        if (!isset($arguments[$position])) {
+            return null;
+        }
+        $particularArg = $arguments[$position] ?? null;
         if (!$particularArg instanceof Arg) {
             return null;
         }
         $argValue = $this->valueResolver->getValue($particularArg->value);
         if (is_scalar($replaceArgumentDefaultValue->getValueBefore()) && $argValue === $replaceArgumentDefaultValue->getValueBefore()) {
-            $expr->args[$position] = $this->normalizeValueToArgument($replaceArgumentDefaultValue->getValueAfter());
+            $particularArg->value = $this->normalizeValue($replaceArgumentDefaultValue->getValueAfter());
             return $expr;
         }
         if (is_array($replaceArgumentDefaultValue->getValueBefore())) {
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '936a5e4c3b04a0c1d1ec2ffbd7536616508880de';
+    public const PACKAGE_VERSION = '7891d874ac7cc0f7b3a0dc2dc128085f9038bfa9';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-13 15:13:06';
+    public const RELEASE_DATE = '2026-01-13 15:14:53';
     /**
      * @var int
      */
