danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Add a more homogenous solution

Browse Source
This commit is contained in:
Matthew Brown 2022-04-06 12:10:11 -04:00
parent 4cfab0c441
commit c8cc3f4607
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/AndAnalyzer.php
View File

@ -129,15 +129,14 @@ class AndAnalyzer
$changed_var_ids = [];
$right_context = clone $left_context;
if ($left_type_assertions) {
$right_context = clone $context;
// while in an and, we allow scope to boil over to support
// statements of the form if ($x && $x->foo())
$right_vars_in_scope = Reconciler::reconcileKeyedTypes(
$left_type_assertions,
$active_left_assertions,
$context->vars_in_scope,
$right_context->vars_in_scope,
$context->references_in_scope,
$changed_var_ids,
$left_referenced_var_ids,
@ -149,6 +148,8 @@ class AndAnalyzer
);
$right_context->vars_in_scope = $right_vars_in_scope;
} else {
$right_context = clone $left_context;
}
$partitioned_clauses = Context::removeReconciledClauses($left_clauses, $changed_var_ids);