Merge pull request #8929 from danog/fix_8923

Fix #8923
vimeo · Dec 18, 2022 · da001c4 · da001c4
2 parents cbf37f7 + 2f5d0a4
commit da001c4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php b/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
@@ -265,7 +265,8 @@ public static function getControlActions(
                     static fn(string $action): bool => $action !== self::ACTION_NONE
                 );
 
-                if ($stmt instanceof PhpParser\Node\Stmt\While_
+                if (($stmt instanceof PhpParser\Node\Stmt\While_
+                    || $stmt instanceof PhpParser\Node\Stmt\Do_)
                     && $nodes
                     && ($stmt_expr_type = $nodes->getType($stmt->cond))
                     && $stmt_expr_type->isAlwaysTruthy()

diff --git a/tests/Loop/DoTest.php b/tests/Loop/DoTest.php
@@ -16,6 +16,14 @@ class DoTest extends TestCase
     public function providerValidCodeParse(): iterable
     {
         return [
+            'doWhileTrue' => [
+                'code' => '<?php
+                    function ret(): int {
+                        do {
+                            return 1;
+                        } while (true);
+                    }'
+            ],
             'doWhileVar' => [
                 'code' => '<?php
                     $worked = false;

diff --git a/tests/Loop/ForTest.php b/tests/Loop/ForTest.php
@@ -16,6 +16,14 @@ class ForTest extends TestCase
     public function providerValidCodeParse(): iterable
     {
         return [
+            'forTrue' => [
+                'code' => '<?php
+                    function ret(): int {
+                        for (;;) {
+                            return 1;
+                        }
+                    }'
+            ],
             'implicitFourthLoop' => [
                 'code' => '<?php
                     function test(): int {

diff --git a/tests/Loop/WhileTest.php b/tests/Loop/WhileTest.php
@@ -14,6 +14,14 @@ class WhileTest extends TestCase
     public function providerValidCodeParse(): iterable
     {
         return [
+            'whileTrue' => [
+                'code' => '<?php
+                    function ret(): int {
+                        do {
+                            return 1;
+                        } while (true);
+                    }'
+            ],
             'whileVar' => [
                 'code' => '<?php
                     $worked = false;