danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 09:37:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues with build

Browse Source
This commit is contained in:
Matthew Brown 2018-11-10 20:56:52 -05:00
parent fe25530cad
commit a3dde47374
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,14 +556,12 @@ class SwitchChecker
if ($redefined_vars !== null) { if ($redefined_vars !== null) {
foreach ($redefined_vars as $var_id => $type) { foreach ($redefined_vars as $var_id => $type) {
if (isset($case_context->switch_scope->break_vars[$var_id])) { if (isset($case_context->switch_scope->break_vars[$var_id])) {
if (!isset($case_context->switch_scope->break_vars[$var_id])) {
unset($redefined_vars[$var_id]);
} else {
$redefined_vars[$var_id] = Type::combineUnionTypes( $redefined_vars[$var_id] = Type::combineUnionTypes(
$case_context->switch_scope->break_vars[$var_id], $case_context->switch_scope->break_vars[$var_id],
$type $type
); );
} } else {
unset($redefined_vars[$var_id]);
} }
} }
} }

6
src/Psalm/Type/Reconciler.php
View File

@ -1454,7 +1454,7 @@ class Reconciler
$did_remove_type = false; $did_remove_type = false;
foreach ($existing_var_atomic_types as $atomic_key => $_) { foreach ($existing_var_atomic_types as $atomic_key => $_) {
if ($key !== $new_var_type) { if ($atomic_key !== $new_var_type) {
$existing_var_type->removeType($atomic_key); $existing_var_type->removeType($atomic_key);
$did_remove_type = true; $did_remove_type = true;
} else { } else {
@ -1497,7 +1497,7 @@ class Reconciler
$did_remove_type = false; $did_remove_type = false;
foreach ($existing_var_atomic_types as $atomic_key => $_) { foreach ($existing_var_atomic_types as $atomic_key => $_) {
if ($key !== $new_var_type) { if ($atomic_key !== $new_var_type) {
$existing_var_type->removeType($atomic_key); $existing_var_type->removeType($atomic_key);
$did_remove_type = true; $did_remove_type = true;
} else { } else {
@ -1542,7 +1542,7 @@ class Reconciler
$did_remove_type = false; $did_remove_type = false;
foreach ($existing_var_atomic_types as $atomic_key => $_) { foreach ($existing_var_atomic_types as $atomic_key => $_) {
if ($key !== $new_var_type) { if ($atomic_key !== $new_var_type) {
$existing_var_type->removeType($atomic_key); $existing_var_type->removeType($atomic_key);
$did_remove_type = true; $did_remove_type = true;
} else { } else {