danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 10:38:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8181 from Nicelocal/avoid_reparsing

Browse Source 
Avoid re-parsing template types
This commit is contained in:
orklah 2022-06-27 19:14:43 +02:00 committed by GitHub
commit 47d83093c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
View File

@ -451,39 +451,44 @@ class FunctionLikeDocblockScanner
);
$param_type_mapping = [];
$template_function_id = 'fn-' . strtolower($cased_function_id);
// This checks for param references in the return type tokens
// If found, the param is replaced with a generated template param
foreach ($fixed_type_tokens as $i => $type_token) {
$token_body = $type_token[0];
$template_function_id = 'fn-' . strtolower($cased_function_id);
if ($token_body[0] === '$') {
foreach ($storage->params as $j => $param_storage) {
if ('$' . $param_storage->name === $token_body) {
if (!isset($param_type_mapping[$token_body])) {
$template_name = 'TGeneratedFromParam' . $j;
if (isset($storage->template_types[$template_name])) {
$function_template_types[$template_name]
= $storage->template_types[$template_name];
$param_type_mapping[$token_body] = $template_name;
} else {
$template_as_type = $param_storage->type
? clone $param_storage->type
: Type::getMixed();
$template_as_type = $param_storage->type
? clone $param_storage->type
: Type::getMixed();
$storage->template_types[$template_name] = [
$template_function_id => $template_as_type,
];
$storage->template_types[$template_name] = [
$template_function_id => $template_as_type,
];
$function_template_types[$template_name]
= $storage->template_types[$template_name];
$function_template_types[$template_name]
= $storage->template_types[$template_name];
$param_type_mapping[$token_body] = $template_name;
$param_type_mapping[$token_body] = $template_name;
$param_storage->type = new Union([
new TTemplateParam(
$template_name,
$template_as_type,
$template_function_id
)
]);
$param_storage->type = new Union([
new TTemplateParam(
$template_name,
$template_as_type,
$template_function_id
)
]);
}
}
// spaces are allowed before $foo in get(string $foo) magic method