danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Allow combination of mixed-from-isset and empty

Browse Source
This commit is contained in:
Brown 2018-12-19 19:42:56 -05:00
parent f02fdeddf3
commit 09ea7ba7a8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Type/TypeCombination.php
View File

@ -306,10 +306,12 @@ class TypeCombination
$new_types = array_merge($new_types, array_values($combination->floats)); $new_types = array_merge($new_types, array_values($combination->floats));
} }
$has_empty = (int) isset($combination->value_types['empty']);
foreach ($combination->value_types as $type) { foreach ($combination->value_types as $type) {
if ($type instanceof TMixed if ($type instanceof TMixed
&& $combination->mixed_from_loop_isset && $combination->mixed_from_loop_isset
&& (count($combination->value_types) > 1 || count($new_types)) && (count($combination->value_types) > (1 + $has_empty) || count($new_types) > $has_empty)
) { ) {
continue; continue;
} }
@ -323,6 +325,10 @@ class TypeCombination
$new_types[] = $type; $new_types[] = $type;
} }
if (!$new_types) {
throw new \UnexpectedValueException('There should be types here');
}
$union_type = new Union($new_types); $union_type = new Union($new_types);
if ($from_docblock) { if ($from_docblock) {