From 74ba793cd061d7b9e9f00edab829ca2c630edb90 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 8 Apr 2024 20:13:44 +0700
Subject: [PATCH] [TypeDeclaration] Skip maybe not returned on while on
 ReturnUnionTypeRector

---
 .../Fixture/skip_while_maybe_returned.php.inc   | 17 +++++++++++++++++
 .../TypeInferer/SilentVoidResolver.php          |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/skip_while_maybe_returned.php.inc

diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/skip_while_maybe_returned.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/skip_while_maybe_returned.php.inc
new file mode 100644
index 00000000000..f2e9351dc95
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/skip_while_maybe_returned.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector\Fixture;
+
+final class SkipWhileMaybeNeverReturned
+{
+    public function run(int $i)
+    {
+        while (++$i < 1) {
+            if (rand(0,1)) {
+                return 1;
+            }
+
+            return '1';
+        }
+    }
+}
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
index 80d53e3e379..9491433441c 100644
--- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
+++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -151,7 +151,7 @@ private function isDoOrWhileWithAlwaysReturnOrExit(Stmt $stmt): bool
             return false;
         }
 
-        return ! $this->isFoundLoopControl($stmt);;
+        return $stmt instanceof Do_ && ! $this->isFoundLoopControl($stmt);;
     }
 
     private function isIfReturn(Stmt|Expr $stmt): bool