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

Merge pull request #9606 from orklah/edfghjhkjl

Browse Source 
fix coercion detection between two keyed arrays
This commit is contained in:
orklah 2023-04-04 12:59:55 +02:00 committed by GitHub
commit bf0740a58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,10 +84,16 @@ class KeyedArrayComparator
$property_type_comparison, $property_type_comparison,
$allow_interface_equality, $allow_interface_equality,
); );
if (!$is_input_containedby_container && !$property_type_comparison->type_coerced_from_scalar) { if (!$is_input_containedby_container) {
$inverse_property_type_comparison = new TypeComparisonResult();
if ($atomic_comparison_result) { if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced
= $property_type_comparison->type_coerced === true
&& $atomic_comparison_result->type_coerced !== false;
if (!$property_type_comparison->type_coerced_from_scalar
&& !$atomic_comparison_result->type_coerced) {
//if we didn't detect a coercion, we try to compare the other way around
$inverse_property_type_comparison = new TypeComparisonResult();
if (UnionTypeComparator::isContainedBy( if (UnionTypeComparator::isContainedBy(
$codebase, $codebase,
$container_property_type, $container_property_type,
@ -101,6 +107,23 @@ class KeyedArrayComparator
) { ) {
$atomic_comparison_result->type_coerced = true; $atomic_comparison_result->type_coerced = true;
} }
}
$atomic_comparison_result->type_coerced_from_mixed
= $property_type_comparison->type_coerced_from_mixed === true
&& $atomic_comparison_result->type_coerced_from_mixed !== false;
$atomic_comparison_result->type_coerced_from_as_mixed
= $property_type_comparison->type_coerced_from_as_mixed === true
&& $atomic_comparison_result->type_coerced_from_as_mixed !== false;
$atomic_comparison_result->type_coerced_from_scalar
= $property_type_comparison->type_coerced_from_scalar === true
&& $atomic_comparison_result->type_coerced_from_scalar !== false;
$atomic_comparison_result->scalar_type_match_found
= $property_type_comparison->scalar_type_match_found === true
&& $atomic_comparison_result->scalar_type_match_found !== false;
if ($property_type_comparison->missing_shape_fields) { if ($property_type_comparison->missing_shape_fields) {
$atomic_comparison_result->missing_shape_fields $atomic_comparison_result->missing_shape_fields
@ -110,9 +133,6 @@ class KeyedArrayComparator
$all_types_contain = false; $all_types_contain = false;
} else { } else {
if (!$is_input_containedby_container) {
$all_types_contain = false;
}
if ($atomic_comparison_result) { if ($atomic_comparison_result) {
$atomic_comparison_result->to_string_cast $atomic_comparison_result->to_string_cast
= $atomic_comparison_result->to_string_cast === true = $atomic_comparison_result->to_string_cast === true

2
tests/FunctionCallTest.php
View File

@ -2691,7 +2691,7 @@ class FunctionCallTest extends TestCase
takesArrayShapeWithZeroOrPositiveInt(["bar" => $mayBeInt]); takesArrayShapeWithZeroOrPositiveInt(["bar" => $mayBeInt]);
', ',
'error_message' => 'InvalidArgument', 'error_message' => 'ArgumentTypeCoercion',
], ],
'is_a_withAStringAndNoThirdArg' => [ 'is_a_withAStringAndNoThirdArg' => [
'code' => '<?php 'code' => '<?php

21
tests/ReturnTypeTest.php
View File

@ -1243,6 +1243,27 @@ class ReturnTypeTest extends TestCase
} }
', ',
], ],
'MixedErrorInArrayShouldBeReportedAsMixedError' => [
'code' => '<?php
/**
* @param mixed $configuration
* @return array{a?: string, b?: int}
* @psalm-suppress MixedReturnTypeCoercion
*/
function produceParameters(array $configuration): array
{
$parameters = [];
foreach (["a", "b"] as $parameter) {
/** @psalm-suppress MixedAssignment */
$parameters[$parameter] = $configuration;
}
/** @psalm-suppress MixedReturnTypeCoercion */
return $parameters;
}
',
],
]; ];
} }

2
tests/Template/ClassTemplateTest.php
View File

@ -4681,7 +4681,7 @@ class ClassTemplateTest extends TestCase
$m = new Map(fn(int $num) => (string) $num); $m = new Map(fn(int $num) => (string) $num);
$m(["a"]);', $m(["a"]);',
'error_message' => 'InvalidArgument', 'error_message' => 'InvalidScalarArgument',
'ignored_issues' => [], 'ignored_issues' => [],
'php_version' => '8.0', 'php_version' => '8.0',
], ],