danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2569 - improve template return type checks

Browse Source
This commit is contained in:
Matthew Brown 2020-01-07 21:08:13 -05:00
parent adfb488986
commit 146dd461ef
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Psalm/Internal/Analyzer/TypeAnalyzer.php
View File

@ -1877,10 +1877,6 @@ class TypeAnalyzer
$input_type_part->value,
$generic_params
);
if ($container_type_part instanceof TGenericObject) {
$container_type_part->remapped_params = false;
}
}
}
@ -1913,15 +1909,15 @@ class TypeAnalyzer
if ($input_type_part->value !== $container_type_part->value
&& $input_class_storage
&& (!$container_type_part instanceof TGenericObject
|| !$container_type_part->remapped_params)
) {
$input_template_types = $input_class_storage->template_types;
$i = 0;
$replacement_templates = [];
if ($input_template_types) {
if ($input_template_types
&& (!$input_type_part instanceof TGenericObject || !$input_type_part->remapped_params)
) {
foreach ($input_template_types as $template_name => $_) {
if (!isset($input_type_params[$i])) {
break;

25
tests/Template/ClassTemplateExtendsTest.php
View File

@ -2760,6 +2760,31 @@ class ClassTemplateExtendsTest extends TestCase
{
}'
],
'extendWithExtraParam' => [
'<?php
/**
* @template Tk of array-key
* @template Tv
*/
interface ICollection {
/**
* @psalm-return ICollection<Tk, Tv>
*/
public function slice(int $start, int $length): ICollection;
}
/**
* @template T
*
* @extends ICollection<int, T>
*/
interface IVector extends ICollection {
/**
* @psalm-return IVector<T>
*/
public function slice(int $start, int $length): ICollection;
}'
]
];
}