refactor: improve ArgumentAdderRector to intelligently handle named arguments

- Check if parameter is already present as named argument before adding
- When named arguments exist, add new parameter as named argument at end
- Add comprehensive test fixtures for named argument scenarios

Author: carlos-granados

rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/named_arg_add_new.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;
+
+use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;
+
+class NamedArgAddNew
+{
+    public function run()
+    {
+        $obj = new SomeMultiArg();
+        // Named arguments exist, but not the one we're adding (c)
+        $obj->run(b: 5);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;
+
+use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;
+
+class NamedArgAddNew
+{
+    public function run()
+    {
+        $obj = new SomeMultiArg();
+        // Named arguments exist, but not the one we're adding (c)
+        $obj->run(b: 5, c: 4);
+    }
+}
+
+?>

rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/named_arg_mixed_positional_named.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;
+
+use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;
+
+class NamedArgMixedPositionalNamed
+{
+    public function run()
+    {
+        $obj = new SomeMultiArg();
+        // Mix of positional and named arguments
+        $obj->run(0, c: 6);
+        $obj->run(0, b: 6);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;
+
+use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;
+
+class NamedArgMixedPositionalNamed
+{
+    public function run()
+    {
+        $obj = new SomeMultiArg();
+        // Mix of positional and named arguments
+        $obj->run(0, c: 6);
+        $obj->run(0, b: 6, c: 4);
+    }
+}
+
+?>

…tor/Fixture/skip_named_arguments.php.inc …e/skip_named_arg_already_present.php.incrules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/skip_named_arguments.php.inc renamed to rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/skip_named_arg_already_present.php.inc rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/skip_named_arguments.php.inc renamed to rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/Fixture/skip_named_arg_already_present.php.inc

@@ -4,14 +4,13 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;
 
 use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;
 
-class SkipNamedArguments
+class SkipNamedArgAlreadyPresent
 {
     public function run()
     {
         $obj = new SomeMultiArg();
-        $obj->run(b: 5);
-        $obj->run(c: 4);
-        $obj->run(0, 1, c: 6);
+        // Parameter 'c' is already provided as named argument
+        $obj->run(b: 5, c: 999);
+        $obj->run(c: 999, b: 5);
     }
 }
-

rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php

@@ -11,6 +11,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_;
@@ -183,13 +184,18 @@ private function processMethodCall(
 
         $defaultValue = $argumentAdder->getArgumentDefaultValue();
         $arg = new Arg(BuilderHelpers::normalizeValue($defaultValue));
-        if (isset($methodCall->args[$position])) {
-            return;
-        }
 
-        $this->fillGapBetweenWithDefaultValue($methodCall, $position);
+        if ($this->argsAnalyzer->hasNamedArg($methodCall->getArgs())) {
+            $argumentName = $argumentAdder->getArgumentName();
+            if ($argumentName === null) {
+                return;
+            }
+            $arg->name = new Identifier($argumentName);
+        } else {
+            $this->fillGapBetweenWithDefaultValue($methodCall, $position);
+        }
 
-        $methodCall->args[$position] = $arg;
+        $methodCall->args[] = $arg;
         $this->hasChanged = true;
     }
 
@@ -251,12 +257,18 @@ private function shouldSkipParameter(
             return $this->changedArgumentsDetector->isTypeChanged($param, $argumentAdder->getArgumentType());
         }
 
+        // If named arguments exist
         if ($this->argsAnalyzer->hasNamedArg($node->getArgs())) {
-            return true;
-        }
-
-        if (isset($node->args[$position])) {
-            return true;
+            // Check if the parameter we're trying to add is already present as a named argument
+            foreach ($node->getArgs() as $arg) {
+                if ($arg->name instanceof Identifier && $this->isName($arg->name, $argumentName)) {
+                    return true; // Skip - parameter already provided with name
+                }
+            }
+        } else {
+            if (isset($node->args[$position])) {
+                return true;
+            }
         }
 
         // Check if default value is the same
@@ -339,6 +351,16 @@ private function processStaticCall(
             return;
         }
 
+        // Handle named arguments case - add as named argument at the end
+        if ($this->argsAnalyzer->hasNamedArg($staticCall->getArgs())) {
+            $arg = new Arg(new Variable($argumentName));
+            $arg->name = new Identifier($argumentName);
+            $staticCall->args[] = $arg;
+            $this->hasChanged = true;
+            return;
+        }
+
+        // Original positional logic
         $this->fillGapBetweenWithDefaultValue($staticCall, $position);
 
         $staticCall->args[$position] = new Arg(new Variable($argumentName));