always unflag before leaving a analyzer

orklah · orklah · commit f3e36b0966c0 · 2021-12-21T00:03:32.000+01:00
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php
@@ -223,6 +223,8 @@ public static function analyze(
         $was_inside_general_use = $context->inside_general_use;
         $context->inside_general_use = true;
         if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {
+            $context->inside_general_use = $was_inside_general_use;
+
             return false;
         }
         $context->inside_general_use = $was_inside_general_use;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ArrayAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ArrayAnalyzer.php
@@ -311,6 +311,8 @@ private static function analyzeArrayItem(
             $was_inside_general_use = $context->inside_general_use;
             $context->inside_general_use = true;
             if (ExpressionAnalyzer::analyze($statements_analyzer, $item->key, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return;
             }
             $context->inside_general_use = $was_inside_general_use;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php
@@ -712,6 +712,8 @@ private static function analyzeNestedArrayAssignment(
                     $child_stmt->dim,
                     $context
                 ) === false) {
+                    $context->inside_general_use = $was_inside_general_use;
+
                     return;
                 }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/StaticPropertyAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/StaticPropertyAssignmentAnalyzer.php
@@ -82,6 +82,8 @@ public static function analyze(
                 $context->inside_general_use = true;
 
                 if (ExpressionAnalyzer::analyze($statements_analyzer, $prop_name, $context) === false) {
+                    $context->inside_general_use = $was_inside_general_use;
+
                     return false;
                 }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -236,6 +236,8 @@ public static function analyze(
             }
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $assign_value, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 if ($var_id) {
                     if ($array_var_id) {
                         $context->removeDescendents($array_var_id, null, $assign_value_type);
@@ -1498,10 +1500,14 @@ private static function analyzePropertyAssignment(
             // this can happen when the user actually means to type $this-><autocompleted>, but there's
             // a variable on the next line
             if (ExpressionAnalyzer::analyze($statements_analyzer, $assign_var->var, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return;
             }
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $assign_var->name, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return;
             }
 
@@ -1690,6 +1696,8 @@ private static function analyzeAssignmentToVariable(
             $context->inside_general_use = true;
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $assign_var->name, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return;
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
@@ -211,6 +211,8 @@ public static function analyze(
             $context->inside_call = true;
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $arg->value, $context) === false) {
+                $context->inside_call = $was_inside_call;
+
                 return false;
             }
 
@@ -1116,6 +1118,8 @@ private static function evaluateArbitraryParam(
             $context->inside_call = true;
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $arg->value, $context) === false) {
+                $context->inside_call = $was_inside_call;
+
                 return false;
             }
 
@@ -1225,6 +1229,8 @@ private static function handleByRefFunctionArg(
                 $arg->value,
                 $context
             ) === false) {
+                $context->inside_assignment = $was_inside_assignment;
+
                 return false;
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php
@@ -163,6 +163,8 @@ function ($arg) {
                     $args[$i]->value,
                     $context
                 ) === false) {
+                    $context->inside_assignment = $was_inside_assignment;
+
                     return false;
                 }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
@@ -61,6 +61,8 @@ public static function analyze(
         if ($existing_stmt_var_type) {
             $statements_analyzer->node_data->setType($stmt->var, $existing_stmt_var_type);
         } elseif (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {
+            $context->inside_call = $was_inside_call;
+
             return false;
         }
 
@@ -70,6 +72,8 @@ public static function analyze(
             $context->inside_call = true;
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->name, $context) === false) {
+                $context->inside_call = $was_inside_call;
+
                 return false;
             }
         }
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php
@@ -186,6 +186,8 @@ public static function analyze(
             $was_inside_general_use = $context->inside_general_use;
             $context->inside_general_use = true;
             if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return false;
             }
             $context->inside_general_use = $was_inside_general_use;
@@ -208,6 +210,8 @@ public static function analyze(
             $was_inside_general_use = $context->inside_general_use;
             $context->inside_general_use = true;
             if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {
+                $context->inside_general_use = $was_inside_general_use;
+
                 return false;
             }
             $context->inside_general_use = $was_inside_general_use;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -119,6 +119,9 @@ public static function analyze(
             $context->inside_unset = false;
 
             if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->dim, $context) === false) {
+                $context->inside_unset = $was_inside_unset;
+                $context->inside_general_use = $was_inside_general_use;
+
                 return false;
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ClassConstFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ClassConstFetchAnalyzer.php
@@ -380,6 +380,8 @@ public static function analyze(
         $context->inside_general_use = true;
 
         if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->class, $context) === false) {
+            $context->inside_general_use = $was_inside_general_use;
+
             return false;
         }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/InstancePropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/InstancePropertyFetchAnalyzer.php
@@ -51,6 +51,8 @@ public static function analyze(
         }
 
         if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {
+            $context->inside_general_use = $was_inside_general_use;
+
             return false;
         }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php
@@ -67,6 +67,8 @@ public static function analyze(
         $context->inside_call = true;
 
         if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {
+            $context->inside_call = $was_inside_call;
+
             return false;
         }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/InstanceofAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/InstanceofAnalyzer.php
@@ -25,6 +25,8 @@ public static function analyze(
         $context->inside_general_use = true;
 
         if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {
+            $context->inside_general_use = $was_inside_general_use;
+
             return false;
         }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/YieldFromAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/YieldFromAnalyzer.php
@@ -47,6 +47,8 @@ public static function analyze(
                 $always_non_empty_array
             ) === false
             ) {
+                $context->inside_call = $was_inside_call;
+
                 return false;
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
@@ -453,6 +453,8 @@ private static function handleExpression(
             $was_inside_call = $context->inside_call;
             $context->inside_call = true;
             if (PrintAnalyzer::analyze($statements_analyzer, $stmt, $context) === false) {
+                $context->inside_call = $was_inside_call;
+
                 return false;
             }
             $context->inside_call = $was_inside_call;

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ public static function analyze(`
`223`	`223`	`$was_inside_general_use = $context->inside_general_use;`
`224`	`224`	`$context->inside_general_use = true;`
`225`	`225`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {`
	`226`	`+ $context->inside_general_use = $was_inside_general_use;`
	`227`	`+`
`226`	`228`	`return false;`
`227`	`229`	`}`
`228`	`230`	`$context->inside_general_use = $was_inside_general_use;`
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,8 @@ private static function analyzeArrayItem(`
`311`	`311`	`$was_inside_general_use = $context->inside_general_use;`
`312`	`312`	`$context->inside_general_use = true;`
`313`	`313`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $item->key, $context) === false) {`
	`314`	`+ $context->inside_general_use = $was_inside_general_use;`
	`315`	`+`
`314`	`316`	`return;`
`315`	`317`	`}`
`316`	`318`	`$context->inside_general_use = $was_inside_general_use;`
Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,8 @@ private static function analyzeNestedArrayAssignment(`
`712`	`712`	`$child_stmt->dim,`
`713`	`713`	`$context`
`714`	`714`	`) === false) {`
	`715`	`+ $context->inside_general_use = $was_inside_general_use;`
	`716`	`+`
`715`	`717`	`return;`
`716`	`718`	`}`
`717`	`719`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ public static function analyze(`
`82`	`82`	`$context->inside_general_use = true;`
`83`	`83`
`84`	`84`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $prop_name, $context) === false) {`
	`85`	`+ $context->inside_general_use = $was_inside_general_use;`
	`86`	`+`
`85`	`87`	`return false;`
`86`	`88`	`}`
`87`	`89`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,8 @@ function ($arg) {`
`163`	`163`	`$args[$i]->value,`
`164`	`164`	`$context`
`165`	`165`	`) === false) {`
	`166`	`+ $context->inside_assignment = $was_inside_assignment;`
	`167`	`+`
`166`	`168`	`return false;`
`167`	`169`	`}`
`168`	`170`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ public static function analyze(`
`61`	`61`	`if ($existing_stmt_var_type) {`
`62`	`62`	`$statements_analyzer->node_data->setType($stmt->var, $existing_stmt_var_type);`
`63`	`63`	`} elseif (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {`
	`64`	`+ $context->inside_call = $was_inside_call;`
	`65`	`+`
`64`	`66`	`return false;`
`65`	`67`	`}`
`66`	`68`
`@@ -70,6 +72,8 @@ public static function analyze(`
`70`	`72`	`$context->inside_call = true;`
`71`	`73`
`72`	`74`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->name, $context) === false) {`
	`75`	`+ $context->inside_call = $was_inside_call;`
	`76`	`+`
`73`	`77`	`return false;`
`74`	`78`	`}`
`75`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,9 @@ public static function analyze(`
`119`	`119`	`$context->inside_unset = false;`
`120`	`120`
`121`	`121`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->dim, $context) === false) {`
	`122`	`+ $context->inside_unset = $was_inside_unset;`
	`123`	`+ $context->inside_general_use = $was_inside_general_use;`
	`124`	`+`
`122`	`125`	`return false;`
`123`	`126`	`}`
`124`	`127`
Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,8 @@ public static function analyze(`
`380`	`380`	`$context->inside_general_use = true;`
`381`	`381`
`382`	`382`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->class, $context) === false) {`
	`383`	`+ $context->inside_general_use = $was_inside_general_use;`
	`384`	`+`
`383`	`385`	`return false;`
`384`	`386`	`}`
`385`	`387`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ public static function analyze(`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->var, $context) === false) {`
	`54`	`+ $context->inside_general_use = $was_inside_general_use;`
	`55`	`+`
`54`	`56`	`return false;`
`55`	`57`	`}`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ public static function analyze(`
`67`	`67`	`$context->inside_call = true;`
`68`	`68`
`69`	`69`	`if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context) === false) {`
	`70`	`+ $context->inside_call = $was_inside_call;`
	`71`	`+`
`70`	`72`	`return false;`
`71`	`73`	`}`
`72`	`74`