From a1db5598f7d14b49323258b90bf822e323c6ccdd Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 28 Oct 2025 17:34:33 +0700
Subject: [PATCH] [DeadCode] Register RemoveNullArgOnNullDefaultParamRector to
 dead code set

---
 rules/Naming/ParamRenamer/ParamRenamer.php                    | 3 +--
 ...eForeachValueVariableToMatchMethodCallReturnTypeRector.php | 3 +--
 .../Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php  | 1 -
 src/Config/Level/DeadCodeLevel.php                            | 2 ++
 src/Configuration/ConfigurationFactory.php                    | 4 +---
 .../ArrayItemNodeAnnotationToAttributeMapper.php              | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/rules/Naming/ParamRenamer/ParamRenamer.php b/rules/Naming/ParamRenamer/ParamRenamer.php
index fdc0dfc5446..72051f49edd 100644
--- a/rules/Naming/ParamRenamer/ParamRenamer.php
+++ b/rules/Naming/ParamRenamer/ParamRenamer.php
@@ -31,8 +31,7 @@ public function rename(ParamRename $paramRename): void
         $this->variableRenamer->renameVariableInFunctionLike(
             $paramRename->getFunctionLike(),
             $paramRename->getCurrentName(),
-            $paramRename->getExpectedName(),
-            null
+            $paramRename->getExpectedName()
         );
 
         // 3. rename @param variable in docblock too
diff --git a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php
index 824d41a8cc7..9cfb46718ad 100644
--- a/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php
+++ b/rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector.php
@@ -127,8 +127,7 @@ function (Node $subNode) use ($node, &$hasRenamed): ?int {
                 $hasChanged = $this->variableRenamer->renameVariableInFunctionLike(
                     $variableAndCallForeach->getFunctionLike(),
                     $variableAndCallForeach->getVariableName(),
-                    $expectedName,
-                    null
+                    $expectedName
                 );
 
                 // use different variable on purpose to avoid variable re-assign back to false
diff --git a/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php b/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php
index 2b55d7f2061..77de93dcedb 100644
--- a/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php
+++ b/rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php
@@ -134,7 +134,6 @@ private function handleIsset(Isset_ $isset): Expr|int|null
                 $carry,
                 $expr
             ) : $expr,
-            null,
         );
     }
 
diff --git a/src/Config/Level/DeadCodeLevel.php b/src/Config/Level/DeadCodeLevel.php
index 71c5f42f0ae..e2e76f8d106 100644
--- a/src/Config/Level/DeadCodeLevel.php
+++ b/src/Config/Level/DeadCodeLevel.php
@@ -45,6 +45,7 @@
 use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector;
 use Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
+use Rector\DeadCode\Rector\MethodCall\RemoveNullArgOnNullDefaultParamRector;
 use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector;
 use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
@@ -146,6 +147,7 @@ final class DeadCodeLevel
         RemoveDeadReturnRector::class,
 
         RemoveArgumentFromDefaultParentCallRector::class,
+        RemoveNullArgOnNullDefaultParamRector::class,
         NarrowTooWideReturnTypeRector::class,
     ];
 }
diff --git a/src/Configuration/ConfigurationFactory.php b/src/Configuration/ConfigurationFactory.php
index 70a699f8801..ee256294bcb 100644
--- a/src/Configuration/ConfigurationFactory.php
+++ b/src/Configuration/ConfigurationFactory.php
@@ -42,9 +42,7 @@ public function createForTests(array $paths): Configuration
             false,
             null,
             false,
-            false,
-            null,
-            null
+            false
         );
     }
 
diff --git a/src/PhpAttribute/AnnotationToAttributeMapper/ArrayItemNodeAnnotationToAttributeMapper.php b/src/PhpAttribute/AnnotationToAttributeMapper/ArrayItemNodeAnnotationToAttributeMapper.php
index bcb6bd10c8d..0ed80be0dff 100644
--- a/src/PhpAttribute/AnnotationToAttributeMapper/ArrayItemNodeAnnotationToAttributeMapper.php
+++ b/src/PhpAttribute/AnnotationToAttributeMapper/ArrayItemNodeAnnotationToAttributeMapper.php
@@ -45,7 +45,7 @@ public function map($arrayItemNode): ArrayItem
         $valueExpr = $this->annotationToAttributeMapper->map($arrayItemNode->value);
 
         if ($valueExpr === DocTagNodeState::REMOVE_ARRAY) {
-            return new ArrayItem(new String_($valueExpr), null);
+            return new ArrayItem(new String_($valueExpr));
         }
 
         if ($arrayItemNode->key !== null) {