Fix vimeo#4519 - prevent crash with empty match

danog · Jan 29, 2021 · ec9d8e6 · ec9d8e6
1 parent e2eee4c
commit ec9d8e6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php
@@ -79,6 +79,20 @@ public static function analyze(
 
         $last_arm = array_shift($arms);
 
+        if (!$last_arm) {
+            if (\Psalm\IssueBuffer::accepts(
+                new UnhandledMatchCondition(
+                    'This match expression does not match anything',
+                    new \Psalm\CodeLocation($statements_analyzer->getSource(), $match_condition)
+                ),
+                $statements_analyzer->getSuppressedIssues()
+            )) {
+                // continue
+            }
+
+            return false;
+        }
+
         $old_node_data = $statements_analyzer->node_data;
 
         $statements_analyzer->node_data = clone $statements_analyzer->node_data;

diff --git a/tests/MatchTest.php b/tests/MatchTest.php
@@ -176,6 +176,18 @@ function foo(int $i) : void {
                 false,
                 '8.0',
             ],
+            'noCrashWithEmptyMatch' => [
+                '<?php
+                    function foo(int $i) {
+                        match ($i) {
+
+                        };
+                    }',
+                'error_message' => 'UnhandledMatchCondition',
+                [],
+                false,
+                '8.0',
+            ],
         ];
     }
 }