Fix issues

vimeo · Sep 1, 2020 · 3cdb13f · 3cdb13f
1 parent 9404597
commit 3cdb13f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php
@@ -133,17 +133,21 @@ public static function analyze(
             $statements_analyzer->removeSuppressedIssues(['RedundantConditionGivenDocblockType']);
         }
 
-        if ($switch_var_id) {
+        if ($switch_var_id && $last_arm->conds) {
             $codebase = $statements_analyzer->getCodebase();
 
-            $all_conds = $last_arm->conds ?: [];
+            $all_conds = $last_arm->conds;
 
             foreach ($arms as $arm) {
+                if (!$arm->conds) {
+                    throw new \UnexpectedValueException('bad');
+                }
+
                 $all_conds = array_merge($arm->conds, $all_conds);
             }
 
             $all_match_condition = self::convertCondsToConditional(
-                $all_conds,
+                array_values($all_conds),
                 $match_condition,
                 $match_condition->getAttributes()
             );

diff --git a/src/Psalm/Issue/UnhandledMatchCondition.php b/src/Psalm/Issue/UnhandledMatchCondition.php
@@ -0,0 +1,8 @@
+<?php
+namespace Psalm\Issue;
+
+class UnhandledMatchCondition extends CodeIssue
+{
+    const ERROR_LEVEL = 7;
+    const SHORTCODE = 236;
+}
diff --git a/tests/MatchTest.php b/tests/MatchTest.php
@@ -136,7 +136,7 @@ function foo(string $foo): string {
                             "foo" => "foo",
                         };
                     }',
-                'error_message' => 'ParadoxicalCondition',
+                'error_message' => 'UnhandledMatchCondition',
                 [],
                 false,
                 '8.0',