Add test fixture on boolean && in RemoveAlwaysTrueIfConditionRector (#…

…5749)

* add fixture on boolean and

* Add boolean and if support to RemoveAlwaysTrueIfConditionRector

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <actions@github.com>

rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/Fixture/boolean_and.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector\Fixture;
+
+final class BooleanAndWithObject
+{
+    public function run(\stdClass $someObject)
+    {
+        if (is_object($someObject) && method_exists($someObject, 'some_method')) {
+            return 100;
+        }
+
+        return 0;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector\Fixture;
+
+final class BooleanAndWithObject
+{
+    public function run(\stdClass $someObject)
+    {
+        if (method_exists($someObject, 'some_method')) {
+            return 100;
+        }
+
+        return 0;
+    }
+}
+
+?>

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
@@ -78,10 +79,14 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
-     * @return int|null|Stmt[]
+     * @return int|null|Stmt[]|If_
      */
-    public function refactor(Node $node): int|null|array
+    public function refactor(Node $node): int|null|array|If_
     {
+        if ($node->cond instanceof BooleanAnd) {
+            return $this->refactorIfWithBooleanAnd($node);
+        }
+
         if ($node->else instanceof Else_) {
             return null;
         }
@@ -164,4 +169,24 @@ private function shouldSkipPropertyFetch(Expr $expr): bool
 
         return false;
     }
+
+    private function refactorIfWithBooleanAnd(If_ $if): ?If_
+    {
+        if (! $if->cond instanceof BooleanAnd) {
+            return null;
+        }
+
+        $booleanAnd = $if->cond;
+        $leftType = $this->getType($booleanAnd->left);
+        if (! $leftType instanceof ConstantBooleanType) {
+            return null;
+        }
+
+        if (!$leftType->getValue()) {
+            return null;
+        }
+
+        $if->cond = $booleanAnd->right;
+        return $if;
+    }
 }