Merge pull request #10753 from edsrzf/arguments-isset-disable

vimeo · Feb 27, 2024 · 9aa450b · 9aa450b
2 parents 60badd0 + 22f32c1
commit 9aa450b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
@@ -231,6 +231,9 @@ public static function analyze(
             $was_inside_call = $context->inside_call;
             $context->inside_call = true;
 
+            $was_inside_isset = $context->inside_isset;
+            $context->inside_isset = false;
+
             if (ExpressionAnalyzer::analyze(
                 $statements_analyzer,
                 $arg->value,
@@ -240,11 +243,13 @@ public static function analyze(
                 false,
                 $high_order_template_result,
             ) === false) {
+                $context->inside_isset = $was_inside_isset;
                 $context->inside_call = $was_inside_call;
 
                 return false;
             }
 
+            $context->inside_isset = $was_inside_isset;
             $context->inside_call = $was_inside_call;
 
             if ($high_order_callable_info && $high_order_template_result) {

diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -2506,6 +2506,16 @@ public function foo() : void {
                     }',
                 'error_message' => 'InvalidArgument',
             ],
+            'clearIssetContext' => [
+                'code' => '<?php
+                    function greet(bool $arg): ?string
+                    {
+                        return $arg ? "hi" : null;
+                    }
+
+                    echo greet($undef) ?? "bye";',
+                'error_message' => 'UndefinedGlobalVariable',
+            ],
             'mixedArgument' => [
                 'code' => '<?php
                     function fooFoo(int $a): void {}