Fix too greedy removal of named arguments

Author: ondrejmirtes

src/Analyser/ArgumentsNormalizer.php

@@ -222,7 +222,16 @@ public static function reorderArgs(ParametersAcceptor $parametersAcceptor, array
 		foreach ($callArgs as $i => $arg) {
 			if ($arg->name === null) {
 				// add regular args as is
-				$reorderedArgs[$i] = $arg;
+
+				$attributes = $arg->getAttributes();
+				$attributes[self::ORIGINAL_ARG_ATTRIBUTE] = $arg;
+				$reorderedArgs[$i] = new Arg(
+					$arg->value,
+					$arg->byRef,
+					$arg->unpack,
+					$attributes,
+					null,
+				);
 			} elseif (array_key_exists($arg->name->toString(), $argumentPositions)) {
 				$argName = $arg->name->toString();
 				// order named args into the position the signature expects them

tests/PHPStan/Build/NamedArgumentsRuleTest.php

@@ -41,6 +41,10 @@ public function testRule(): void
 				'You\'re passing a non-default value 3 to parameter $yetAnother but previous argument is passing default value to its parameter ($another). You can skip it and use named argument for $yetAnother instead.',
 				41,
 			],
+			[
+				'Named argument $priority can be omitted, type 1 is the same as the default value.',
+				59,
+			],
 		]);
 	}
 

tests/PHPStan/Build/data/named-arguments.php

@@ -42,3 +42,22 @@ public function doBar(): void
 	}
 
 }
+
+class Baz
+{
+
+	public const HIGH = 1;
+	public const MEDIUM = 2;
+
+	public static function send(Bar $message, ?string $queueName = null, ?Bar $mode = null, int $priority = self::HIGH)
+	{
+
+	}
+
+	public function doFoo(Bar $message): void
+	{
+		self::send($message, 'queue', priority: self::HIGH);
+		self::send($message, 'queue', priority: self::MEDIUM);
+	}
+
+}

tests/PHPStan/Build/data/named-arguments.php.fixed

@@ -13,7 +13,7 @@ class Foo
 		new Exception('foo', 0, null);
 		new Exception('foo', previous: new Exception('previous'));
 		new Exception('foo', previous: new Exception('previous'));
-		new Exception(previous: new Exception('previous'));
+		new Exception('foo', previous: new Exception('previous'));
 		new Exception('foo', code: 1, previous: new Exception('previous'));
 		new Exception('foo', 1, new Exception('previous'));
 		new Exception('foo', 1);
@@ -42,3 +42,22 @@ class Bar
 	}
 
 }
+
+class Baz
+{
+
+	public const HIGH = 1;
+	public const MEDIUM = 2;
+
+	public static function send(Bar $message, ?string $queueName = null, ?Bar $mode = null, int $priority = self::HIGH)
+	{
+
+	}
+
+	public function doFoo(Bar $message): void
+	{
+		self::send($message, 'queue');
+		self::send($message, 'queue', priority: self::MEDIUM);
+	}
+
+}