danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-07 22:19:01 +01:00
Code Issues Projects Releases Wiki Activity

Use ArrayCreationInfo for property types

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

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

@ -430,7 +430,6 @@ class SimpleTypeInferer
return Type::getEmptyArray(); return Type::getEmptyArray();
} }
$property_types = [];
$class_strings = []; $class_strings = [];
$can_create_objectlike = true; $can_create_objectlike = true;
@ -485,8 +484,9 @@ class SimpleTypeInferer
|| $item->key instanceof PhpParser\Node\Scalar\LNumber || $item->key instanceof PhpParser\Node\Scalar\LNumber
|| !$item->key || !$item->key
) { ) {
if (count($property_types) <= 50) { if (count($array_creation_info->property_types) <= 50) {
$property_types[$item->key ? $item->key->value : $int_offset] = $single_item_value_type; $key_value = $item->key ? $item->key->value : $int_offset;
$array_creation_info->property_types[$key_value] = $single_item_value_type;
} else { } else {
$can_create_objectlike = false; $can_create_objectlike = false;
} }
@ -507,7 +507,10 @@ class SimpleTypeInferer
$dim_atomic_types = $dim_type->getAtomicTypes(); $dim_atomic_types = $dim_type->getAtomicTypes();
if (count($dim_atomic_types) > 1 || $dim_type->hasMixed() || count($property_types) > 50) { if (count($dim_atomic_types) > 1
|| $dim_type->hasMixed()
|| count($array_creation_info->property_types) > 50
) {
$can_create_objectlike = false; $can_create_objectlike = false;
} else { } else {
$atomic_type = array_shift($dim_atomic_types); $atomic_type = array_shift($dim_atomic_types);
@ -519,7 +522,7 @@ class SimpleTypeInferer
$class_strings[$atomic_type->value] = true; $class_strings[$atomic_type->value] = true;
} }
$property_types[$atomic_type->value] = $single_item_value_type; $array_creation_info->property_types[$atomic_type->value] = $single_item_value_type;
} else { } else {
$can_create_objectlike = false; $can_create_objectlike = false;
} }
@ -559,9 +562,12 @@ class SimpleTypeInferer
&& $item_key_type && $item_key_type
&& ($item_key_type->hasString() || $item_key_type->hasInt()) && ($item_key_type->hasString() || $item_key_type->hasInt())
&& $can_create_objectlike && $can_create_objectlike
&& $property_types && $array_creation_info->property_types
) { ) {
$objectlike = new Type\Atomic\TKeyedArray($property_types, $class_strings); $objectlike = new Type\Atomic\TKeyedArray(
$array_creation_info->property_types,
$class_strings
);
$objectlike->sealed = true; $objectlike->sealed = true;
$objectlike->is_list = $is_list; $objectlike->is_list = $is_list;
return new Type\Union([$objectlike]); return new Type\Union([$objectlike]);