danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 10:38:49 +01:00
Code Issues Projects Releases Wiki Activity

Do not assign array values on object

Browse Source
This commit is contained in:
Matthew Brown 2016-09-22 13:43:53 -04:00
parent 42c8923981
commit f00eb66690
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2279,13 +2279,14 @@ class StatementsChecker
$assignment_key_type = Type::getInt(); $assignment_key_type = Type::getInt();
} }
if ($this->checkExpression($stmt->var, $context, true, $assignment_key_type, $assignment_value_type) === false) { $nesting = 0;
$var_id = self::getVarId($stmt->var, $nesting);
$is_object = $var_id && isset($context->vars_in_scope[$var_id]) && $context->vars_in_scope[$var_id]->hasObjectType();
if ($this->checkExpression($stmt->var, $context, !$is_object, $assignment_key_type, $assignment_value_type) === false) {
return false; return false;
} }
$nesting = 0;
$var_id = self::getVarId($stmt->var, $nesting);
$array_var_id = self::getArrayVarId($stmt->var); $array_var_id = self::getArrayVarId($stmt->var);
$keyed_array_var_id = $array_var_id && $stmt->dim instanceof PhpParser\Node\Scalar\String_ $keyed_array_var_id = $array_var_id && $stmt->dim instanceof PhpParser\Node\Scalar\String_
? $array_var_id . '[\'' . $stmt->dim->value . '\']' ? $array_var_id . '[\'' . $stmt->dim->value . '\']'
@ -2302,7 +2303,7 @@ class StatementsChecker
if (isset($stmt->var->inferredType)) { if (isset($stmt->var->inferredType)) {
$return_type = $stmt->var->inferredType; $return_type = $stmt->var->inferredType;
if ($keyed_array_var_id) { if ($keyed_array_var_id && !$is_object) {
// when we have a pattern like // when we have a pattern like
// $a = []; // $a = [];
// $a['b']['c']['d'] = 1; // $a['b']['c']['d'] = 1;
@ -2320,7 +2321,7 @@ class StatementsChecker
$stmt->inferredType = $assignment_value_type; $stmt->inferredType = $assignment_value_type;
} }
if (!$nesting) { if (!$nesting && !$is_object) {
$assignment_type = new Type\Union([ $assignment_type = new Type\Union([
new Type\Generic( new Type\Generic(
'array', 'array',
@ -3588,6 +3589,8 @@ class StatementsChecker
$nesting = 0; $nesting = 0;
$var_id = self::getVarId($stmt->var, $nesting); $var_id = self::getVarId($stmt->var, $nesting);
$is_object = $var_id && isset($context->vars_in_scope[$var_id]) && $context->vars_in_scope[$var_id]->hasObjectType();
$array_var_id = self::getArrayVarId($stmt->var); $array_var_id = self::getArrayVarId($stmt->var);
$keyed_array_var_id = $array_var_id && $stmt->dim instanceof PhpParser\Node\Scalar\String_ $keyed_array_var_id = $array_var_id && $stmt->dim instanceof PhpParser\Node\Scalar\String_
? $array_var_id . '[\'' . $stmt->dim->value . '\']' ? $array_var_id . '[\'' . $stmt->dim->value . '\']'
@ -3684,7 +3687,7 @@ class StatementsChecker
} }
if ($array_assignment) { if ($array_assignment && !$is_object) {
// if we're in an array assignment then we need to create some variables // if we're in an array assignment then we need to create some variables
// e.g. // e.g.
// $a = []; // $a = [];