add fixture to handle even different order

Author: TomasVotruba

.github/workflows/code_analysis.yaml

@@ -2,7 +2,9 @@ name: Code Analysis
 
 on:
     pull_request: null
-    push: null
+    push:
+        branches:
+            - "main"
 
 env:
     # see https://github.com/composer/composer/issues/9368#issuecomment-718112361

config/set/named-args.php

@@ -7,15 +7,13 @@
 use Rector\CodeQuality\Rector\CallLike\AddNameToNullArgumentRector;
 use Rector\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector;
 use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\MethodCall\RemoveNullArgOnNullDefaultParamRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector;
 use Rector\NetteUtils\Rector\StaticCall\UtilsJsonStaticCallNamedArgRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
         AddNameToNullArgumentRector::class,
         AddNameToBooleanArgumentRector::class,
-        RemoveNullArgOnNullDefaultParamRector::class,
         RemoveNullNamedArgOnNullDefaultParamRector::class,
         SortCallLikeNamedArgsRector::class,
         SortAttributeNamedArgsRector::class,

rules-tests/DeadCode/Rector/MethodCall/RemoveNullArgOnNullDefaultParamRector/Fixture/skip_named_args.php.inc

@@ -8,4 +8,4 @@ function skipNamedArgs(?string $someClass = null)
 {
 }
 
-SomeFunctionWithDefaultNullArg(someClass: null);
+skipNamedArgs(someClass: null);

rules-tests/DeadCode/Rector/MethodCall/RemoveNullNamedArgOnNullDefaultParamRector/Fixture/handle_named_argument_position_not_match.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Source\SomeExternalClass;
+
+final class HandleNamedArgumentPositionNotMatch
+{
+    public function get()
+    {
+        SomeExternalClass::withMiddleNotNullDefault(item: null);
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Source\SomeExternalClass;
+
+final class HandleNamedArgumentPositionNotMatch
+{
+    public function get()
+    {
+        SomeExternalClass::withMiddleNotNullDefault();
+    }
+}
+
+?>

rules-tests/DeadCode/Rector/MethodCall/RemoveNullNamedArgOnNullDefaultParamRector/Fixture/skip_named_argument_position_not_match.php.inc

@@ -92,9 +92,13 @@ public function refactor(Node $node): StaticCall|MethodCall|New_|FuncCall|null
 
         $hasNamedArg = false;
         foreach ($args as $arg) {
+            // unpack hides which parameters are bound, so removal is not safe
+            if ($arg->unpack) {
+                return null;
+            }
+
             if ($arg->name instanceof Identifier) {
                 $hasNamedArg = true;
-                break;
             }
         }
 
@@ -107,40 +111,9 @@ public function refactor(Node $node): StaticCall|MethodCall|New_|FuncCall|null
             return null;
         }
 
-        // map every arg to its target parameter position, so named args in any order are handled
-        $argPositionByParameterPosition = [];
-        foreach ($args as $argPosition => $arg) {
-            if ($arg->unpack) {
-                return null;
-            }
-
-            if ($arg->name instanceof Identifier) {
-                $parameterPosition = $this->callLikeParamDefaultResolver->resolvePositionParameterByName(
-                    $node,
-                    $arg->name->toString()
-                );
-
-                if ($parameterPosition === null) {
-                    return null;
-                }
-            } else {
-                $parameterPosition = $argPosition;
-            }
-
-            $argPositionByParameterPosition[$parameterPosition] = $argPosition;
-        }
-
-        // only handle calls that fill a contiguous prefix of parameters, so a lone misplaced named arg is left untouched
-        ksort($argPositionByParameterPosition);
-        if (array_keys($argPositionByParameterPosition) !== range(0, count($args) - 1)) {
-            return null;
-        }
-
         $hasChanged = false;
-        foreach ($argPositionByParameterPosition as $parameterPosition => $argPosition) {
-            $arg = $args[$argPosition];
-
-            // only named args are removed here; remaining args still bind by name
+        foreach ($args as $argPosition => $arg) {
+            // only named args are removed here; in any order, remaining args still bind by name
             if (! $arg->name instanceof Identifier) {
                 continue;
             }
@@ -149,6 +122,15 @@ public function refactor(Node $node): StaticCall|MethodCall|New_|FuncCall|null
                 continue;
             }
 
+            $parameterPosition = $this->callLikeParamDefaultResolver->resolvePositionParameterByName(
+                $node,
+                $arg->name->toString()
+            );
+
+            if ($parameterPosition === null) {
+                continue;
+            }
+
             if (! in_array($parameterPosition, $nullPositions, true)) {
                 continue;
             }