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

Tidy up method call analyser

Browse Source
This commit is contained in:
Brown 2019-03-22 18:02:33 -04:00
parent cacd5a1946
commit c221eccbf5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
View File

@ -1129,7 +1129,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
}
/**
* @return array<string, array<string, array{Type\Union, int}>>|null
* @return array<string, array<string, array{Type\Union, 1?:int}>>|null
*/
public static function getClassTemplateParams(
Codebase $codebase,
@ -1187,8 +1187,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
foreach ($calling_class_storage->template_types as $type_name => $_) {
if (isset($lhs_type_part->type_params[$i])) {
$class_template_params[$type_name][$calling_class_storage->name] = [
$lhs_type_part->type_params[$i],
0,
$lhs_type_part->type_params[$i]
];
}
@ -1271,20 +1270,19 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
}
$class_template_params[$type_name][$class_storage->name] = [
$output_type_extends ?: Type::getMixed(),
0,
$output_type_extends ?: Type::getMixed()
];
}
if (!isset($class_template_params[$type_name])) {
$class_template_params[$type_name][$class_storage->name] = [Type::getMixed(), 0];
$class_template_params[$type_name][$class_storage->name] = [Type::getMixed()];
}
$i++;
}
} else {
foreach ($template_types as $type_name => $type_map) {
foreach ($type_map as list($type)) {
foreach ($type_map as $declaring_class => list($type)) {
if ($class_storage !== $calling_class_storage
&& isset($e[strtolower($class_storage->name)][$type_name])
) {
@ -1315,14 +1313,13 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
}
$class_template_params[$type_name][$class_storage->name] = [
$output_type_extends ?: Type::getMixed(),
0,
$output_type_extends ?: Type::getMixed()
];
}
if ($lhs_var_id !== '$this') {
if (!isset($class_template_params[$type_name])) {
$class_template_params[$type_name][$class_storage->name] = [$type, 0];
$class_template_params[$type_name][$class_storage->name] = [$type];
}
}
}