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

Improve switch checking (again) and fix null arg types

Browse Source
This commit is contained in:
Matthew Brown 2016-06-29 18:10:41 -04:00
parent a93c54da0d
commit e0c16308a8
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CodeInspector/ScopeChecker.php
View File

@ -59,7 +59,7 @@ class ScopeChecker
for ($i = count($stmt->cases) - 1; $i >= 0; $i--) {
$case = $stmt->cases[$i];
$case_does_leave = self::doesLeaveBlock($case->stmts, false);
$case_does_leave = self::doesEverBreakOrContinue($case->stmts, true);
if ($case_does_leave) {
$has_left = true;

28
src/CodeInspector/StatementsChecker.php
View File

@ -2455,6 +2455,8 @@ class StatementsChecker
$case_exit_types = new \SplFixedArray(count($stmt->cases));
$has_default = false;
// create a map of case statement -> ultimate exit type
for ($i = count($stmt->cases) - 1; $i >= 0; $i--) {
$case = $stmt->cases[$i];
@ -2506,7 +2508,7 @@ class StatementsChecker
// has a return/throw at end
$has_ending_statments = ScopeChecker::doesReturnOrThrow($case->stmts);
if (!$case_exit_type !== 'return_throw') {
if ($case_exit_type !== 'return_throw') {
$vars = array_diff_key($case_context->vars_possibly_in_scope, $context->vars_possibly_in_scope);
// if we're leaving this block, add vars to outer for loop scope
@ -2554,16 +2556,20 @@ class StatementsChecker
$case_types = [];
}
// only update vars if there is a default
// if that default has a throw/return/continue, that should be handled above
if ($case->cond === null) {
if ($new_vars_in_scope) {
$context->vars_in_scope = array_merge($context->vars_in_scope, $new_vars_in_scope);
}
if (!$case->cond) {
$has_default = true;
}
}
if ($redefined_vars) {
$context->vars_in_scope = array_merge($context->vars_in_scope, $redefined_vars);
}
// only update vars if there is a default
// if that default has a throw/return/continue, that should be handled above
if ($has_default) {
if ($new_vars_in_scope) {
$context->vars_in_scope = array_merge($context->vars_in_scope, $new_vars_in_scope);
}
if ($redefined_vars) {
$context->vars_in_scope = array_merge($context->vars_in_scope, $redefined_vars);
}
}
@ -2593,7 +2599,7 @@ class StatementsChecker
return;
}
if ($param_type->isNullable() && !$param_type->isNullable()) {
if ($input_type->isNullable() && !$param_type->isNullable()) {
if (IssueBuffer::accepts(
new NullReference(
'Argument ' . ($argument_offset + 1) . ' of ' . $method_id . ' cannot be null, possibly null value provided',