danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #5310 - allow iterable coercion from generic object

Browse Source
This commit is contained in:
Matt Brown 2021-03-03 00:13:00 -05:00
parent a284933c43
commit 4c65d3b424
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ class GenericTypeComparator
?TypeComparisonResult $atomic_comparison_result = null ?TypeComparisonResult $atomic_comparison_result = null
) : bool { ) : bool {
$all_types_contain = true; $all_types_contain = true;
$container_was_iterable = false;
if ($container_type_part instanceof TIterable if ($container_type_part instanceof TIterable
&& !$container_type_part->extra_types && !$container_type_part->extra_types
@ -35,6 +36,8 @@ class GenericTypeComparator
'Traversable', 'Traversable',
$container_type_part->type_params $container_type_part->type_params
); );
$container_was_iterable = true;
} }
if (!$input_type_part instanceof TGenericObject && !$input_type_part instanceof TIterable) { if (!$input_type_part instanceof TGenericObject && !$input_type_part instanceof TIterable) {
@ -131,7 +134,8 @@ class GenericTypeComparator
&& $atomic_comparison_result->type_coerced_from_mixed !== false; && $atomic_comparison_result->type_coerced_from_mixed !== false;
$atomic_comparison_result->type_coerced_from_as_mixed $atomic_comparison_result->type_coerced_from_as_mixed
= $param_comparison_result->type_coerced_from_as_mixed === true = !$container_was_iterable
&& $param_comparison_result->type_coerced_from_as_mixed === true
&& $atomic_comparison_result->type_coerced_from_as_mixed !== false; && $atomic_comparison_result->type_coerced_from_as_mixed !== false;
$atomic_comparison_result->to_string_cast $atomic_comparison_result->to_string_cast
@ -147,7 +151,9 @@ class GenericTypeComparator
&& $atomic_comparison_result->scalar_type_match_found !== false; && $atomic_comparison_result->scalar_type_match_found !== false;
} }
if (!$param_comparison_result->type_coerced_from_as_mixed) { // if the container was an iterable then there was no mapping
// from a template type
if ($container_was_iterable || !$param_comparison_result->type_coerced_from_as_mixed) {
$all_types_contain = false; $all_types_contain = false;
} }
} elseif (!$input_type_part instanceof TIterable } elseif (!$input_type_part instanceof TIterable

22
tests/AssertAnnotationTest.php
View File

@ -1431,6 +1431,28 @@ class AssertAnnotationTest extends TestCase
} }
}' }'
], ],
'assertArrayIteratorIsIterableOfStrings' => [
'<?php
/**
* @psalm-assert iterable<string> $value
* @param mixed $value
*
* @return void
*/
function assertAllString($value) : void {
throw new \Exception(\var_export($value, true));
}
/**
* @param ArrayIterator<string, mixed> $value
*
* @return ArrayIterator<string, string>
*/
function preserveContainerAllArrayIterator($value) {
assertAllString($value);
return $value;
}'
],
]; ];
} }