make rules inherit from abstract falsy

rectorphp · Oct 5, 2021 · 9eb5fe3 · 9eb5fe3
1 parent 78cf16e
commit 9eb5fe3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php
@@ -5,12 +5,13 @@
 namespace Rector\Strict\Rector\If_;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\If_;
 use PHPStan\Analyser\Scope;
-use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
@@ -20,7 +21,7 @@
  *
  * @see \Rector\Tests\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector\BooleanInIfConditionRuleFixerRectorTest
  */
-final class BooleanInIfConditionRuleFixerRector extends AbstractRector
+final class BooleanInIfConditionRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
 {
     public function __construct(
         private ExactCompareFactory $exactCompareFactory
@@ -34,7 +35,7 @@ public function getRuleDefinition(): RuleDefinition
             'PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule'
         );
         return new RuleDefinition($errorMessage, [
-            new CodeSample(
+            new ConfiguredCodeSample(
                 <<<'CODE_SAMPLE'
 final class NegatedString
 {
@@ -62,6 +63,10 @@ public function run(string $name)
     }
 }
 CODE_SAMPLE
+                ,
+                [
+                    self::TREAT_AS_NON_EMPTY => false,
+                ]
             ),
         ]);
     }
@@ -98,7 +103,7 @@ public function refactor(Node $node): ?If_
                 $elseifCondExprType,
                 $elseif->cond
             );
-            if ($notIdentical === null) {
+            if (! $notIdentical instanceof Expr) {
                 continue;
             }
 

diff --git a/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php b/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php
@@ -8,10 +8,10 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Ternary;
 use PHPStan\Analyser\Scope;
-use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
@@ -20,7 +20,7 @@
  *
  * @see \Rector\Tests\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector\BooleanInTernaryOperatorRuleFixerRectorTest
  */
-final class BooleanInTernaryOperatorRuleFixerRector extends AbstractRector
+final class BooleanInTernaryOperatorRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
 {
     public function __construct(
         private ExactCompareFactory $exactCompareFactory
@@ -34,7 +34,7 @@ public function getRuleDefinition(): RuleDefinition
             'PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule'
         );
         return new RuleDefinition($errorMessage, [
-            new CodeSample(
+            new ConfiguredCodeSample(
                 <<<'CODE_SAMPLE'
 final class ArrayCompare
 {
@@ -54,6 +54,10 @@ public function run(array $data)
     }
 }
 CODE_SAMPLE
+            ,
+                [
+                    self::TREAT_AS_NON_EMPTY => false,
+                ]
             ),
         ]);
     }

diff --git a/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php b/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php
@@ -5,13 +5,14 @@
 namespace Rector\Strict\Rector\Ternary;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Ternary;
 use PHPStan\Analyser\Scope;
-use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
@@ -20,7 +21,7 @@
  *
  * @see \Rector\Tests\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector\DisallowedShortTernaryRuleFixerRectorTest
  */
-final class DisallowedShortTernaryRuleFixerRector extends AbstractRector
+final class DisallowedShortTernaryRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
 {
     public function __construct(
         private ExactCompareFactory $exactCompareFactory,
@@ -34,7 +35,7 @@ public function getRuleDefinition(): RuleDefinition
             'PHPStan\Rules\DisallowedConstructs\DisallowedShortTernaryRule'
         );
         return new RuleDefinition($errorMessage, [
-            new CodeSample(
+            new ConfiguredCodeSample(
                 <<<'CODE_SAMPLE'
 final class ShortTernaryArray
 {
@@ -54,6 +55,10 @@ public function run(array $array)
     }
 }
 CODE_SAMPLE
+                ,
+                [
+                    self::TREAT_AS_NON_EMPTY => false,
+                ]
             ),
         ]);
     }
@@ -88,13 +93,13 @@ public function refactor(Node $node): ?Ternary
         }
 
         $exprType = $scope->getType($node->cond);
-        $falsyIdentical = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $node->cond);
-        if ($falsyIdentical === null) {
+        $compareExpr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $node->cond);
+        if (! $compareExpr instanceof Expr) {
             return null;
         }
 
         $node->if = $node->cond;
-        $node->cond = $falsyIdentical;
+        $node->cond = $compareExpr;
 
         return $node;
     }
@@ -111,7 +116,7 @@ private function refactorResetFuncCall(Ternary $ternary, FuncCall $resetFuncCall
             $firstArgValue
         );
 
-        if ($falsyCompareExpr === null) {
+        if (! $falsyCompareExpr instanceof Expr) {
             return;
         }