[DeadCode] Merge RemoveDeadConstructorRector, to RemoveEmptyClassMeth…

…odRector with same behavior (#2829)
rectorphp · Aug 24, 2022 · 6c8c40b · 6c8c40b
1 parent 9018492
commit 6c8c40b
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 208 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 @@
-# 410 Rules Overview
+# 409 Rules Overview
 
 <br>
 
@@ -14,7 +14,7 @@
 
 - [Composer](#composer) (6)
 
-- [DeadCode](#deadcode) (49)
+- [DeadCode](#deadcode) (48)
 
 - [DependencyInjection](#dependencyinjection) (2)
 
@@ -2857,23 +2857,6 @@ Remove dead condition above return
 
 <br>
 
-### RemoveDeadConstructorRector
-
-Remove empty constructor
-
-- class: [`Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector`](../rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php)
-
-```diff
- class SomeClass
- {
--    public function __construct()
--    {
--    }
- }
-```
-
-<br>
-
 ### RemoveDeadContinueRector
 
 Remove useless continue at the end of loops

diff --git a/config/set/dead-code.php b/config/set/dead-code.php
@@ -11,7 +11,6 @@
 use Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector;
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector;
@@ -66,7 +65,6 @@
         RemoveUnusedPrivatePropertyRector::class,
         RemoveUnusedPrivateClassConstantRector::class,
         RemoveUnusedPrivateMethodRector::class,
-        RemoveDeadConstructorRector::class,
         RemoveDeadReturnRector::class,
         RemoveDeadContinueRector::class,
         RemoveDeadIfForeachForRector::class,

diff --git a/e2e/applied-rule-removed-node/expected-output.diff b/e2e/applied-rule-removed-node/expected-output.diff
@@ -15,7 +15,7 @@
     ----------- end diff -----------
 
 Applied rules:
- * RemoveDeadConstructorRector
+ * RemoveEmptyClassMethodRector
 
 
 2) src/AlwaysTrue.php:3

diff --git a/e2e/applied-rule-removed-node/rector.php b/e2e/applied-rule-removed-node/rector.php
@@ -3,14 +3,14 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/src',
     ]);
 
-    $rectorConfig->rule(RemoveDeadConstructorRector::class);
+    $rectorConfig->rule(RemoveEmptyClassMethodRector::class);
     $rectorConfig->rule(RemoveAlwaysTrueIfConditionRector::class);
 };
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/Fixture/fixture.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/Fixture/fixture.php.inc
diff --git a/...ests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/Fixture/skip_private.php.inc b/...ests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/Fixture/skip_private.php.inc
diff --git a/...adCode/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php b/...adCode/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php
diff --git a/...-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php b/...-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php
diff --git a/...ts/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/Fixture/first_fixture.php.inc b/...ts/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/Fixture/first_fixture.php.inc
@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
+
+final class FirstFixture
+{
+    public function __construct()
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
+
+final class FirstFixture
+{
+}
+
+?>
diff --git a/...eadConstructorRector/Fixture/skip.php.inc → ...ptyClassMethodRector/Fixture/skip.php.inc b/...eadConstructorRector/Fixture/skip.php.inc → ...ptyClassMethodRector/Fixture/skip.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
 
 class Skip extends AnotherClass
 {

diff --git a/...Fixture/skip_extends_with_no_stmt.php.inc → ...Fixture/skip_extends_with_no_stmt.php.inc b/...Fixture/skip_extends_with_no_stmt.php.inc → ...Fixture/skip_extends_with_no_stmt.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
 
 class MyPdoStub extends MyPdo
 {

diff --git a/...sts/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/Fixture/skip_private.php.inc b/...sts/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/Fixture/skip_private.php.inc
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
+
+class SkipPrivate
+{
+    private function __construct()
+    {
+    }
+}
diff --git a/...r/Fixture/skip_property_promotion.php.inc → ...ure/skip_property_promotion_again.php.inc b/...r/Fixture/skip_property_promotion.php.inc → ...ure/skip_property_promotion_again.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
 
 class SkipPropertyPromotion
 {

diff --git a/.../skip_protected_on_abstract_class.php.inc → .../skip_protected_on_abstract_class.php.inc b/.../skip_protected_on_abstract_class.php.inc → .../skip_protected_on_abstract_class.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
 
 abstract class SkipProtectedOnAbstractClass
 {

diff --git a/...skip_protected_on_non_final_class.php.inc → ...skip_protected_on_non_final_class.php.inc b/...skip_protected_on_non_final_class.php.inc → ...skip_protected_on_non_final_class.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector\Fixture;
 
 class SkipProtectedOnNonFinalClass
 {

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector.php
diff --git a/tests/Issues/AlwaysTrueIfInDeadConstructor/config/configured_rule.php b/tests/Issues/AlwaysTrueIfInDeadConstructor/config/configured_rule.php
@@ -3,10 +3,10 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(RemoveAlwaysTrueIfConditionRector::class);
-    $rectorConfig->rule(RemoveDeadConstructorRector::class);
+    $rectorConfig->rule(RemoveEmptyClassMethodRector::class);
 };