[CodeQuality] Handle not identical return false then true on Simplify…

…IfReturnBoolRector (#1969)

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

rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/not_identical_return_false_then_true.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture;
+
+use PhpCsFixer\Tokenizer\Token;
+
+class NotIdenticalReturnFalseThenTrue
+{
+    public function run()
+    {
+        $docToken = new Token([]);
+        if (strpos($docToken->getContent(), "\n") !== false) {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture;
+
+use PhpCsFixer\Tokenizer\Token;
+
+class NotIdenticalReturnFalseThenTrue
+{
+    public function run()
+    {
+        $docToken = new Token([]);
+        return strpos($docToken->getContent(), "\n") === false;
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/skip_not_identical_return_false_then_return_in_array.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture;
+
+class SkipNotIdenticalReturnFalseThenReturnInArray
+{
+    private const POSSIBLE_DELIMITERS = ['#', '~', '/'];
+
+    public function run($firstChar, $lastChar)
+    {
+        if ($firstChar !== $lastChar) {
+            return false;
+        }
+
+        return in_array($firstChar, self::POSSIBLE_DELIMITERS, true);
+    }
+}

rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php

@@ -78,7 +78,14 @@ public function refactor(Node $node): ?Node
         if ($this->valueResolver->isTrue($innerIfInnerNode)) {
             $newReturnNode = $this->processReturnTrue($node, $nextNode);
         } elseif ($this->valueResolver->isFalse($innerIfInnerNode)) {
-            $newReturnNode = $this->processReturnFalse($node, $nextNode);
+            /** @var Expr $expr */
+            $expr = $nextNode->expr;
+            if ($node->cond instanceof NotIdentical && $this->valueResolver->isTrue($expr)) {
+                $node->cond = new Identical($node->cond->left, $node->cond->right);
+                $newReturnNode = $this->processReturnTrue($node, $nextNode);
+            } else {
+                $newReturnNode = $this->processReturnFalse($node, $nextNode);
+            }
         } else {
             return null;
         }
@@ -122,7 +129,7 @@ private function shouldSkip(If_ $if): bool
             return true;
         }
 
-        if ($nextNode->expr === null) {
+        if (! $nextNode->expr instanceof Expr) {
             return true;
         }
 
@@ -136,7 +143,7 @@ private function shouldSkip(If_ $if): bool
             return ! $this->valueResolver->isTrueOrFalse($nextNode->expr);
         }
 
-        return true;
+        return ! $if->cond instanceof NotIdentical;
     }
 
     private function processReturnTrue(If_ $if, Return_ $nextReturnNode): Return_

rules/DowngradePhp74/Rector/FuncCall/DowngradeArrayMergeCallWithoutArgumentsRector.php

@@ -78,10 +78,6 @@ private function shouldRefactor(FuncCall $funcCall): bool
         }
 
         // If param is provided, do nothing
-        if ($funcCall->args !== []) {
-            return false;
-        }
-
-        return true;
+        return $funcCall->args === [];
     }
 }

rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php

@@ -133,11 +133,7 @@ private function shouldSkip(ClassMethod $classMethod): bool
                 return false;
             }
 
-            if ($classLike->extends !== null) {
-                return false;
-            }
-
-            return true;
+            return $classLike->extends === null;
         }
 
         // skip interface without parents

src/PhpParser/Comparing/ConditionSearcher.php

@@ -101,10 +101,6 @@ private function hasVariableDeclaration(Variable $variable, Stmt $stmt): bool
             return false;
         }
 
-        if ($variable->name !== $assignVar->name) {
-            return false;
-        }
-
-        return true;
+        return $variable->name === $assignVar->name;
     }
 }