Merge pull request #10455 from nicelocal/small_assertion_fix

Small assertion fix
vimeo · Dec 7, 2023 · 0c6d9d3 · 0c6d9d3
2 parents ea06da7 + 6650bd8
commit 0c6d9d3
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -171,6 +171,7 @@ public static function reconcileKeyedTypes(
             $has_negation = false;
             $has_isset = false;
             $has_inverted_isset = false;
+            $has_inverted_key_exists = false;
             $has_truthy_or_falsy_or_empty = false;
             $has_empty = false;
             $has_count_check = false;
@@ -201,7 +202,9 @@ public static function reconcileKeyedTypes(
                         && $new_type_part_part instanceof IsIdentical;
 
                     $has_inverted_isset = $has_inverted_isset
-                        || $new_type_part_part instanceof IsNotIsset
+                        || $new_type_part_part instanceof IsNotIsset;
+
+                    $has_inverted_key_exists = $has_inverted_key_exists
                         || $new_type_part_part instanceof ArrayKeyDoesNotExist;
 
                     $has_count_check = $has_count_check
@@ -221,6 +224,7 @@ public static function reconcileKeyedTypes(
                 $code_location,
                 $has_isset,
                 $has_inverted_isset,
+                $has_inverted_key_exists,
                 $has_empty,
                 $inside_loop,
                 $has_object_array_access,
@@ -334,7 +338,12 @@ public static function reconcileKeyedTypes(
             if ($type_changed || $failed_reconciliation) {
                 $changed_var_ids[$key] = true;
 
-                if (substr($key, -1) === ']' && !$has_inverted_isset && !$has_empty && !$is_equality) {
+                if (substr($key, -1) === ']'
+                    && !$has_inverted_isset
+                    && !$has_inverted_key_exists
+                    && !$has_empty
+                    && !$is_equality
+                ) {
                     self::adjustTKeyedArrayType(
                         $key_parts,
                         $existing_types,
@@ -648,6 +657,7 @@ private static function getValueForKey(
         ?CodeLocation $code_location,
         bool $has_isset,
         bool $has_inverted_isset,
+        bool $has_inverted_key_exists,
         bool $has_empty,
         bool $inside_loop,
         bool &$has_object_array_access
@@ -723,11 +733,17 @@ private static function getValueForKey(
 
                             $new_base_type_candidate = $existing_key_type_part->type_params[1];
 
-                            if ($new_base_type_candidate->isMixed() && !$has_isset && !$has_inverted_isset) {
+                            if ($new_base_type_candidate->isMixed()
+                                && !$has_isset
+                                && !$has_inverted_isset
+                                && !$has_inverted_key_exists
+                            ) {
                                 return $new_base_type_candidate;
                             }
 
-                            if (($has_isset || $has_inverted_isset) && isset($new_assertions[$new_base_key])) {
+                            if (($has_isset || $has_inverted_isset || $has_inverted_key_exists)
+                                && isset($new_assertions[$new_base_key])
+                            ) {
                                 if ($has_inverted_isset && $new_base_key === $key) {
                                     $new_base_type_candidate = $new_base_type_candidate->getBuilder();
                                     $new_base_type_candidate->addType(new TNull);
@@ -756,7 +772,7 @@ private static function getValueForKey(
                         } elseif ($existing_key_type_part instanceof TString) {
                             $new_base_type_candidate = Type::getString();
                         } elseif ($existing_key_type_part instanceof TNamedObject
-                            && ($has_isset || $has_inverted_isset)
+                            && ($has_isset || $has_inverted_isset || $has_inverted_key_exists)
                         ) {
                             $has_object_array_access = true;