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

Contextual closure arg inference for class methods

Browse Source
This commit is contained in:
klimick 2023-04-23 16:19:25 +03:00
parent a97b6b8a5e
commit 88c444a8cc
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/ExistingAtomicMethodCallAnalyzer.php
View File

@ -228,6 +228,9 @@ class ExistingAtomicMethodCallAnalyzer extends CallAnalyzer
if ($inferred_template_result) {
$template_result->lower_bounds += $inferred_template_result->lower_bounds;
}
if ($method_storage && $method_storage->template_types) {
$template_result->template_types += $method_storage->template_types;
}
if ($codebase->store_node_types
&& !$stmt->isFirstClassCallable()

28
src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php
View File

@ -231,6 +231,17 @@ class TemplateStandinTypeReplacer
);
}
if ($atomic_type instanceof TTemplateParam
&& isset($template_result->lower_bounds[$atomic_type->param_name][$atomic_type->defining_class])
) {
$most_specific_type = self::getMostSpecificTypeFromBounds(
$template_result->lower_bounds[$atomic_type->param_name][$atomic_type->defining_class],
$codebase,
);
return array_values($most_specific_type->getAtomicTypes());
}
if ($atomic_type instanceof TTemplateParamClass
&& isset($template_result->template_types[$atomic_type->param_name][$atomic_type->defining_class])
) {
@ -259,11 +270,14 @@ class TemplateStandinTypeReplacer
$include_first = true;
if (isset($template_result->template_types[$atomic_type->array_param_name][$atomic_type->defining_class])
if (isset($template_result->lower_bounds[$atomic_type->array_param_name][$atomic_type->defining_class])
&& !empty($template_result->lower_bounds[$atomic_type->offset_param_name])
) {
$array_template_type
= $template_result->template_types[$atomic_type->array_param_name][$atomic_type->defining_class];
= self::getMostSpecificTypeFromBounds(
$template_result->lower_bounds[$atomic_type->array_param_name][$atomic_type->defining_class],
$codebase,
);
$offset_template_type
= self::getMostSpecificTypeFromBounds(
array_values($template_result->lower_bounds[$atomic_type->offset_param_name])[0],
@ -317,10 +331,18 @@ class TemplateStandinTypeReplacer
$atomic_types = [];
$include_first = true;
$template_type = null;
if (isset($template_result->template_types[$atomic_type->param_name][$atomic_type->defining_class])) {
if (isset($template_result->lower_bounds[$atomic_type->param_name][$atomic_type->defining_class])) {
$template_type = self::getMostSpecificTypeFromBounds(
$template_result->lower_bounds[$atomic_type->param_name][$atomic_type->defining_class],
$codebase,
);
} elseif (isset($template_result->template_types[$atomic_type->param_name][$atomic_type->defining_class])) {
$template_type = $template_result->template_types[$atomic_type->param_name][$atomic_type->defining_class];
}
if ($template_type) {
foreach ($template_type->getAtomicTypes() as $template_atomic) {
if ($template_atomic instanceof TList) {
$template_atomic = $template_atomic->getKeyedArray();