danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix false-positive

Browse Source
This commit is contained in:
Brown 2020-05-02 21:56:28 -04:00
parent 3e0c4cfb75
commit d3fba74f75
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
View File

@ -509,6 +509,7 @@ class AssignmentAnalyzer
);
$new_assign_type = null;
$assigned = false;
foreach ($assign_value_type->getAtomicTypes() as $assign_value_atomic_type) {
if ($assign_value_atomic_type instanceof Type\Atomic\ObjectLike
@ -541,6 +542,8 @@ class AssignmentAnalyzer
$doc_comment
);
$assigned = true;
continue;
}
@ -713,43 +716,45 @@ class AssignmentAnalyzer
}
}
foreach ($var_comments as $var_comment) {
if (!$var_comment->type) {
continue;
}
try {
if ($var_comment->var_id === $list_var_id) {
$var_comment_type = ExpressionAnalyzer::fleshOutType(
$codebase,
$var_comment->type,
$context->self,
$context->self,
$statements_analyzer->getParentFQCLN()
);
$var_comment_type->setFromDocblock();
$new_assign_type = $var_comment_type;
break;
if (!$assigned) {
foreach ($var_comments as $var_comment) {
if (!$var_comment->type) {
continue;
}
} catch (\UnexpectedValueException $e) {
if (IssueBuffer::accepts(
new InvalidDocblock(
(string)$e->getMessage(),
new CodeLocation($statements_analyzer->getSource(), $assign_var)
)
)) {
// fall through
try {
if ($var_comment->var_id === $list_var_id) {
$var_comment_type = ExpressionAnalyzer::fleshOutType(
$codebase,
$var_comment->type,
$context->self,
$context->self,
$statements_analyzer->getParentFQCLN()
);
$var_comment_type->setFromDocblock();
$new_assign_type = $var_comment_type;
break;
}
} catch (\UnexpectedValueException $e) {
if (IssueBuffer::accepts(
new InvalidDocblock(
(string)$e->getMessage(),
new CodeLocation($statements_analyzer->getSource(), $assign_var)
)
)) {
// fall through
}
}
}
}
if ($list_var_id) {
$context->vars_in_scope[$list_var_id] = $new_assign_type ?: Type::getMixed();
if ($list_var_id) {
$context->vars_in_scope[$list_var_id] = $new_assign_type ?: Type::getMixed();
if ($context->error_suppressing && ($offset || $can_be_empty)) {
$context->vars_in_scope[$list_var_id]->addType(new Type\Atomic\TNull);
if ($context->error_suppressing && ($offset || $can_be_empty)) {
$context->vars_in_scope[$list_var_id]->addType(new Type\Atomic\TNull);
}
}
}
}