Fix no return in ChangeSwitchToMatchRector (#3188)

Co-authored-by: Vincent Langlet <VincentLanglet@users.noreply.github.com>

rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_unrelated_return.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class UnrelatedReturn
+{
+    public function run($data, $proxyQuery, $alias): bool
+    {
+        switch ($data->getValue()) {
+            case ProductService::SPECIAL_GESTION_CAPSULE:
+                $proxyQuery->getQueryBuilder()->andWhere($alias . '.collectionCapsule = true');
+                break;
+            case ProductService::SPECIAL_GESTION_PRESTIGE:
+                $proxyQuery->getQueryBuilder()->andWhere($alias . '.editionPrestige = true');
+                break;
+        }
+
+        return true;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class UnrelatedReturn
+{
+    public function run($data, $proxyQuery, $alias): bool
+    {
+        match ($data->getValue()) {
+            ProductService::SPECIAL_GESTION_CAPSULE => $proxyQuery->getQueryBuilder()->andWhere($alias . '.collectionCapsule = true'),
+            ProductService::SPECIAL_GESTION_PRESTIGE => $proxyQuery->getQueryBuilder()->andWhere($alias . '.editionPrestige = true'),
+            default => true,
+        };
+
+        return true;
+    }
+}
+
+?>

rules/Php80/NodeFactory/MatchFactory.php

@@ -59,6 +59,7 @@ public function createFromCondAndExprs(Expr $condExpr, array $condAndExprs, ?Stm
                 }
 
                 $shouldRemoteNextStmt = ! $expr instanceof Expr;
+
                 $condAndExprs[] = new CondAndExpr([], $nextStmt->expr, MatchKind::RETURN);
             }
         }

rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php

@@ -108,7 +108,7 @@ public function refactor(Node $node): ?Node
             }
 
             $match = $matchResult->getMatch();
-            if ($matchResult->shouldRemoveNextStmt()) {
+            if ($matchResult->shouldRemoveNextStmt() && $isReturn) {
                 unset($node->stmts[$key + 1]);
             }