Fix vimeo#4327 - make sure loop always returns

danog · Jan 29, 2021 · 84126fb · 84126fb
1 parent c15fabb
commit 84126fb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php b/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
@@ -286,8 +286,11 @@ function ($action) {
 
                 $control_actions = array_filter(
                     array_merge($control_actions, $do_actions),
-                    function ($action) {
-                        return $action !== self::ACTION_NONE;
+                    function ($action) use ($break_types) {
+                        return $action !== self::ACTION_NONE
+                            && ($break_types
+                                || ($action !== self::ACTION_CONTINUE
+                                    && $action !== self::ACTION_BREAK));
                     }
                 );
             }

diff --git a/tests/SwitchTypeTest.php b/tests/SwitchTypeTest.php
@@ -999,6 +999,21 @@ function getRows(string $s) : int {
                         }
                     }'
             ],
+            'loopWithSwitchAlwaysReturns' => [
+                '<?php
+                    function b(): int {
+                        foreach([1,2] as $i) {
+                            continue;
+                        }
+
+                        switch (random_int(1, 10)) {
+                            case 1:
+                                return 1;
+                            default:
+                                return 2;
+                        }
+                    }',
+            ],
         ];
     }
 
@@ -1270,6 +1285,22 @@ function foo() {
                     }',
                 'error_message' => 'ParadoxicalCondition'
             ],
+            'loopWithSwitchDoesntReturnFirstCase' => [
+                '<?php
+                    function b(): int {
+                        switch (random_int(1, 10)) {
+                            case 1:
+                                foreach([1,2] as $i) {
+                                    continue;
+                                }
+                                break;
+
+                            default:
+                                return 2;
+                        }
+                    }',
+                'error_message' => 'InvalidReturnType'
+            ],
         ];
     }
 }