Cover named args in ClassMethodArrayDocblockParamFromLocalCallsRector (#7357)

* named args

* cover named args in ClassMethodArrayDocblockParamFromLocalCallsRector

* add flipped fixture

Author: TomasVotruba

rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/NamedArgs/flipped_args.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture\NamedArgs;
+
+final class FlippedArgs
+{
+    public function go()
+    {
+        $this->run(names: ['John', 'Doe'], items: [123, 456]);
+    }
+
+    private function run(array $items, array $names)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture\NamedArgs;
+
+final class FlippedArgs
+{
+    public function go()
+    {
+        $this->run(names: ['John', 'Doe'], items: [123, 456]);
+    }
+
+    /**
+     * @param int[] $items
+     * @param string[] $names
+     */
+    private function run(array $items, array $names)
+    {
+    }
+}
+
+?>

rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/NamedArgs/named_arg.php.inc

@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture\NamedArgs;
+
+final class CoverMixedAndKnown
+{
+    public function go()
+    {
+        $this->run(items: ['item1', 'item2']);
+    }
+
+    private function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture\NamedArgs;
+
+final class CoverMixedAndKnown
+{
+    public function go()
+    {
+        $this->run(items: ['item1', 'item2']);
+    }
+
+    /**
+     * @param string[] $items
+     */
+    private function run(array $items)
+    {
+    }
+}
+
+?>

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -58,7 +58,7 @@ public function resolveStrictTypesFromCalls(array $calls): array
 
     /**
      * @param MethodCall[]|StaticCall[] $calls
-     * @return array<int, Type>
+     * @return array<int|string, Type>
      */
     public function resolveTypesFromCalls(array $calls): array
     {
@@ -67,7 +67,7 @@ public function resolveTypesFromCalls(array $calls): array
         foreach ($calls as $call) {
             foreach ($call->args as $position => $arg) {
                 if ($this->shouldSkipArg($arg)) {
-                    return [];
+                    continue;
                 }
 
                 /** @var Arg $arg */
@@ -76,7 +76,13 @@ public function resolveTypesFromCalls(array $calls): array
                     continue;
                 }
 
-                $staticTypesByArgumentPosition[$position][] = $this->resolveArgValueType($arg);
+                if ($arg->name instanceof Identifier) {
+                    $positionOrName = $arg->name->toString();
+                } else {
+                    $positionOrName = $position;
+                }
+
+                $staticTypesByArgumentPosition[$positionOrName][] = $this->resolveArgValueType($arg);
             }
         }
 
@@ -206,11 +212,7 @@ private function shouldSkipArg(Arg|VariadicPlaceholder $arg): bool
             return true;
         }
 
-        if ($arg->unpack) {
-            return true;
-        }
-
-        return $arg->name instanceof Identifier;
+        return $arg->unpack;
     }
 
     private function isEmptyArray(Expr $expr): bool

rules/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector.php

@@ -107,7 +107,7 @@ public function refactor(Node $node): ?Node
                     continue;
                 }
 
-                $resolvedParameterType = $classMethodParameterTypes[$parameterPosition] ?? null;
+                $resolvedParameterType = $classMethodParameterTypes[$parameterPosition] ?? $classMethodParameterTypes[$parameterName] ?? null;
                 if (! $resolvedParameterType instanceof Type) {
                     continue;
                 }