danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 18:48:03 +01:00
Code Issues Projects Releases Wiki Activity

Use ArrayCreationInfo for key and value types

Browse Source
This commit is contained in:
Bruce Weirdan 2021-08-11 00:05:00 +03:00
parent a64a30cdda
commit abe5ef774c
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Psalm/Internal/Analyzer/Statements/Expression/SimpleTypeInferer.php
View File

@ -430,9 +430,6 @@ class SimpleTypeInferer
return Type::getEmptyArray();
}
$item_key_type_atomic = [];
$item_value_type_atomic = [];
$property_types = [];
$class_strings = [];
@ -440,6 +437,8 @@ class SimpleTypeInferer
$is_list = true;
$array_creation_info = new ArrayCreationInfo();
foreach ($stmt->items as $int_offset => $item) {
if ($item === null) {
continue;
@ -459,13 +458,13 @@ class SimpleTypeInferer
);
if ($single_item_key_type) {
$item_key_type_atomic = array_merge(
$item_key_type_atomic,
$array_creation_info->item_key_atomic_types = array_merge(
$array_creation_info->item_key_atomic_types,
array_values($single_item_key_type->getAtomicTypes())
);
}
} else {
$item_key_type_atomic[] = new Type\Atomic\TInt();
$array_creation_info->item_key_atomic_types[] = new Type\Atomic\TInt();
}
$single_item_value_type = self::infer(
@ -527,16 +526,16 @@ class SimpleTypeInferer
}
}
$item_value_type_atomic = array_merge(
$item_value_type_atomic,
$array_creation_info->item_value_atomic_types = array_merge(
$array_creation_info->item_value_atomic_types,
array_values($single_item_value_type->getAtomicTypes())
);
}
$item_key_type = null;
if ($item_key_type_atomic) {
if ($array_creation_info->item_key_atomic_types) {
$item_key_type = TypeCombiner::combine(
$item_key_type_atomic,
$array_creation_info->item_key_atomic_types,
null,
false,
true,
@ -545,9 +544,9 @@ class SimpleTypeInferer
}
$item_value_type = null;
if ($item_value_type_atomic) {
if ($array_creation_info->item_value_atomic_types) {
$item_value_type = TypeCombiner::combine(
$item_value_type_atomic,
$array_creation_info->item_value_atomic_types,
null,
false,
true,