danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-23 06:11:25 +01:00
Code Issues Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Vincent Langlet 2022-12-25 19:21:48 +01:00
parent b1f1ca6d7e
commit a263e5d42c
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Psalm/Internal/Type/TypeCombiner.php
View File

@ -297,17 +297,14 @@ class TypeCombiner
foreach ($object_type->getAtomicTypes() as $object_atomic_type) { foreach ($object_type->getAtomicTypes() as $object_atomic_type) {
if ($object_atomic_type instanceof TNamedObject) { if ($object_atomic_type instanceof TNamedObject) {
$new_types[] = new TClassString( $class_type = new TClassString($object_atomic_type->value, $object_atomic_type);
$object_atomic_type->value,
$object_atomic_type,
false,
false,
false,
$from_docblock,
);
} elseif ($object_atomic_type instanceof TObject) { } elseif ($object_atomic_type instanceof TObject) {
$new_types[] = new TClassString('object', null, false, false, false, $from_docblock); $class_type = new TClassString();
} else {
continue;
} }
$new_types[] = $class_type->setFromDocblock($from_docblock);
} }
} }
} }
@ -1428,16 +1425,12 @@ class TypeCombiner
$key_type = $combination->objectlike_key_type ?? Type::getArrayKey(); $key_type = $combination->objectlike_key_type ?? Type::getArrayKey();
$value_type = $combination->objectlike_value_type ?? Type::getMixed(); $value_type = $combination->objectlike_value_type ?? Type::getMixed();
if ($combination->array_always_filled) { if ($combination->array_always_filled) {
$new_types[] = new TNonEmptyArray( $array_type = new TNonEmptyArray([$key_type, $value_type]);
[$key_type, $value_type],
null,
null,
'non-empty-array',
$from_docblock,
);
} else { } else {
$new_types[] = new TArray([$key_type, $value_type], $from_docblock); $array_type = new TArray([$key_type, $value_type]);
} }
$new_types[] = $array_type->setFromDocblock($from_docblock);
} }
// if we're merging an empty array with an object-like, clobber empty array // if we're merging an empty array with an object-like, clobber empty array
@ -1525,13 +1518,7 @@ class TypeCombiner
} }
if ($combination->all_arrays_callable) { if ($combination->all_arrays_callable) {
$array_type = new TCallableArray( $array_type = new TCallableArray($generic_type_params);
$generic_type_params,
null,
null,
'callable-array',
$from_docblock,
);
} elseif ($combination->array_always_filled } elseif ($combination->array_always_filled
|| ($combination->array_sometimes_filled && $overwrite_empty_array) || ($combination->array_sometimes_filled && $overwrite_empty_array)
|| ($combination->objectlike_entries || ($combination->objectlike_entries
@ -1549,7 +1536,6 @@ class TypeCombiner
null, null,
[Type::getInt(), $combination->array_type_params[1]], [Type::getInt(), $combination->array_type_params[1]],
true, true,
$from_docblock,
); );
} elseif ($combination->array_counts && count($combination->array_counts) === 1) { } elseif ($combination->array_counts && count($combination->array_counts) === 1) {
$cnt = array_keys($combination->array_counts)[0]; $cnt = array_keys($combination->array_counts)[0];
@ -1563,7 +1549,6 @@ class TypeCombiner
null, null,
null, null,
true, true,
$from_docblock,
); );
} else { } else {
$cnt = $combination->array_min_counts $cnt = $combination->array_min_counts
@ -1581,7 +1566,6 @@ class TypeCombiner
null, null,
[Type::getListKey(), $generic_type_params[1]], [Type::getListKey(), $generic_type_params[1]],
true, true,
$from_docblock,
); );
} }
} else { } else {
@ -1591,9 +1575,6 @@ class TypeCombiner
$combination->array_min_counts $combination->array_min_counts
? min(array_keys($combination->array_min_counts)) ? min(array_keys($combination->array_min_counts))
: null, : null,
null,
'non-empty-array',
$from_docblock,
); );
} }
} else { } else {
@ -1605,15 +1586,14 @@ class TypeCombiner
array_keys($combination->class_string_map_names)[0], array_keys($combination->class_string_map_names)[0],
array_values($combination->class_string_map_as_types)[0], array_values($combination->class_string_map_as_types)[0],
$generic_type_params[1], $generic_type_params[1],
$from_docblock,
); );
} elseif ($combination->all_arrays_lists) { } elseif ($combination->all_arrays_lists) {
$array_type = Type::getListAtomic($generic_type_params[1], $from_docblock); $array_type = Type::getListAtomic($generic_type_params[1]);
} else { } else {
$array_type = new TArray($generic_type_params, $from_docblock); $array_type = new TArray($generic_type_params);
} }
} }
return $array_type; return $array_type->setFromDocblock($from_docblock);
} }
} }