danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix inconsistency in partial template matching

Browse Source
This commit is contained in:
Brown 2020-04-05 18:40:25 -04:00
parent 5be4cc2582
commit aca84e6f96
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -549,15 +549,32 @@ class UnionTemplateHandler
}
if ($add_upper_bound && $input_type) {
$matching_input_keys = [];
if ($codebase
&& TypeAnalyzer::isContainedBy(
&& TypeAnalyzer::canBeContainedBy(
$codebase,
$input_type,
$replacement_type
$replacement_type,
false,
false,
$matching_input_keys
)
) {
$generic_param = clone $input_type;
if ($matching_input_keys) {
$generic_param_keys = \array_keys($generic_param->getAtomicTypes());
foreach ($generic_param_keys as $atomic_key) {
if (!isset($matching_input_keys[$atomic_key])) {
$generic_param->removeType($atomic_key);
}
}
}
$template_result->template_types[$param_name_key][$atomic_type->defining_class][0]
= clone $input_type;
= $generic_param;
}
}

19
tests/Template/FunctionTemplateTest.php
View File

@ -1133,6 +1133,25 @@ class FunctionTemplateTest extends TestCase
'$a' => 'A',
]
],
'possiblyNullMatchesAnotherTemplateType' => [
'<?php
/**
* @psalm-template RealObjectType of object
*
* @psalm-param class-string<RealObjectType> $className
* @psalm-param Closure(
* RealObjectType|null
* ) : void $initializer
*/
function createProxy(
string $className,
Closure $initializer
) : void {}
class Foo {}
createProxy(Foo::class, function (?Foo $f) : void {});'
],
];
}