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

Check LHS of property when RHS is variable

Browse Source
This commit is contained in:
Matthew Brown 2017-12-18 22:35:03 -05:00
parent 0e6006deda
commit 45fc9fd5d9
2 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Psalm/Checker/Statements/Expression/AssignmentChecker.php
View File

@ -334,15 +334,25 @@ class AssignmentChecker
) {
return false;
}
} elseif ($assign_var instanceof PhpParser\Node\Expr\PropertyFetch && is_string($assign_var->name)) {
self::analyzePropertyAssignment(
$statements_checker,
$assign_var,
$assign_var->name,
$assign_value,
$assign_value_type,
$context
);
} elseif ($assign_var instanceof PhpParser\Node\Expr\PropertyFetch) {
if (is_string($assign_var->name)) {
self::analyzePropertyAssignment(
$statements_checker,
$assign_var,
$assign_var->name,
$assign_value,
$assign_value_type,
$context
);
} else {
if (ExpressionChecker::analyze($statements_checker, $assign_var->name, $context) === false) {
return false;
}
if (ExpressionChecker::analyze($statements_checker, $assign_var->var, $context) === false) {
return false;
}
}
if ($var_id) {
$context->vars_possibly_in_scope[$var_id] = true;
@ -1376,16 +1386,26 @@ class AssignmentChecker
$root_array_expr->inferredType = $root_type;
if ($root_array_expr instanceof PhpParser\Node\Expr\PropertyFetch && is_string($root_array_expr->name)) {
self::analyzePropertyAssignment(
$statements_checker,
$root_array_expr,
$root_array_expr->name,
null,
$root_type,
$context,
false
);
if ($root_array_expr instanceof PhpParser\Node\Expr\PropertyFetch) {
if (is_string($root_array_expr->name)) {
self::analyzePropertyAssignment(
$statements_checker,
$root_array_expr,
$root_array_expr->name,
null,
$root_type,
$context,
false
);
} else {
if (ExpressionChecker::analyze($statements_checker, $root_array_expr->name, $context) === false) {
return false;
}
if (ExpressionChecker::analyze($statements_checker, $root_array_expr->var, $context) === false) {
return false;
}
}
} elseif ($root_var_id) {
if ($context->hasVariable($root_var_id)) {
$context->vars_in_scope[$root_var_id] = $root_type;

10
tests/PropertyTypeTest.php
View File

@ -997,6 +997,16 @@ class PropertyTypeTest extends TestCase
}',
'error_message' => 'PropertyNotSetInConstructor',
],
'badAssignmentToUndefinedVars' => [
'<?php
$x->$y = 4;',
'error_message' => 'UndefinedGlobalVariable',
],
'echoUndefinedPropertyFetch' => [
'<?php
echo $x->$y;',
'error_message' => 'UndefinedGlobalVariable',
],
];
}
}