Normalize array_map args in ArrayMapArgVisitor

Author: takaram

src/Parser/ArrayMapArgVisitor.php

@@ -6,7 +6,6 @@
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 use PHPStan\DependencyInjection\AutowiredService;
-use function array_splice;
 use function count;
 
 #[AutowiredService]
@@ -27,14 +26,31 @@ public function enterNode(Node $node): ?Node
 			return null;
 		}
 
-		$callbackPos = 0;
-		if ($args[1]->name !== null && $args[1]->name->name === 'callback') {
-			$callbackPos = 1;
+		$callbackArg = null;
+		$arrayArgs = [];
+		foreach ($args as $i => $arg) {
+			if ($callbackArg === null) {
+				if ($arg->name === null && $i === 0) {
+					$callbackArg = $arg;
+					continue;
+				}
+				if ($arg->name !== null && $arg->name->toString() === 'callback') {
+					$callbackArg = $arg;
+					continue;
+				}
+			}
+
+			$arrayArgs[] = $arg;
+		}
+
+		if ($callbackArg !== null) {
+			$callbackArg->value->setAttribute(self::ATTRIBUTE_NAME, $arrayArgs);
+			return new Node\Expr\FuncCall(
+				$node->name,
+				[$callbackArg, ...$arrayArgs],
+				$node->getAttributes(),
+			);
 		}
-		$callbackArg = $args[$callbackPos];
-		$arrayArgs = $args;
-		array_splice($arrayArgs, $callbackPos, 1);
-		$callbackArg->value->setAttribute(self::ATTRIBUTE_NAME, $arrayArgs);
 
 		return null;
 	}

src/Reflection/ParametersAcceptorSelector.php

@@ -80,10 +80,6 @@ public static function selectFromArgs(
 			&& count($parametersAcceptors) > 0
 		) {
 			$arrayMapArgs = $args[0]->value->getAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME);
-			if ($arrayMapArgs === null && isset($args[1])) {
-				// callback argument of array_map() may be the second one (named argument)
-				$arrayMapArgs = $args[1]->value->getAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME);
-			}
 			if ($arrayMapArgs !== null) {
 				$acceptor = $parametersAcceptors[0];
 				$parameters = $acceptor->getParameters();