Updated Rector to commit 95eeca2cfdf58f76c58dddbf9b499f9eb1fcb6b3

rectorphp/rector-src@95eeca2 Manage named arguments in ArgumentAdderRector rule (#7777)

Author: TomasVotruba

rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
@@ -23,6 +24,7 @@
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Enum\ObjectReference;
 use Rector\Exception\ShouldNotHappenException;
+use Rector\NodeAnalyzer\ArgsAnalyzer;
 use Rector\PhpParser\AstResolver;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Rector\AbstractRector;
@@ -51,17 +53,22 @@ final class ArgumentAdderRector extends AbstractRector implements ConfigurableRe
      * @readonly
      */
     private StaticTypeMapper $staticTypeMapper;
+    /**
+     * @readonly
+     */
+    private ArgsAnalyzer $argsAnalyzer;
     /**
      * @var ArgumentAdder[]|ArgumentAdderWithoutDefaultValue[]
      */
     private array $addedArguments = [];
     private bool $hasChanged = \false;
-    public function __construct(ArgumentAddingScope $argumentAddingScope, ChangedArgumentsDetector $changedArgumentsDetector, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper)
+    public function __construct(ArgumentAddingScope $argumentAddingScope, ChangedArgumentsDetector $changedArgumentsDetector, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper, ArgsAnalyzer $argsAnalyzer)
     {
         $this->argumentAddingScope = $argumentAddingScope;
         $this->changedArgumentsDetector = $changedArgumentsDetector;
         $this->astResolver = $astResolver;
         $this->staticTypeMapper = $staticTypeMapper;
+        $this->argsAnalyzer = $argsAnalyzer;
     }
     public function getRuleDefinition(): RuleDefinition
     {
@@ -164,11 +171,17 @@ private function processMethodCall(MethodCall $methodCall, $argumentAdder, int $
         }
         $defaultValue = $argumentAdder->getArgumentDefaultValue();
         $arg = new Arg(BuilderHelpers::normalizeValue($defaultValue));
-        if (isset($methodCall->args[$position])) {
-            return;
+        // if there are named argyments, we just add it at the end as a new named argument
+        if ($this->argsAnalyzer->hasNamedArg($methodCall->getArgs())) {
+            $argumentName = $argumentAdder->getArgumentName();
+            if ($argumentName === null) {
+                throw new ShouldNotHappenException();
+            }
+            $arg->name = new Identifier($argumentName);
+        } else {
+            $this->fillGapBetweenWithDefaultValue($methodCall, $position);
         }
-        $this->fillGapBetweenWithDefaultValue($methodCall, $position);
-        $methodCall->args[$position] = $arg;
+        $methodCall->args[] = $arg;
         $this->hasChanged = \true;
     }
     /**
@@ -223,7 +236,21 @@ private function shouldSkipParameter($node, $argumentAdder): bool
             // argument added and type has been changed
             return $this->changedArgumentsDetector->isTypeChanged($param, $argumentAdder->getArgumentType());
         }
-        if (isset($node->args[$position])) {
+        $arguments = $node->getArgs();
+        $firstNamedArgumentPosition = $this->argsAnalyzer->resolveFirstNamedArgPosition($arguments);
+        // If named arguments exist
+        if ($firstNamedArgumentPosition !== null) {
+            // Check if the parameter we're trying to add is before the first named argument
+            if ($position < $firstNamedArgumentPosition) {
+                return \true;
+                //if that is the case, the parameter already exists, skip
+            }
+            // Check if the parameter we're trying to add is already present as a named argument
+            if ($this->argsAnalyzer->resolveArgPosition($arguments, $argumentName, -1) !== -1) {
+                return \true;
+                // if it exists as a named argument, skip
+            }
+        } elseif (isset($node->args[$position])) {
             return \true;
         }
         // Check if default value is the same
@@ -287,8 +314,14 @@ private function processStaticCall(StaticCall $staticCall, int $position, $argum
         if (!$this->isName($staticCall->class, ObjectReference::PARENT)) {
             return;
         }
-        $this->fillGapBetweenWithDefaultValue($staticCall, $position);
-        $staticCall->args[$position] = new Arg(new Variable($argumentName));
+        // if there are named arguments, we just add it at the end as a new named argument
+        $arg = new Arg(new Variable($argumentName));
+        if ($this->argsAnalyzer->hasNamedArg($staticCall->getArgs())) {
+            $arg->name = new Identifier($argumentName);
+        } else {
+            $this->fillGapBetweenWithDefaultValue($staticCall, $position);
+        }
+        $staticCall->args[] = $arg;
         $this->hasChanged = \true;
     }
     /**

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3288dc175f3e33b0f8cba66ca849e46093e92a5a';
+    public const PACKAGE_VERSION = '95eeca2cfdf58f76c58dddbf9b499f9eb1fcb6b3';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-12-25 13:15:51';
+    public const RELEASE_DATE = '2025-12-25 13:16:25';
     /**
      * @var int
      */

src/NodeAnalyzer/ArgsAnalyzer.php

@@ -44,4 +44,18 @@ public function resolveArgPosition(array $args, string $name, int $defaultPositi
         }
         return $defaultPosition;
     }
+    /**
+     * @param Arg[] $args
+     */
+    public function resolveFirstNamedArgPosition(array $args): ?int
+    {
+        $position = 0;
+        foreach ($args as $arg) {
+            if ($arg->name instanceof Identifier) {
+                return $position;
+            }
+            ++$position;
+        }
+        return null;
+    }
 }