split of RemoveNullNamedArgOnNullDefaultParamRector to handle only named args (#8014)

* split of RemoveNullNamedArgOnNullDefaultParamRector to handle only named args

* make RemoveNullArgOnNullDefaultParamRector skip named args

* 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,14 +7,14 @@
 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,
         UtilsJsonStaticCallNamedArgRector::class,

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

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullArgOnNullDefaultParamRector\Fixture;
+
+function skipNamedArgs(?string $someClass = null)
+{
+}
+
+skipNamedArgs(someClass: null);

rules-tests/DeadCode/Rector/MethodCall/RemoveNullArgOnNullDefaultParamRector/Fixture/skip_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/RemoveNullArgOnNullDefaultParamRector/Fixture/with_named_argument_position_match.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Source\SomeExternalClass;
+
+final class WithNamedArgumentPositionMatch
+{
+    public function get()
+    {
+        $object = new SomeExternalClass(name: 'John', id: null);
+
+        $secondObject = new SomeExternalClass(id: null, name: 'John');
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Source\SomeExternalClass;
+
+final class WithNamedArgumentPositionMatch
+{
+    public function get()
+    {
+        $object = new SomeExternalClass(name: 'John');
+
+        $secondObject = new SomeExternalClass(name: 'John');
+    }
+}
+
+?>

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

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class RemoveNullNamedArgOnNullDefaultParamRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

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

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector\Source;
+
+final class SomeExternalClass
+{
+    public function __construct(string $name, ?int $id = null)
+    {
+    }
+
+    public static function withMiddleNotNullDefault(?int $id = null, int $data = 1, ?string $name = null, ?string $item = null)
+    {
+    }
+}

rules-tests/DeadCode/Rector/MethodCall/RemoveNullNamedArgOnNullDefaultParamRector/RemoveNullNamedArgOnNullDefaultParamRectorTest.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector;
+
+return RectorConfig::configure()
+    ->withRules([RemoveNullNamedArgOnNullDefaultParamRector::class]);