[DeadCode] Skip remove variable on switch use return after break on R…

…emoveUnusedVariableAssignRector (#2145)

* [DeadCode] Skip remove on switch use return after break on RemoveUnusedVariableAssignRector

* Fixed 🎉

* check against RemoveUnreachableStatementRector which remove the return after break

* rename fixture

* rename fixture

* eol

rules-tests/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector/Fixture/skip_remove_variable_on_next_return_after_break_in_case.php.inc

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector\Fixture;
+
+final class SkipRemoveVariableOnNextReturnAfterBreakInCase
+{
+    public function run($a)
+    {
+        switch ($a)
+        {
+            case 'A':
+                $x = 'a';
+                break;
+                return;
+        }
+
+        echo $x;
+    }
+}

rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/switch_return_after_break.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector\Fixture;
+
+final class SwitchReturnAfterBreak
+{
+    public function run($a)
+    {
+        switch ($a)
+        {
+            case 'A':
+                $x = 'a';
+                break;
+                return;
+        }
+
+        echo $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector\Fixture;
+
+final class SwitchReturnAfterBreak
+{
+    public function run($a)
+    {
+        switch ($a)
+        {
+            case 'A':
+                $x = 'a';
+                break;
+        }
+
+        echo $x;
+    }
+}
+
+?>

src/PhpParser/Node/BetterNodeFinder.php

@@ -13,6 +13,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -366,7 +367,10 @@ public function findFirstNext(Node $node, callable $filter): ?Node
         $next = $node->getAttribute(AttributeKey::NEXT_NODE);
         if ($next instanceof Node) {
             if ($next instanceof Return_ && $next->expr === null) {
-                return null;
+                $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
+                if (! $parent instanceof Case_) {
+                    return null;
+                }
             }
 
             $found = $this->findFirst($next, $filter);