Call nodeCallback with original argument with a name after reordering

Author: ondrejmirtes

src/Analyser/ArgumentsNormalizer.php

@@ -21,6 +21,8 @@
 final class ArgumentsNormalizer
 {
 
+	public const ORIGINAL_ARG_ATTRIBUTE = 'originalArg';
+
 	public static function reorderFuncArguments(
 		ParametersAcceptor $parametersAcceptor,
 		FuncCall $functionCall,
@@ -131,11 +133,13 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 			} elseif (array_key_exists($arg->name->toString(), $argumentPositions)) {
 				$argName = $arg->name->toString();
 				// order named args into the position the signature expects them
+				$attributes = $arg->getAttributes();
+				$attributes[self::ORIGINAL_ARG_ATTRIBUTE] = $arg;
 				$reorderedArgs[$argumentPositions[$argName]] = new Arg(
 					$arg->value,
 					$arg->byRef,
 					$arg->unpack,
-					$arg->getAttributes(),
+					$attributes,
 					null,
 				);
 			}

src/Analyser/NodeScopeResolver.php

@@ -3265,7 +3265,8 @@ private function processArgs(
 		$hasYield = false;
 		$throwPoints = [];
 		foreach ($args as $i => $arg) {
-			$nodeCallback($arg, $scope);
+			$originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg;
+			$nodeCallback($originalArg, $scope);
 			if (isset($parameters) && $parametersAcceptor !== null) {
 				$assignByReference = false;
 				if (isset($parameters[$i])) {