From 0348124a5535b99712da4debc136d2e73647b97a Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 3 Apr 2024 21:15:24 +0700
Subject: [PATCH] [CodeQuality] Skip Switch_ always returned on
 ExplicitReturnNullRector (#5800)

* [CodeQuality] Skip Switch_ always returned on ExplicitReturnNullRector

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <actions@github.com>
---
 .../Fixture/skip_switch_always_return.php.inc   | 17 +++++++++++++++++
 .../TypeInferer/SilentVoidResolver.php          |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_switch_always_return.php.inc

diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_switch_always_return.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_switch_always_return.php.inc
new file mode 100644
index 00000000000..e7951bfc47a
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_switch_always_return.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipSwitchAlwaysReturn
+{
+    public function run(int $number)
+    {
+        switch ($number) {
+            case 1:
+                return 1;
+            case 2:
+            default:
+                return 2;
+        }
+    }
+}
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
index 718967438b1..71adfdf21db 100644
--- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
+++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -14,6 +14,7 @@
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Break_;
+use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Continue_;
 use PhpParser\Node\Stmt\Do_;
@@ -166,8 +167,10 @@ private function isSwitchWithAlwaysReturnOrExit(Switch_ $switch): bool
 
         $casesWithReturnOrExitCount = $this->resolveReturnOrExitCount($switch);
 
+        $cases = array_filter($switch->cases, static fn(Case_ $case): bool => $case->stmts !== []);
+
         // has same amount of first return or exit nodes as switches
-        return count($switch->cases) === $casesWithReturnOrExitCount;
+        return count($cases) === $casesWithReturnOrExitCount;
     }
 
     private function isTryCatchAlwaysReturnOrExit(TryCatch $tryCatch): bool