Extend dead-code set (#2687)

config/set/code-quality.php

@@ -56,6 +56,7 @@
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
+use Rector\CodeQuality\Rector\If_\SimplifyIfExactValueReturnValueRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfIssetToNullCoalescingRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfNotNullReturnRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfNullableReturnRector;
@@ -184,5 +185,6 @@
         InlineIsAInstanceOfRector::class,
         TernaryFalseExpressionToIfRector::class,
         InlineConstructorDefaultToPropertyRector::class,
+        SimplifyIfExactValueReturnValueRector::class,
     ]);
 };

config/set/coding-style.php

@@ -9,6 +9,7 @@
 use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector;
 use Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector;
 use Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector;
+use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
 use Rector\CodingStyle\Rector\ClassMethod\RemoveDoubleUnderscoreInMethodNameRector;
@@ -21,6 +22,7 @@
 use Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector;
 use Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
+use Rector\CodingStyle\Rector\FuncCall\StrictArraySearchRector;
 use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector;
 use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
 use Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector;
@@ -73,5 +75,7 @@
         StaticClosureRector::class,
         CountArrayToEmptyArrayComparisonRector::class,
         CallUserFuncToMethodCallRector::class,
+        FuncGetArgsToVariadicParamRector::class,
+        StrictArraySearchRector::class,
     ]);
 };

config/set/dead-code.php

@@ -31,14 +31,17 @@
 use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
 use Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector;
 use Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector;
+use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
 use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector;
 use Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector;
+use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
+use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
 use Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector;
 use Rector\DeadCode\Rector\Return_\RemoveDeadConditionAboveReturnRector;
 use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector;
@@ -95,10 +98,14 @@
         RemoveUselessParamTagRector::class,
         RemoveUselessReturnTagRector::class,
         RemoveNonExistingVarAnnotationRector::class,
+        RemoveUselessVarTagRector::class,
+
         RemoveUnusedPromotedPropertyRector::class,
         RemoveLastReturnRector::class,
         RemoveJustPropertyFetchForAssignRector::class,
-
         RemoveJustVariableAssignRector::class,
+
+        RemoveAlwaysTrueIfConditionRector::class,
+        RemoveDeadZeroAndOneOperationRector::class,
     ]);
 };

rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictNativeFunctionReturnTypeAnalyzer.php

@@ -51,12 +51,7 @@ public function matchAlwaysReturnNativeCallLikes(ClassMethod|Closure|Function_ $
             return null;
         }
 
-        $nativeCalls = $this->exclusiveNativeCallLikeReturnMatcher->match($returns);
-        if ($nativeCalls === null) {
-            return null;
-        }
-
-        return $nativeCalls;
+        return $this->exclusiveNativeCallLikeReturnMatcher->match($returns);
     }
 
     /**

utils/Command/MissingInSetCommand.php

@@ -22,6 +22,7 @@ final class MissingInSetCommand extends Command
         __DIR__ . '/../../config/set/coding-style.php' => __DIR__ . '/../../rules/CodingStyle/Rector',
         __DIR__ . '/../../config/set/dead-code.php' => __DIR__ . '/../../rules/DeadCode/Rector',
         __DIR__ . '/../../config/set/early-return.php' => __DIR__ . '/../../rules/EarlyReturn/Rector',
+        __DIR__ . '/../../config/set/naming.php' => __DIR__ . '/../../rules/Naming/Rector',
     ];
 
     /**
@@ -54,10 +55,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 continue;
             }
 
-            $title = sprintf('In "%s" config we could not find', $setFile);
+            $setRealpath = (string) realpath($setFile);
+            $relativeFilePath = Strings::after($setRealpath, getcwd() . '/');
+
+            $title = sprintf('In "%s" config we could not find', $relativeFilePath);
             $this->symfonyStyle->title($title);
             $this->symfonyStyle->listing($shortRectorClassesNotInSetConfig);
-            $this->symfonyStyle->newLine(2);
+            $this->symfonyStyle->newLine(1);
         }
 
         return self::SUCCESS;