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

Fix issue with empty mixed analysis with union

Browse Source
This commit is contained in:
Brown 2018-12-10 11:17:35 -05:00
parent e6a1369d08
commit bd59153ddb
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,7 +383,9 @@ class Reconciler
$did_remove_type = $existing_var_type->hasDefinitelyNumericType(false);
if ($existing_var_type->hasMixed()) {
if ($existing_var_atomic_types['mixed'] instanceof Type\Atomic\TNonEmptyMixed) {
if ($existing_var_type->isMixed()
&& $existing_var_atomic_types['mixed'] instanceof Type\Atomic\TNonEmptyMixed
) {
if ($code_location
&& $key
&& IssueBuffer::accepts(
@ -403,7 +405,11 @@ class Reconciler
if (!$existing_var_atomic_types['mixed'] instanceof Type\Atomic\TEmptyMixed) {
$did_remove_type = true;
$existing_var_type->addType(new Type\Atomic\TEmptyMixed);
$existing_var_type->removeType('mixed');
if (!$existing_var_atomic_types['mixed'] instanceof Type\Atomic\TNonEmptyMixed) {
$existing_var_type->addType(new Type\Atomic\TEmptyMixed);
}
} elseif ($existing_var_type->isMixed()) {
if ($code_location
&& $key
@ -1203,7 +1209,9 @@ class Reconciler
|| $existing_var_type->possibly_undefined_from_try;
if ($existing_var_type->hasMixed()) {
if ($existing_var_atomic_types['mixed'] instanceof Type\Atomic\TEmptyMixed) {
if ($existing_var_type->isMixed()
&& $existing_var_atomic_types['mixed'] instanceof Type\Atomic\TEmptyMixed
) {
if ($code_location
&& $key
&& IssueBuffer::accepts(
@ -1223,7 +1231,11 @@ class Reconciler
if (!$existing_var_atomic_types['mixed'] instanceof Type\Atomic\TNonEmptyMixed) {
$did_remove_type = true;
$existing_var_type->addType(new Type\Atomic\TNonEmptyMixed);
$existing_var_type->removeType('mixed');
if (!$existing_var_atomic_types['mixed'] instanceof Type\Atomic\TEmptyMixed) {
$existing_var_type->addType(new Type\Atomic\TNonEmptyMixed);
}
} elseif ($existing_var_type->isMixed()) {
if ($code_location
&& $key

2
tests/TypeReconciliationTest.php
View File

@ -224,7 +224,7 @@ class TypeReconciliationTest extends TestCase
'nullableClassString' => ['null', 'falsy', '?class-string'],
'mixedOrNullNotFalsy' => ['non-empty-mixed', '!falsy', 'mixed|null'],
'mixedOrNullFalsy' => ['empty-mixed|null', 'falsy', 'mixed|null'],
'mixedOrNullFalsy' => ['null|empty-mixed', 'falsy', 'mixed|null'],
];
}