danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix #5017 - handle combining literal and non-empty strings

Browse Source
This commit is contained in:
Matt Brown 2021-01-17 12:22:29 -05:00
parent 4378bec917
commit bca58863ad
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Psalm/Internal/Type/TypeCombiner.php
View File

@ -931,6 +931,11 @@ class TypeCombiner
&& \strtolower($type->value) === $type->value
) {
// do nothing
} elseif (isset($combination->value_types['string'])
&& $combination->value_types['string'] instanceof Type\Atomic\TNonEmptyString
&& $type->value
) {
// do nothing
} else {
$combination->value_types['string'] = new TString();
}
@ -974,6 +979,23 @@ class TypeCombiner
$combination->value_types['string'] = $type;
}
$combination->strings = null;
} elseif ($type instanceof Type\Atomic\TNonEmptyString) {
$has_empty_string = false;
foreach ($combination->strings as $string_type) {
if (!$string_type->value) {
$has_empty_string = true;
break;
}
}
if ($has_empty_string) {
$combination->value_types['string'] = new TString();
} else {
$combination->value_types['string'] = $type;
}
$combination->strings = null;
} else {
$has_non_literal_class_string = false;

14
tests/TypeCombinationTest.php
View File

@ -644,6 +644,20 @@ class TypeCombinationTest extends TestCase
'array{0?:int}',
]
],
'combinNonEmptyStringAndLiteral' => [
'non-empty-string',
[
'non-empty-string',
'"foo"',
]
],
'combinLiteralAndNonEmptyString' => [
'non-empty-string',
[
'"foo"',
'non-empty-string'
]
],
];
}