Skip to content
Permalink
Browse files

Consolidate some fixes from the binaryop branch

  • Loading branch information
muglug committed Dec 6, 2019
1 parent 19838fc commit ef44bd104ec65ab1b0d51c301d951382cddff95e
@@ -467,10 +467,10 @@ function ($carry, Clause $clause) {
/**
* @return \Psalm\Internal\Scope\IfConditionalScope
*/
private static function analyzeIfConditional(
public static function analyzeIfConditional(
StatementsAnalyzer $statements_analyzer,
PhpParser\Node\Expr $cond,
Context $context,
Context $outer_context,
Codebase $codebase,
IfScope $if_scope,
?int $branch_point
@@ -486,32 +486,32 @@ private static function analyzeIfConditional(
$entry_clauses = [];

if ($if_scope->negated_clauses) {
$entry_clauses = array_merge($context->clauses, $if_scope->negated_clauses);
$entry_clauses = array_merge($outer_context->clauses, $if_scope->negated_clauses);

$changed_var_ids = [];

if ($if_scope->negated_types) {
$vars_reconciled = Reconciler::reconcileKeyedTypes(
$if_scope->negated_types,
$context->vars_in_scope,
$outer_context->vars_in_scope,
$changed_var_ids,
[],
$statements_analyzer,
[],
$context->inside_loop,
$outer_context->inside_loop,
new CodeLocation(
$statements_analyzer->getSource(),
$cond instanceof PhpParser\Node\Expr\BooleanNot
? $cond->expr
: $cond,
$context->include_location,
$outer_context->include_location,
false
)
);

if ($changed_var_ids) {
$context = clone $context;
$context->vars_in_scope = $vars_reconciled;
$outer_context = clone $outer_context;
$outer_context->vars_in_scope = $vars_reconciled;

$entry_clauses = array_values(
array_filter(
@@ -528,52 +528,52 @@ function (Clause $c) use ($changed_var_ids) {
}
}

$context->inside_conditional = true;
$outer_context->inside_conditional = true;

$pre_condition_vars_in_scope = $context->vars_in_scope;
$pre_condition_vars_in_scope = $outer_context->vars_in_scope;

$referenced_var_ids = $context->referenced_var_ids;
$context->referenced_var_ids = [];
$referenced_var_ids = $outer_context->referenced_var_ids;
$outer_context->referenced_var_ids = [];

$pre_assigned_var_ids = $context->assigned_var_ids;
$context->assigned_var_ids = [];
$pre_assigned_var_ids = $outer_context->assigned_var_ids;
$outer_context->assigned_var_ids = [];

if ($first_if_cond_expr) {
if (ExpressionAnalyzer::analyze($statements_analyzer, $first_if_cond_expr, $context) === false) {
if (ExpressionAnalyzer::analyze($statements_analyzer, $first_if_cond_expr, $outer_context) === false) {
throw new \Psalm\Exception\ScopeAnalysisException();
}
}

$first_cond_assigned_var_ids = $context->assigned_var_ids;
$context->assigned_var_ids = array_merge(
$first_cond_assigned_var_ids = $outer_context->assigned_var_ids;
$outer_context->assigned_var_ids = array_merge(
$pre_assigned_var_ids,
$first_cond_assigned_var_ids
);

$first_cond_referenced_var_ids = $context->referenced_var_ids;
$context->referenced_var_ids = array_merge(
$first_cond_referenced_var_ids = $outer_context->referenced_var_ids;
$outer_context->referenced_var_ids = array_merge(
$referenced_var_ids,
$first_cond_referenced_var_ids
);

$context->inside_conditional = false;
$outer_context->inside_conditional = false;

$if_context = clone $context;
$if_context = clone $outer_context;

if ($codebase->alter_code) {
$if_context->branch_point = $branch_point;
}

// we need to clone the current context so our ongoing updates to $context don't mess with elseif/else blocks
$original_context = clone $context;
// we need to clone the current context so our ongoing updates to $outer_context don't mess with elseif/else blocks
$original_context = clone $outer_context;

$if_context->inside_conditional = true;

if ($first_if_cond_expr !== $cond) {
$assigned_var_ids = $context->assigned_var_ids;
$assigned_var_ids = $outer_context->assigned_var_ids;
$if_context->assigned_var_ids = [];

$referenced_var_ids = $context->referenced_var_ids;
$referenced_var_ids = $outer_context->referenced_var_ids;
$if_context->referenced_var_ids = [];

if (ExpressionAnalyzer::analyze($statements_analyzer, $cond, $if_context) === false) {
@@ -542,7 +542,7 @@ public static function analyze(
$context->assigned_var_ids[$list_var_id] = true;
$context->possibly_assigned_var_ids[$list_var_id] = true;

$already_in_scope = isset($context->vars_in_scope[$var_id]);
$already_in_scope = isset($context->vars_in_scope[$list_var_id]);

if (strpos($list_var_id, '-') === false && strpos($list_var_id, '[') === false) {
$location = new CodeLocation($statements_analyzer, $var);
@@ -39,125 +39,27 @@ public static function analyze(
PhpParser\Node\Expr\Ternary $stmt,
Context $context
) {
$first_if_cond_expr = IfAnalyzer::getDefinitelyEvaluatedExpression($stmt->cond);

$was_inside_conditional = $context->inside_conditional;

$context->inside_conditional = true;

$pre_condition_vars_in_scope = $context->vars_in_scope;

$referenced_var_ids = $context->referenced_var_ids;
$context->referenced_var_ids = [];

$pre_assigned_var_ids = $context->assigned_var_ids;
$context->assigned_var_ids = [];

if ($first_if_cond_expr) {
if (ExpressionAnalyzer::analyze($statements_analyzer, $first_if_cond_expr, $context) === false) {
return false;
}
}

$first_cond_assigned_var_ids = $context->assigned_var_ids;
$context->assigned_var_ids = array_merge(
$pre_assigned_var_ids,
$first_cond_assigned_var_ids
);

/** @var array<string, bool> */
$first_cond_referenced_var_ids = $context->referenced_var_ids;
$context->referenced_var_ids = array_merge(
$referenced_var_ids,
$first_cond_referenced_var_ids
);

if (!$was_inside_conditional) {
$context->inside_conditional = false;
}

$t_if_context = clone $context;

$t_if_context->inside_conditional = true;

if ($first_if_cond_expr !== $stmt->cond) {
$assigned_var_ids = $context->assigned_var_ids;
$t_if_context->assigned_var_ids = [];

$referenced_var_ids = $context->referenced_var_ids;
$t_if_context->referenced_var_ids = [];

if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->cond, $t_if_context) === false) {
return false;
}

/** @var array<string, bool> */
$more_cond_referenced_var_ids = $t_if_context->referenced_var_ids;
$t_if_context->referenced_var_ids = array_merge(
$more_cond_referenced_var_ids,
$referenced_var_ids
);
$codebase = $statements_analyzer->getCodebase();

$cond_referenced_var_ids = array_merge(
$first_cond_referenced_var_ids,
$more_cond_referenced_var_ids
);
$if_scope = new \Psalm\Internal\Scope\IfScope();

/** @var array<string, bool> */
$more_cond_assigned_var_ids = $t_if_context->assigned_var_ids;
$t_if_context->assigned_var_ids = array_merge(
$more_cond_assigned_var_ids,
$assigned_var_ids
try {
$if_conditional_scope = IfAnalyzer::analyzeIfConditional(
$statements_analyzer,
$stmt->cond,
$context,
$codebase,
$if_scope,
$context->branch_point ?: (int) $stmt->getAttribute('startFilePos')
);

$cond_assigned_var_ids = array_merge(
$first_cond_assigned_var_ids,
$more_cond_assigned_var_ids
);
} else {
$cond_referenced_var_ids = $first_cond_referenced_var_ids;
$if_context = $if_conditional_scope->if_context;

$cond_assigned_var_ids = $first_cond_assigned_var_ids;
$cond_referenced_var_ids = $if_conditional_scope->cond_referenced_var_ids;
} catch (\Psalm\Exception\ScopeAnalysisException $e) {
return false;
}

$newish_var_ids = array_map(
/**
* @param Type\Union $_
*
* @return true
*/
function (Type\Union $_) {
return true;
},
array_diff_key(
$t_if_context->vars_in_scope,
$pre_condition_vars_in_scope,
$cond_referenced_var_ids,
$cond_assigned_var_ids
)
);

// get all the var ids that were referened in the conditional, but not assigned in it
$cond_referenced_var_ids = array_diff_key($cond_referenced_var_ids, $cond_assigned_var_ids);

// remove all newly-asserted var ids too
$cond_referenced_var_ids = array_filter(
$cond_referenced_var_ids,
/**
* @param string $var_id
*
* @return bool
*/
function ($var_id) use ($pre_condition_vars_in_scope) {
return isset($pre_condition_vars_in_scope[$var_id]);
},
ARRAY_FILTER_USE_KEY
);

$cond_referenced_var_ids = array_merge($newish_var_ids, $cond_referenced_var_ids);

$t_if_context->inside_conditional = false;

$codebase = $statements_analyzer->getCodebase();

$if_clauses = \Psalm\Type\Algebra::getFormula(
@@ -221,41 +123,41 @@ function (\Psalm\Internal\Clause $c) use ($mixed_var_ids) {
$changed_var_ids = [];

if ($reconcilable_if_types) {
$t_if_vars_in_scope_reconciled = Reconciler::reconcileKeyedTypes(
$if_vars_in_scope_reconciled = Reconciler::reconcileKeyedTypes(
$reconcilable_if_types,
$t_if_context->vars_in_scope,
$if_context->vars_in_scope,
$changed_var_ids,
$cond_referenced_var_ids,
$statements_analyzer,
[],
$t_if_context->inside_loop,
$if_context->inside_loop,
new CodeLocation($statements_analyzer->getSource(), $stmt->cond)
);

$t_if_context->vars_in_scope = $t_if_vars_in_scope_reconciled;
$if_context->vars_in_scope = $if_vars_in_scope_reconciled;
}

$t_else_context = clone $context;

if ($stmt->if) {
if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->if, $t_if_context) === false) {
if (ExpressionAnalyzer::analyze($statements_analyzer, $stmt->if, $if_context) === false) {
return false;
}

foreach ($t_if_context->vars_in_scope as $var_id => $type) {
foreach ($if_context->vars_in_scope as $var_id => $type) {
if (isset($context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes($context->vars_in_scope[$var_id], $type);
}
}

$context->referenced_var_ids = array_merge(
$context->referenced_var_ids,
$t_if_context->referenced_var_ids
$if_context->referenced_var_ids
);

$context->unreferenced_vars = array_intersect_key(
$context->unreferenced_vars,
$t_if_context->unreferenced_vars
$if_context->unreferenced_vars
);
}

@@ -284,17 +186,17 @@ function (\Psalm\Internal\Clause $c) use ($mixed_var_ids) {
$context->vars_in_scope[$var_id],
$type
);
} elseif (isset($t_if_context->vars_in_scope[$var_id])) {
} elseif (isset($if_context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes(
$t_if_context->vars_in_scope[$var_id],
$if_context->vars_in_scope[$var_id],
$type
);
}
}

$context->vars_possibly_in_scope = array_merge(
$context->vars_possibly_in_scope,
$t_if_context->vars_possibly_in_scope,
$if_context->vars_possibly_in_scope,
$t_else_context->vars_possibly_in_scope
);

@@ -313,8 +215,8 @@ function (\Psalm\Internal\Clause $c) use ($mixed_var_ids) {
$context->unreferenced_vars[$var_id] += $t_else_context->unreferenced_vars[$var_id];
}

if (isset($t_if_context->unreferenced_vars[$var_id])) {
$context->unreferenced_vars[$var_id] += $t_if_context->unreferenced_vars[$var_id];
if (isset($if_context->unreferenced_vars[$var_id])) {
$context->unreferenced_vars[$var_id] += $if_context->unreferenced_vars[$var_id];
}
}

0 comments on commit ef44bd1

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