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

Prevent unintersectable template lower bounds

Browse Source 
Ref #3264
This commit is contained in:
Brown 2020-04-29 14:57:57 -04:00
parent d3fd9a6acf
commit 891c66650b
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -3848,6 +3848,11 @@ class CallAnalyzer
$union_comparison_result = new \Psalm\Internal\Analyzer\TypeComparisonResult(); $union_comparison_result = new \Psalm\Internal\Analyzer\TypeComparisonResult();
if (count($template_result->lower_bounds_unintersectable_types) > 1) {
$upper_bound_type = $template_result->lower_bounds_unintersectable_types[0];
$lower_bound_type = $template_result->lower_bounds_unintersectable_types[1];
}
if (!TypeAnalyzer::isContainedBy( if (!TypeAnalyzer::isContainedBy(
$statements_analyzer->getCodebase(), $statements_analyzer->getCodebase(),
$upper_bound_type, $upper_bound_type,

2
src/Psalm/Internal/Type/TemplateResult.php
View File

@ -21,6 +21,8 @@ class TemplateResult
*/ */
public $lower_bounds = []; public $lower_bounds = [];
public $lower_bounds_unintersectable_types = [];
/** /**
* @param array<string, array<string, array{0: Union}>> $template_types * @param array<string, array<string, array{0: Union}>> $template_types
* @param array<string, array<string, array{0: Union, 1?: int, 2?: ?int}>> $upper_bounds * @param array<string, array<string, array{0: Union, 1?: int, 2?: ?int}>> $upper_bounds

13
src/Psalm/Internal/Type/UnionTemplateHandler.php
View File

@ -616,8 +616,17 @@ class UnionTemplateHandler
$codebase $codebase
); );
$template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0] if ($intersection_type) {
= $intersection_type ?: \Psalm\Type::getMixed(); $template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0]
= $intersection_type;
} else {
$template_result->lower_bounds_unintersectable_types[]
= $template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0];
$template_result->lower_bounds_unintersectable_types[] = $generic_param;
$template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0]
= \Psalm\Type::getMixed();
}
} else { } else {
$template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0] $template_result->lower_bounds[$param_name_key][$atomic_type->defining_class][0]
= $generic_param; = $generic_param;

6
tests/ArrayFunctionCallTest.php
View File

@ -1529,6 +1529,12 @@ class ArrayFunctionCallTest extends TestCase
ints($brr);', ints($brr);',
'error_message' => 'ArgumentTypeCoercion - src/somefile.php:5:26 - Argument 1 of ints expects list<int>, parent type array<int, int(2)|int(3)|int(4)|int(5)> provided', 'error_message' => 'ArgumentTypeCoercion - src/somefile.php:5:26 - Argument 1 of ints expects list<int>, parent type array<int, int(2)|int(3)|int(4)|int(5)> provided',
], ],
'usortOneParamInvalid' => [
'<?php
$list = [3, 2, 5, 9];
usort($list, fn(int $a, string $b): int => (int) ($a > $b));',
'error_message' => 'InvalidScalarArgument'
],
]; ];
} }
} }