Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/AddNamedArgumentsRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ public function refactor(Node $node): ?Node
return null;
}

$this->addNamesToArgs(node: $node, parameters: $parameters);
$hasChanges = $this->addNamesToArgs(node: $node, parameters: $parameters);

if (! $hasChanges) {
return null;
}

return $node;
}
Expand All @@ -106,8 +110,9 @@ public function refactor(Node $node): ?Node
private function addNamesToArgs(
FuncCall|StaticCall|MethodCall|New_ $node,
array $parameters,
): void {
): bool {
$namedArgs = [];
$hasChanges = false;
foreach ($node->args as $index => $arg) {
$parameter = $parameters[$index] ?? null;
if ($parameter === null) {
Expand All @@ -123,14 +128,23 @@ private function addNamesToArgs(
}

if ($this->shouldSkipArg($arg, $parameter)) {
$hasChanges = true;

continue;
}

$arg->name = new Identifier(name: $parameter->getName());
$namedArgs[] = $arg;
$hasChanges = true;
}

if (! $hasChanges) {
return false;
}

$node->args = $namedArgs;

return true;
}

private function shouldSkipArg(Arg $arg, ExtendedParameterReflection $parameter): bool
Expand Down
Loading