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

Fixes

Browse Source
This commit is contained in:
Daniil Gentili 2022-11-26 19:47:10 +01:00
parent e7f2fddf34
commit e89609bbab
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Psalm/Internal/Type/Comparator/KeyedArrayComparator.php
View File

@ -50,7 +50,7 @@ class KeyedArrayComparator
$input_properties = $input_type_part->properties; $input_properties = $input_type_part->properties;
foreach ($container_type_part->properties as $key => $container_property_type) { foreach ($container_type_part->properties as $key => $container_property_type) {
if (!isset($input_properties[$key]) || $input_properties[$key]->possibly_undefined) { if (!isset($input_properties[$key])) {
if (!$container_property_type->possibly_undefined) { if (!$container_property_type->possibly_undefined) {
$all_types_contain = false; $all_types_contain = false;
} }
@ -58,6 +58,14 @@ class KeyedArrayComparator
continue; continue;
} }
if ($input_properties[$key]->possibly_undefined
&& !$container_property_type->possibly_undefined
) {
$all_types_contain = false;
continue;
}
$input_property_type = $input_properties[$key]; $input_property_type = $input_properties[$key];
unset($input_properties[$key]); unset($input_properties[$key]);

14
src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php
View File

@ -279,13 +279,6 @@ class ScalarTypeComparator
return true; return true;
} }
if ($container_type_part instanceof TIntRange
&& $container_type_part->dependent_list_key
&& $input_type_part instanceof TLiteralInt
) {
return true;
}
if (get_class($container_type_part) === TFloat::class && $input_type_part instanceof TLiteralFloat) { if (get_class($container_type_part) === TFloat::class && $input_type_part instanceof TLiteralFloat) {
return true; return true;
} }
@ -336,13 +329,6 @@ class ScalarTypeComparator
return true; return true;
} }
if ($container_type_part instanceof TIntRange
&& $container_type_part->dependent_list_key
&& $input_type_part instanceof TInt
) {
return true;
}
if (get_class($input_type_part) === TInt::class && $container_type_part instanceof TLiteralInt) { if (get_class($input_type_part) === TInt::class && $container_type_part instanceof TLiteralInt) {
if ($atomic_comparison_result) { if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced = true; $atomic_comparison_result->type_coerced = true;