[CodeQuality] Keep identical false variable compare as is it is in Si…

…mplifyBoolIdenticalTrueRector (#2839)
rectorphp · Aug 25, 2022 · 7215c28 · 7215c28
1 parent fadb6a4
commit 7215c28
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/...sts/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/directly.php.inc b/...sts/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/directly.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class Directly
+final class Directly
 {
     public function run(bool $value, string $items)
     {
@@ -20,7 +20,7 @@ class Directly
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class Directly
+final class Directly
 {
     public function run(bool $value, string $items)
     {

diff --git a/...odeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/double_negate.php.inc b/...odeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/double_negate.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class DoubleNegate
+final class DoubleNegate
 {
     public function run()
     {
@@ -18,7 +18,7 @@ class DoubleNegate
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class DoubleNegate
+final class DoubleNegate
 {
     public function run()
     {

diff --git a/...tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/negate.php.inc b/...tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/negate.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class Negate
+final class Negate
 {
     public function run($value, array $items)
     {
@@ -19,7 +19,7 @@ class Negate
 
 namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
 
-class Negate
+final class Negate
 {
     public function run($value, array $items)
     {

diff --git a/...uality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/skip_equals_false.php.inc b/...uality/Rector/Identical/SimplifyBoolIdenticalTrueRector/Fixture/skip_equals_false.php.inc
@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector\Fixture;
+
+final class SkipEqualsFalse
+{
+    public function run(bool $value)
+    {
+        if ($value === false) {
+            return 'not yet';
+        }
+
+        return 'yes';
+    }
+
+    public function runFromTheOtherSide(bool $value)
+    {
+        if (false === $value) {
+            return 'not yet';
+        }
+
+        return 'yes';
+    }
+}
diff --git a/rules/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector.php b/rules/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 use PhpParser\Node\Expr\BooleanNot;
+use PhpParser\Node\Expr\Variable;
 use PHPStan\Type\BooleanType;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -106,6 +107,13 @@ private function refactorIdentical(Expr $leftExpr, Expr $rightExpr): ?Expr
                 return $leftExpr->expr;
             }
 
+            $leftExprType = $this->getType($leftExpr);
+
+            // keep as it is, readable enough
+            if ($leftExpr instanceof Variable && $leftExprType instanceof BooleanType) {
+                return null;
+            }
+
             return new BooleanNot($leftExpr);
         }