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

Prevent template types from leaking when no generics are provided

Browse Source
This commit is contained in:
Matthew Brown 2017-02-12 19:26:23 -05:00
parent a87ea78efc
commit 1d09616e9d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Psalm/Checker/Statements/Expression/CallChecker.php
View File

@ -725,24 +725,24 @@ class CallChecker
self::collectSpecialInformation($source, $stmt->name, $context);
}
if ($class_type_part instanceof TGenericObject) {
$class_storage = ClassLikeChecker::$storage[strtolower($fq_class_name)];
$class_storage = ClassLikeChecker::$storage[strtolower($fq_class_name)];
if ($class_storage->template_types) {
$class_template_params = [];
if ($class_storage->template_types) {
$class_template_params = [];
/** @var array<int, string> */
$reversed_class_template_types = array_reverse(array_keys($class_storage->template_types));
/** @var array<int, string> */
$reversed_class_template_types = array_reverse(array_keys($class_storage->template_types));
$provided_type_param_count = count($class_type_part->type_params);
$provided_type_param_count = $class_type_part instanceof TGenericObject
? count($class_type_part->type_params)
: 0;
foreach ($reversed_class_template_types as $i => $type_name) {
if (isset($class_type_part->type_params[$provided_type_param_count - 1 - $i])) {
$class_template_params[$type_name] =
$class_type_part->type_params[$provided_type_param_count - 1 - $i];
} else {
$class_template_params[$type_name] = Type::getMixed();
}
foreach ($reversed_class_template_types as $i => $type_name) {
if (isset($class_type_part->type_params[$provided_type_param_count - 1 - $i])) {
$class_template_params[$type_name] =
$class_type_part->type_params[$provided_type_param_count - 1 - $i];
} else {
$class_template_params[$type_name] = Type::getMixed();
}
}
}