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

Prevent empty unions as soon as possible

Browse Source
This commit is contained in:
Brown 2019-02-21 15:09:55 -05:00
parent b7a0950aea
commit 375f3917b2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Type/Union.php
View File

@ -124,6 +124,10 @@ class Union
{
$from_docblock = false;
if (!$types) {
throw new \UnexpectedValueException('Cannot construct a union with empty types');
}
foreach ($types as $type) {
$key = $type->getKey();
$this->types[$key] = $type;
@ -1109,16 +1113,18 @@ class Union
$new_types[$template_type_part->getKey()] = $template_type_part;
}
} elseif ($atomic_type instanceof Type\Atomic\TGenericParamClass) {
$keys_to_unset[] = $key;
$template_type = isset($template_types[$atomic_type->param_name])
? clone $template_types[$atomic_type->param_name][0]
: Type::getMixed();
foreach ($template_type->types as $template_type_part) {
if ($template_type_part instanceof Type\Atomic\TMixed) {
if ($template_type_part instanceof Type\Atomic\TMixed
|| $template_type_part instanceof Type\Atomic\TObject
) {
$unknown_class_string = new Type\Atomic\TClassString();
$new_types[$unknown_class_string->getKey()] = $unknown_class_string;
$keys_to_unset[] = $key;
} elseif ($template_type_part instanceof Type\Atomic\TNamedObject) {
$literal_class_string = new Type\Atomic\TClassString(
$template_type_part->value,
@ -1126,6 +1132,7 @@ class Union
);
$new_types[$literal_class_string->getKey()] = $literal_class_string;
$keys_to_unset[] = $key;
}
}
} else {