[EarlyReturn] Skip ChangeOrIfReturnToEarlyReturnRector on next node i…

…s null or return void (#796)
rectorphp · Aug 31, 2021 · 654d4a2 · 654d4a2
1 parent 9247ba9
commit 654d4a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php
@@ -12,6 +12,7 @@
 use PhpParser\Node\Stmt\Return_;
 use Rector\Core\NodeManipulator\IfManipulator;
 use Rector\Core\Rector\AbstractRector;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -89,6 +90,15 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $nextNode = $node->getAttribute(AttributeKey::NEXT_NODE);
+        if ($nextNode === null) {
+            return null;
+        }
+
+        if ($nextNode instanceof Return_ && $nextNode->expr === null) {
+            return null;
+        }
+
         /** @var Return_ $return */
         $return = $node->stmts[0];
         $ifs = $this->createMultipleIfs($node->cond, $return, []);

diff --git a/tests/Issues/IssueEarlyReturnAndOrNarrow/Fixture/and_next_or.php.inc b/tests/Issues/IssueEarlyReturnAndOrNarrow/Fixture/and_next_or.php.inc
@@ -31,12 +31,10 @@ class AndNextOrReturnVoid
      */
     public function run($a, $b, $c, $d)
     {
-        if ($a && $b) {
-            return null;
-        }
-        if ($c) {
+        if ($a && $b  || $c) {
             return null;
         }
+
         return;
     }
 }

diff --git a/tests/Issues/IssueReturnBeforeElseIf/Fixture/complex_if_cond_or_without_elseif.php.inc b/tests/Issues/IssueReturnBeforeElseIf/Fixture/complex_if_cond_or_without_elseif.php.inc
@@ -28,10 +28,7 @@ class ComplexIfCondOrWithoutElseIf
 {
     public function run($a, $b, $c)
     {
-        if ($a && false === $b) {
-            return 'a';
-        }
-        if (! $c) {
+        if (($a && false === $b) || ! $c) {
             return 'a';
         }
         return 'b';