danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 13:51:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix #8806

Browse Source
This commit is contained in:
Daniil Gentili 2022-12-01 20:12:20 +01:00
parent 870f5817d2
commit 3150ad2b27
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php
View File

@ -38,7 +38,6 @@ use function array_map;
use function array_shift;
use function array_slice;
use function array_values;
use function assert;
use function count;
use function explode;
use function in_array;
@ -79,6 +78,7 @@ class ArrayMapReturnTypeProvider implements FunctionReturnTypeProviderInterface
array_shift($call_args);
$array_arg_types = [];
$orig_types = [];
foreach ($call_args as $call_arg) {
$call_arg_type = $statements_source->node_data->getType($call_arg->value);
@ -89,11 +89,23 @@ class ArrayMapReturnTypeProvider implements FunctionReturnTypeProviderInterface
&& $call_arg_atomic->fallback_params === null
) {
$array_arg_types []= array_values($call_arg_atomic->properties);
$orig_types []= $call_arg_type;
} elseif ($call_arg_type
&& $call_arg_type->isSingle()
&& ($call_arg_atomic = $call_arg_type->getSingleAtomic()) instanceof TArray
&& $call_arg_atomic->isEmptyArray()
) {
$array_arg_types []= [];
$orig_types []= $call_arg_type;
} else {
return Type::getArray();
}
}
if (count($array_arg_types) === 1) {
return $orig_types[0];
}
$null = Type::getNull();
$array_arg_types = array_map(null, ...$array_arg_types);
$array_arg_types = array_map(
@ -107,7 +119,10 @@ class ArrayMapReturnTypeProvider implements FunctionReturnTypeProviderInterface
},
$array_arg_types
);
assert(count($array_arg_types));
if (!$array_arg_types) {
return Type::getEmptyArray();
}
return new Union([new TKeyedArray($array_arg_types, null, null, true)]);
}