From 3535324842677fa4d59042bdb429ac1245fdc472 Mon Sep 17 00:00:00 2001
From: Evan Shaw <evan.shaw@lightspeedhq.com>
Date: Mon, 26 Feb 2024 21:28:59 +1300
Subject: [PATCH] Fix new errors

---
 .../Analyzer/Statements/Block/IfConditionalAnalyzer.php       | 4 ++--
 src/Psalm/Internal/Type/SimpleAssertionReconciler.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php
index 349eaf5ff0a..c00803dd1da 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php
@@ -23,7 +23,7 @@
 
 use function array_diff_key;
 use function array_filter;
-use function array_keys;
+use function array_key_first;
 use function array_merge;
 use function array_values;
 use function count;
@@ -80,7 +80,7 @@ public static function analyze(
                             $entry_clauses,
                             static fn(Clause $c): bool => count($c->possibilities) > 1
                                 || $c->wedge
-                                || !isset($changed_var_ids[array_keys($c->possibilities)[0]])
+                                || !isset($changed_var_ids[array_key_first($c->possibilities)])
                         ),
                     );
                 }
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
index c8bd3c1b21d..ed40b070143 100644
--- a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
+++ b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -2982,7 +2982,7 @@ private static function reconcileValueOf(
                 continue;
             }
 
-            $enum_case = $class_storage->enum_cases[$atomic_type->const_name] ?? null;
+            $enum_case = $class_storage->enum_cases[$enum_case_to_assert] ?? null;
             if ($enum_case === null) {
                 return null;
             }