Merge branch 'fix_array_key_exists_negation' into fix_literal_union_key

Author: danog

src/Psalm/Internal/Analyzer/Statements/Block/IfElse/IfAnalyzer.php

@@ -34,14 +34,11 @@
 use function array_keys;
 use function array_merge;
 use function array_reduce;
-use function array_unique;
 use function count;
 use function in_array;
 use function preg_match;
 use function preg_quote;
 use function spl_object_id;
-use function strpos;
-use function substr;
 
 /**
  * @internal
@@ -272,20 +269,6 @@ public static function analyze(
                 array_keys($if_scope->negated_types),
             );
 
-            $extra_vars_to_update = [];
-
-            // if there's an object-like array in there, we also need to update the root array variable
-            foreach ($vars_to_update as $var_id) {
-                $bracked_pos = strpos($var_id, '[');
-                if ($bracked_pos !== false) {
-                    $extra_vars_to_update[] = substr($var_id, 0, $bracked_pos);
-                }
-            }
-
-            if ($extra_vars_to_update) {
-                $vars_to_update = array_unique(array_merge($extra_vars_to_update, $vars_to_update));
-            }
-
             $outer_context->update(
                 $old_if_context,
                 $if_context,

src/Psalm/Type/Reconciler.php

@@ -20,6 +20,7 @@
 use Psalm\Issue\TypeDoesNotContainType;
 use Psalm\IssueBuffer;
 use Psalm\Storage\Assertion;
+use Psalm\Storage\Assertion\ArrayKeyDoesNotExist;
 use Psalm\Storage\Assertion\ArrayKeyExists;
 use Psalm\Storage\Assertion\Empty_;
 use Psalm\Storage\Assertion\Falsy;
@@ -197,7 +198,9 @@ public static function reconcileKeyedTypes(
                     $is_equality = $is_equality
                         && $new_type_part_part instanceof IsIdentical;
 
-                    $has_inverted_isset = $has_inverted_isset || $new_type_part_part instanceof IsNotIsset;
+                    $has_inverted_isset = $has_inverted_isset
+                        || $new_type_part_part instanceof IsNotIsset
+                        || $new_type_part_part instanceof ArrayKeyDoesNotExist;
 
                     $has_count_check = $has_count_check
                         || $new_type_part_part instanceof NonEmptyCountable;

tests/TypeReconciliation/ArrayKeyExistsTest.php

@@ -46,6 +46,28 @@ function three(array $a): void {
                         echo $a["a"];
                         echo $a["b"];
                     }',
+            ],
+             'arrayKeyExistsNegation' => [
+                'code' => '<?php
+                    function getMethodName(array $data = []): void {
+                        if (\array_key_exists("custom_name", $data) && $data["custom_name"] !== null) {
+                        }
+                        /** @psalm-check-type-exact $data = array<array-key, mixed> */
+                    }
+                ',
+            ],
+            'arrayKeyExistsNoSideEffects' => [
+                'code' => '<?php
+                    function getMethodName(array $ddata = []): void {
+                        if (\array_key_exists("redirect", $ddata)) {
+                            return;
+                        }
+                        if (random_int(0, 1)) {
+                            $ddata["type"] = "test";
+                        }
+                        /** @psalm-check-type-exact $ddata = array<array-key, mixed> */
+                    }
+                ',
             ],
             'arrayKeyExistsTwice' => [
                 'code' => '<?php