merge SimplifyDuplicatedTernaryRector to UnnecessaryTernaryExpression…

…Rector, almost identical rule (#2046)
rectorphp · Apr 10, 2022 · 9b8e161 · 9b8e161
1 parent a2ee46d
commit 9b8e161
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 135 deletions.
diff --git a/config/set/code-quality.php b/config/set/code-quality.php
@@ -68,7 +68,6 @@
 use Rector\CodeQuality\Rector\PropertyFetch\ExplicitMethodCallOverMagicGetSetRector;
 use Rector\CodeQuality\Rector\Switch_\SingularSwitchToIfRector;
 use Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector;
-use Rector\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector;
 use Rector\CodeQuality\Rector\Ternary\SimplifyTautologyTernaryRector;
 use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
@@ -110,7 +109,6 @@
     $services->set(ExplicitBoolCompareRector::class);
     $services->set(CombineIfRector::class);
     $services->set(UseIdenticalOverEqualWithSameTypeRector::class);
-    $services->set(SimplifyDuplicatedTernaryRector::class);
     $services->set(SimplifyBoolIdenticalTrueRector::class);
     $services->set(SimplifyRegexPatternRector::class);
     $services->set(BooleanNotIdenticalToNotIdenticalRector::class);

diff --git a/...ty/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php b/...ty/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php
diff --git a/...sts/CodeQuality/Rector/Ternary/SimplifyDuplicatedTernaryRector/config/configured_rule.php b/...sts/CodeQuality/Rector/Ternary/SimplifyDuplicatedTernaryRector/config/configured_rule.php
diff --git a/...atedTernaryRector/Fixture/fixture.php.inc → ...sionRector/Fixture/simple_example.php.inc b/...atedTernaryRector/Fixture/fixture.php.inc → ...sionRector/Fixture/simple_example.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector\Fixture;
 
-class Fixture
+final class SimpleExample
 {
     public function run(bool $value, string $name)
     {
@@ -15,14 +15,14 @@ class Fixture
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector\Fixture;
 
-class Fixture
+final class SimpleExample
 {
     public function run(bool $value, string $name)
     {
          $isTrue = $value;
-         $isName = $name ? true : false;
+         $isName = (bool) $name;
     }
 }
 

diff --git a/rules/CodeQuality/Rector/Ternary/SimplifyDuplicatedTernaryRector.php b/rules/CodeQuality/Rector/Ternary/SimplifyDuplicatedTernaryRector.php
diff --git a/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php b/rules/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector.php
@@ -29,7 +29,7 @@ public function __construct(
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Remove unnecessary ternary expressions.',
+            'Remove unnecessary ternary expressions',
             [new CodeSample('$foo === $bar ? true : false;', '$foo === $bar;')]
         );
     }