[DeadCode] Skip with elseif/else on RemoveNextSameValueConditionRector

Author: samsonasik

rules-tests/DeadCode/Rector/Stmt/RemoveNextSameValueConditionRector/Fixture/skip_with_elseif.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Stmt\RemoveNextSameValueConditionRector\Fixture;
+
+final class SkipWithElseif
+{
+    public function __construct(array $items)
+    {
+        $count = 100;
+        if ($items === []) {
+            $count = 0;
+        }
+
+        if ($items === []) {
+            return $count;
+        } else {
+            return 'test';
+        }
+    }
+}

rules/DeadCode/Rector/Stmt/RemoveNextSameValueConditionRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\If_;
 use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
 use Rector\PhpParser\Enum\NodeGroup;
@@ -90,6 +91,11 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            // only when no elseif/else in current if
+            if ($stmt->elseifs !== [] || $stmt->else instanceof Else_) {
+                continue;
+            }
+
             // first condition must be without side effect
             if ($this->sideEffectNodeDetector->detect($stmt->cond)) {
                 continue;
@@ -108,6 +114,11 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            // only when no elseif/else in next stmt
+            if ($nextStmt->elseifs !== [] || $nextStmt->else instanceof Else_) {
+                continue;
+            }
+
             $stmt->stmts = array_merge($stmt->stmts, $nextStmt->stmts);
 
             // remove next node