skip method/static calls

Author: TomasVotruba

rules-tests/DeadCode/Rector/Stmt/RemoveConditionExactReturnRector/Fixture/skip_side_effect_call.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Stmt\RemoveConditionExactReturnRector\Fixture;
+
+final class SkipSideEffectCall
+{
+    public function run($result)
+    {
+        if ($result === $this->isMissing(100)) {
+            return $this->isMissing(100);
+        }
+
+        return $result;
+    }
+
+    private function isMissing(int $int): int
+    {
+        return mt_rand(0, 1) * $int;
+    }
+}

rules/DeadCode/Rector/Stmt/RemoveConditionExactReturnRector.php

@@ -8,6 +8,8 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp\Equal;
 use PhpParser\Node\Expr\BinaryOp\Identical;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
@@ -82,12 +84,8 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if (count($stmt->stmts) !== 1) {
-                continue;
-            }
-
-            $soleIfStmt = $stmt->stmts[0];
-            if (! $soleIfStmt instanceof Return_) {
+            $soleIfReturn = $this->matchSoleIfReturn($stmt);
+            if (! $soleIfReturn instanceof Return_) {
                 continue;
             }
 
@@ -96,15 +94,19 @@ public function refactor(Node $node): ?Node
             }
 
             $identicalOrEqual = $stmt->cond;
-            $return = $soleIfStmt;
 
-            if (! $this->nodeComparator->areNodesEqual($identicalOrEqual->right, $return->expr)) {
+            // skip obvious complexity
+            if ($identicalOrEqual->right instanceof MethodCall || $identicalOrEqual->right instanceof StaticCall) {
+                continue;
+            }
+
+            if (! $this->nodeComparator->areNodesEqual($identicalOrEqual->right, $soleIfReturn->expr)) {
                 continue;
             }
 
             $comparedVariable = $identicalOrEqual->left;
 
-            // next stmt must be return of the same var
+            // next if must be return of the same var
             $nextStmt = $node->stmts[$key + 1] ?? null;
             if (! $nextStmt instanceof Return_) {
                 continue;
@@ -118,7 +120,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            // remove next stmt
+            // remove next if
             unset($node->stmts[$key + 1]);
 
             // replace if with return
@@ -129,4 +131,18 @@ public function refactor(Node $node): ?Node
 
         return null;
     }
+
+    private function matchSoleIfReturn(If_ $if): ?Return_
+    {
+        if (count($if->stmts) !== 1) {
+            return null;
+        }
+
+        $soleIfStmt = $if->stmts[0];
+        if (! $soleIfStmt instanceof Return_) {
+            return null;
+        }
+
+        return $soleIfStmt;
+    }
 }