Skip to content
Permalink
Browse files

Change $op_ to $right in a few more places

  • Loading branch information
muglug committed Jan 6, 2020
1 parent 9149f46 commit 49d9dd12b6eaad1503628f0429e57f0b7a494483
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php
@@ -177,7 +177,7 @@ function ($c) use ($reconciled_expression_clauses) {
if ($left_type_assertions) {
// while in an and, we allow scope to boil over to support
// statements of the form if ($x && $x->foo())
$op_vars_in_scope = Reconciler::reconcileKeyedTypes(
$right_vars_in_scope = Reconciler::reconcileKeyedTypes(
$left_type_assertions,
$active_left_assertions,
$context->vars_in_scope,
@@ -189,7 +189,7 @@ function ($c) use ($reconciled_expression_clauses) {
new CodeLocation($statements_analyzer->getSource(), $stmt)
);

$right_context->vars_in_scope = $op_vars_in_scope;
$right_context->vars_in_scope = $right_vars_in_scope;

if ($context->if_scope) {
$context->if_scope->if_cond_changed_var_ids += $changed_var_ids;
@@ -391,7 +391,7 @@ function ($c) use ($reconciled_expression_clauses) {
if ($negated_type_assertions) {
// while in an or, we allow scope to boil over to support
// statements of the form if ($x === null || $x->foo())
$op_vars_in_scope = Reconciler::reconcileKeyedTypes(
$right_vars_in_scope = Reconciler::reconcileKeyedTypes(
$negated_type_assertions,
$active_negated_type_assertions,
$right_context->vars_in_scope,
@@ -402,7 +402,7 @@ function ($c) use ($reconciled_expression_clauses) {
$left_context->inside_loop,
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
$right_context->vars_in_scope = $op_vars_in_scope;
$right_context->vars_in_scope = $right_vars_in_scope;
}

$right_context->clauses = $clauses_for_right_analysis;

0 comments on commit 49d9dd1

Please sign in to comment.
You can’t perform that action at this time.