[CodeQuality] Skip do { } while always returned on ExplicitReturnNull…

…Rector (#5760)

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);
+    }
+}

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;