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

Cleanup

Browse Source
This commit is contained in:
Daniil Gentili 2022-11-26 14:18:08 +01:00
parent 3154860a0e
commit cf3a49a237
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Psalm/Internal/Type/Comparator/ArrayTypeComparator.php
View File

@ -62,9 +62,11 @@ class ArrayTypeComparator
$properties = [];
$value = $input_type_part->type_params[1]->setPossiblyUndefined(true);
foreach ($input_type_part->type_params[0]->getAtomicTypes() as $atomic_key_type) {
if ($atomic_key_type instanceof TLiteralString || $atomic_key_type instanceof TLiteralInt) {
$properties[$atomic_key_type->value] = $input_type_part->type_params[1]->setPossiblyUndefined(true);
$properties[$atomic_key_type->value] = $value;
} else {
$all_string_int_literals = false;
}
@ -83,33 +85,32 @@ class ArrayTypeComparator
}
}
if ($container_type_part instanceof TList
if ($container_type_part instanceof TKeyedArray
&& $input_type_part instanceof TKeyedArray
&& $container_type_part->is_list
&& !$input_type_part->is_list
) {
if ($input_type_part->is_list) {
/** @var TList|TNonEmptyList */
$input_type_part = $input_type_part->isNonEmpty()
? Type::getNonEmptyListAtomic($input_type_part->getGenericValueType())
: Type::getListAtomic($input_type_part->getGenericValueType());
} else {
return false;
}
}
if ($container_type_part instanceof TList
if ($container_type_part instanceof TKeyedArray
&& $container_type_part->is_list
&& $input_type_part instanceof TClassStringMap
) {
return false;
}
if ($container_type_part instanceof TList
if ($container_type_part instanceof TKeyedArray
&& $container_type_part->is_list
&& $input_type_part instanceof TArray
&& $input_type_part->isEmptyArray()
) {
return !$container_type_part instanceof TNonEmptyList;
return !$container_type_part->isNonEmpty();
}
if ($container_type_part instanceof TNonEmptyList
if ($container_type_part instanceof TKeyedArray
&& $container_type_part->is_list
&& $container_type_part->isNonEmpty()
&& $input_type_part instanceof TNonEmptyArray
&& $input_type_part->type_params[0]->isSingleIntLiteral()
&& $input_type_part->type_params[0]->getSingleIntLiteral()->value === 0
@ -119,7 +120,7 @@ class ArrayTypeComparator
return UnionTypeComparator::isContainedBy(
$codebase,
$input_type_part->type_params[1],
$container_type_part->type_param,
$container_type_part->getGenericValueType(),
$input_type_part->type_params[1]->ignore_nullable_issues,
$input_type_part->type_params[1]->ignore_falsable_issues,
$atomic_comparison_result,