[CodeQuality] Handle return new object and no return on ConsecutiveNullCompareReturnsToNullCoalesceQueueRector

rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/Fixture/return_new_object.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\Fixture;
+
+class ReturnNewObject
+{
+    protected ?\stdClass $prop1 = null;
+    protected ?\stdClass $prop2 = null;
+
+    public function getProp(): \stdClass
+    {
+        if ($this->prop1 !== null) {
+            return $this->prop1;
+        }
+        if ($this->prop2 !== null) {
+            return $this->prop2;
+        }
+        return new \stdClass();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\Fixture;
+
+class ReturnNewObject
+{
+    protected ?\stdClass $prop1 = null;
+    protected ?\stdClass $prop2 = null;
+
+    public function getProp(): \stdClass
+    {
+        return ($this->prop1 ?? $this->prop2) ?? new \stdClass();
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/Fixture/skip_indirect_return.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\Fixture;
+
+class SkipIndirectReturn
+{
+    protected ?\stdClass $prop1 = null;
+    protected ?\stdClass $prop2 = null;
+
+    public function getProp()
+    {
+        if ($this->prop1 !== null) {
+            return $this->prop1;
+        }
+        if ($this->prop2 !== null) {
+            return $this->prop2;
+        }
+        echo 'hi';
+        return null;
+    }
+}

rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/Fixture/skip_no_return.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\Fixture;
+
+class SkipNoReturn
+{
+    protected ?\stdClass $prop1 = null;
+    protected ?\stdClass $prop2 = null;
+
+    public function getProp()
+    {
+        if ($this->prop1 !== null) {
+            return $this->prop1;
+        }
+        if ($this->prop2 !== null) {
+            return $this->prop2;
+        }
+        echo 'hi';
+    }
+}

rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/Fixture/skip_no_return2.php.inc

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\Fixture;
+
+class SkipNoReturn2
+{
+    protected ?\stdClass $prop1 = null;
+    protected ?\stdClass $prop2 = null;
+
+    public function getProp()
+    {
+        if ($this->prop1 !== null) {
+            return $this->prop1;
+        }
+        if ($this->prop2 !== null) {
+            return $this->prop2;
+        }
+    }
+}

rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php

@@ -95,6 +95,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            if (! isset($node->stmts[$key + 1])) {
+                return null;
+            }
+
             $coalescingExprs[] = $comparedExpr;
             $ifKeys[] = $key;
         }
@@ -105,8 +109,9 @@ public function refactor(Node $node): ?Node
         }
 
         // remove last return null
-        $throwExpr = null;
+        $appendExpr = null;
         $hasChanged = false;
+        $originalStmts = $node->stmts;
         foreach ($node->stmts as $key => $stmt) {
             if (in_array($key, $ifKeys, true)) {
                 unset($node->stmts[$key]);
@@ -121,19 +126,27 @@ public function refactor(Node $node): ?Node
 
             if ($stmt instanceof Throw_) {
                 unset($node->stmts[$key]);
-                $throwExpr = new ExprThrow_($stmt->expr);
+                $appendExpr = new ExprThrow_($stmt->expr);
 
                 continue;
             }
 
             if (! $this->isReturnNull($stmt)) {
-                continue;
+                if ($stmt instanceof Return_ && $stmt->expr instanceof Expr) {
+                    unset($node->stmts[$key]);
+                    $appendExpr = $stmt->expr;
+
+                    continue;
+                }
+
+                $node->stmts = $originalStmts;
+                return $node;
             }
 
             unset($node->stmts[$key]);
         }
 
-        $node->stmts[] = $this->createCealesceReturn($coalescingExprs, $throwExpr);
+        $node->stmts[] = $this->createCealesceReturn($coalescingExprs, $appendExpr);
 
         return $node;
     }
@@ -159,7 +172,7 @@ private function isReturnNull(Stmt $stmt): bool
     /**
      * @param Expr[] $coalescingExprs
      */
-    private function createCealesceReturn(array $coalescingExprs, ?Expr $throwExpr): Return_
+    private function createCealesceReturn(array $coalescingExprs, ?Expr $appendExpr): Return_
     {
         /** @var Expr $leftExpr */
         $leftExpr = array_shift($coalescingExprs);
@@ -173,8 +186,8 @@ private function createCealesceReturn(array $coalescingExprs, ?Expr $throwExpr):
             $coalesce = new Coalesce($coalesce, $coalescingExpr);
         }
 
-        if ($throwExpr instanceof Expr) {
-            return new Return_(new Coalesce($coalesce, $throwExpr));
+        if ($appendExpr instanceof Expr) {
+            return new Return_(new Coalesce($coalesce, $appendExpr));
         }
 
         return new Return_($coalesce);