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

Fix #2225 - iterator_to_array can return a list

Browse Source
This commit is contained in:
Matthew Brown 2019-10-10 23:47:11 -04:00
parent 0556f28a9f
commit 1a1b3a10a9
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Provider/ReturnTypeProvider/IteratorToArrayReturnTypeProvider.php
View File

@ -63,6 +63,14 @@ class IteratorToArrayReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionRe
}
if ($value_type) {
if (isset($call_args[1]->value->inferredType)
&& ((string) $call_args[1]->value->inferredType === 'false')
) {
return new Type\Union([
new Type\Atomic\TList($value_type),
]);
}
return new Type\Union([
new Type\Atomic\TArray([
$key_type

15
tests/FunctionCallTest.php
View File

@ -991,6 +991,21 @@ class FunctionCallTest extends TestCase
'$a' => 'array<int, string>',
],
],
'iteratorToArrayWithGetIteratorReturningList' => [
'<?php
class C implements IteratorAggregate {
/**
* @return Traversable<int,string>
*/
public function getIterator() {
yield 1 => "1";
}
}
$a = iterator_to_array(new C, false);',
'assertions' => [
'$a' => 'list<string>',
],
],
'arrayColumnInference' => [
'<?php
function makeMixedArray(): array { return []; }