danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix erroneous array assignment

Browse Source
This commit is contained in:
Matthew Brown 2016-09-21 19:14:44 -04:00
parent 37aae5d731
commit abae0a9cae
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Checker/StatementsChecker.php
View File

@ -2280,10 +2280,6 @@ class StatementsChecker
//
// When making assignments, we generally only know the shape of the array
// as it is being created.
if ($assignment_key_type) {
}
if (isset($stmt->var->inferredType)) {
$return_type = $stmt->var->inferredType;
@ -2300,15 +2296,7 @@ class StatementsChecker
// typeof $a['c'] => int
// typeof $a => array<string,int|array<string,array<string,int>>>
if (isset($context->vars_in_scope[$keyed_array_var_id])) {
$context->vars_in_scope[$keyed_array_var_id] = Type::combineUnionTypes(
$assignment_value_type,
$context->vars_in_scope[$keyed_array_var_id]
);
}
else {
$context->vars_in_scope[$keyed_array_var_id] = $assignment_value_type;
}
$context->vars_in_scope[$keyed_array_var_id] = $assignment_value_type;
$stmt->inferredType = $assignment_value_type;
}