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

Fix reconciliation of mixed to Traversable

Browse Source
This commit is contained in:
Matthew Brown 2019-08-18 18:06:57 -04:00
parent 1b983babd0
commit b8bdaea09a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Type/AssertionReconciler.php
View File

@ -1298,7 +1298,7 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$existing_var_atomic_types = $existing_var_type->getTypes();
if ($existing_var_type->hasMixed() || $existing_var_type->hasTemplate()) {
return new Type\Union([new Type\Atomic\TIterable]);
return new Type\Union([new Type\Atomic\TNamedObject('Traversable')]);
}
$traversable_types = [];

10
tests/TypeReconciliationTest.php
View File

@ -1458,6 +1458,16 @@ class TypeReconciliationTest extends TestCase
if (isset($e->bar)) {}
}',
],
'assertArrayOffsetToTraversable' => [
'<?php
function render(array $data): ?Traversable {
if ($data["o"] instanceof Traversable) {
return $data["o"];
}
return null;
}'
],
];
}