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 issue with possibly-redefined switch vars

Browse Source
This commit is contained in:
Matthew Brown 2017-03-14 02:00:38 -04:00
parent 50b629e88e
commit 9dd94d099f
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Psalm/Checker/Statements/Block/IfChecker.php
View File

@ -594,7 +594,11 @@ class IfChecker
$negated_keys = []; $negated_keys = [];
foreach ($negated_elseif_types as $var_id => $type) { foreach ($negated_elseif_types as $var_id => $type) {
if (!$has_leaving_statements || $type !== '!empty') { if (!$has_leaving_statements ||
$type !== '!empty' ||
!isset($elseif_context->vars_in_scope[$var_id]) ||
$elseif_context->vars_in_scope[$var_id]->hasObjectType()
) {
$negated_keys[] = $var_id; $negated_keys[] = $var_id;
} }
} }

20
src/Psalm/Checker/Statements/Block/SwitchChecker.php
View File

@ -45,6 +45,7 @@ class SwitchChecker
$new_vars_possibly_in_scope = []; $new_vars_possibly_in_scope = [];
$redefined_vars = null; $redefined_vars = null;
$possibly_redefined_vars = null;
// the last statement always breaks, by default // the last statement always breaks, by default
$last_case_exit_type = 'break'; $last_case_exit_type = 'break';
@ -148,6 +149,21 @@ class SwitchChecker
Type::redefineGenericUnionTypes($case_redefined_vars, $context); Type::redefineGenericUnionTypes($case_redefined_vars, $context);
if ($possibly_redefined_vars === null) {
$possibly_redefined_vars = $case_redefined_vars;
} else {
foreach ($case_redefined_vars as $var_id => $type) {
if (!isset($possibly_redefined_vars[$var_id])) {
$possibly_redefined_vars[$var_id] = $type;
} else {
$possibly_redefined_vars[$var_id] = Type::combineUnionTypes(
$type,
$possibly_redefined_vars[$var_id]
);
}
}
}
if ($redefined_vars === null) { if ($redefined_vars === null) {
$redefined_vars = $case_redefined_vars; $redefined_vars = $case_redefined_vars;
} else { } else {
@ -206,8 +222,8 @@ class SwitchChecker
if ($redefined_vars) { if ($redefined_vars) {
$context->vars_in_scope = array_merge($context->vars_in_scope, $redefined_vars); $context->vars_in_scope = array_merge($context->vars_in_scope, $redefined_vars);
} }
} elseif ($redefined_vars) { } elseif ($possibly_redefined_vars) {
foreach ($redefined_vars as $var_id => $type) { foreach ($possibly_redefined_vars as $var_id => $type) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes($type, $context->vars_in_scope[$var_id]); $context->vars_in_scope[$var_id] = Type::combineUnionTypes($type, $context->vars_in_scope[$var_id]);
} }
} }

2
tests/ArrayAssignmentTest.php
View File

@ -169,7 +169,7 @@ class ArrayAssignmentTest extends PHPUnit_Framework_TestCase
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts); $file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context(); $context = new Context();
$file_checker->visitAndAnalyzeMethods($context); $file_checker->visitAndAnalyzeMethods($context);
$this->assertEquals('array<int, string|int>', (string) $context->vars_in_scope['$out']); $this->assertEquals('array<int, int|string>', (string) $context->vars_in_scope['$out']);
} }
/** /**