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

Make sure undeclared array offset vars have type mixed

Browse Source 
Fixes #360
This commit is contained in:
Matthew Brown 2017-12-06 00:35:41 -05:00
parent df90d72ad1
commit a87a1f0dc9
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Psalm/Checker/Statements/ExpressionChecker.php
View File

@ -611,14 +611,19 @@ class ExpressionChecker
);
}
} elseif ($context->check_variables) {
IssueBuffer::add(
if (IssueBuffer::accepts(
new UndefinedVariable(
'Cannot find referenced variable ' . $var_name,
new CodeLocation($statements_checker->getSource(), $stmt)
)
);
),
$statements_checker->getSuppressedIssues()
)) {
return false;
}
return false;
$stmt->inferredType = Type::getMixed();
return null;
}
}
@ -1884,14 +1889,17 @@ class ExpressionChecker
if (!isset($context->vars_possibly_in_scope[$use_var_id])) {
if ($context->check_variables) {
IssueBuffer::add(
if (IssueBuffer::accepts(
new UndefinedVariable(
'Cannot find referenced variable ' . $use_var_id,
new CodeLocation($statements_checker->getSource(), $use)
)
);
),
$statements_checker->getSuppressedIssues()
)) {
return false;
}
return false;
return null;
}
}
@ -1909,18 +1917,21 @@ class ExpressionChecker
return false;
}
return null;
continue;
}
if ($context->check_variables) {
IssueBuffer::add(
if (IssueBuffer::accepts(
new UndefinedVariable(
'Cannot find referenced variable ' . $use_var_id,
new CodeLocation($statements_checker->getSource(), $use)
)
);
),
$statements_checker->getSuppressedIssues()
)) {
return false;
}
return false;
continue;
}
}
}

12
tests/RedundantConditionTest.php
View File

@ -144,6 +144,18 @@ class RedundantConditionTest extends TestCase
if ($a->foo() || $a->bar()) {}',
],
'noEmptyUndefinedArrayVar' => [
'<?php
if (rand(0,1)) {
/** @psalm-suppress UndefinedVariable */
$a = $b[0];
} else {
$a = null;
}
if ($a) {}',
'assertions' => [],
'error_levels' => ['MixedAssignment', 'MixedArrayAccess'],
],
];
}