Remove removeNode() from RemoveDeadReturnRector, merge RemoveLastRetu…

…rnRector to RemoveDeadReturnRector (#4085)
rectorphp · Jun 5, 2023 · 2dccbb6 · 2dccbb6
1 parent cdc9e6b
commit 2dccbb6
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 317 deletions.
diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md
@@ -1,4 +1,4 @@
-# 384 Rules Overview
+# 383 Rules Overview
 
 <br>
 
@@ -10,7 +10,7 @@
 
 - [CodingStyle](#codingstyle) (34)
 
-- [DeadCode](#deadcode) (45)
+- [DeadCode](#deadcode) (44)
 
 - [DependencyInjection](#dependencyinjection) (2)
 
@@ -2914,27 +2914,6 @@ Remove variable just to assign value or return value
 
 <br>
 
-### RemoveLastReturnRector
-
-Remove very last `return` that has no meaning
-
-- class: [`Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector`](../rules/DeadCode/Rector/ClassMethod/RemoveLastReturnRector.php)
-
-```diff
- function some_function($value)
- {
-     if ($value === 1000) {
-         return;
-     }
-
-     if ($value) {
--        return;
-     }
- }
-```
-
-<br>
-
 ### RemoveNonExistingVarAnnotationRector
 
 Removes non-existing `@var` annotations above the code

diff --git a/config/set/dead-code.php b/config/set/dead-code.php
@@ -12,7 +12,6 @@
 use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
@@ -91,7 +90,6 @@
         RemoveUselessVarTagRector::class,
 
         RemoveUnusedPromotedPropertyRector::class,
-        RemoveLastReturnRector::class,
         RemoveJustPropertyFetchForAssignRector::class,
         RemoveJustVariableAssignRector::class,
 

diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_closure.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_closure.php.inc
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_function.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_function.php.inc
diff --git a/...tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_inner_closure.php.inc b/...tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/in_inner_closure.php.inc
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/skip_loop.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/skip_loop.php.inc
diff --git a/...s/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/skip_not_last_return.php.inc b/...s/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/Fixture/skip_not_last_return.php.inc
diff --git a/...s-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/RemoveLastReturnRectorTest.php b/...s-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/RemoveLastReturnRectorTest.php
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php
diff --git a/...urnRector/Fixture/in_class_method.php.inc → ...Rector/Fixture/if_in_class_method.php.inc b/...urnRector/Fixture/in_class_method.php.inc → ...Rector/Fixture/if_in_class_method.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveLastReturnRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector\Fixture;
 
 class InClassMethod
 {
@@ -19,7 +19,7 @@ class InClassMethod
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveLastReturnRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector\Fixture;
 
 class InClassMethod
 {

diff --git a/...nRector/Fixture/skip_return_value.php.inc → ...nRector/Fixture/skip_return_value.php.inc b/...nRector/Fixture/skip_return_value.php.inc → ...nRector/Fixture/skip_return_value.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveLastReturnRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector\Fixture;
 
 final class SkipReturnValue
 {

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveLastReturnRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveLastReturnRector.php