From cae06912ed7d7274d900fdc996448f100be2ed34 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 23 Mar 2024 12:10:30 +0700
Subject: [PATCH] [CodeQuality] Skip do { } while always returned on
 ExplicitReturnNullRector (#5760)

---
 .../skip_do_while_always_returned.php.inc       | 17 +++++++++++++++++
 .../TypeInferer/SilentVoidResolver.php          |  5 +++++
 2 files changed, 22 insertions(+)
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_while_always_returned.php.inc

diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_while_always_returned.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_while_always_returned.php.inc
new file mode 100644
index 00000000000..78efe8c22ea
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_while_always_returned.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipDoWhileAlwaysReturned
+{
+    public function run(int $i)
+    {
+		do {
+    		if (rand(0,1)) {
+                return 1;
+    		}
+
+		    return 2;
+		} while (++$i < 1);
+    }
+}
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
index cc87da2fa8b..4226044584e 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\ClassMethod;
+use PhpParser\Node\Stmt\Do_;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Finally_;
@@ -92,6 +93,10 @@ private function hasStmtsAlwaysReturnOrExit(array $stmts): bool
             if ($this->isIfReturn($stmt)) {
                 return true;
             }
+
+            if ($stmt instanceof Do_ && $this->hasStmtsAlwaysReturnOrExit($stmt->stmts)) {
+                return true;
+            }
         }
 
         return false;