danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix functions being resolved to other functions (#4793)

Browse Source 
Fixes #4750 

Reusing the $function_id variable causes an incorrect global function to be added at line 654
This commit is contained in:
Jack Bentley 2020-12-06 22:28:19 +00:00 committed by Daniil Gentili
parent 7cc512c9dc
commit 35fc84cdbb
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
View File

@ -524,11 +524,11 @@ class FunctionLikeNodeScanner
&& $function_stmt->expr->expr instanceof PhpParser\Node\Expr\FuncCall && $function_stmt->expr->expr instanceof PhpParser\Node\Expr\FuncCall
&& $function_stmt->expr->expr->name instanceof PhpParser\Node\Name && $function_stmt->expr->expr->name instanceof PhpParser\Node\Name
) { ) {
$function_id = implode('\\', $function_stmt->expr->expr->name->parts); $inner_function_id = implode('\\', $function_stmt->expr->expr->name->parts);
if ($function_id === 'func_get_arg' if ($inner_function_id === 'func_get_arg'
|| $function_id === 'func_get_args' || $inner_function_id === 'func_get_args'
|| $function_id === 'func_num_args' || $inner_function_id === 'func_num_args'
) { ) {
$storage->variadic = true; $storage->variadic = true;
} }
@ -538,11 +538,11 @@ class FunctionLikeNodeScanner
&& $function_stmt->cond->left->left instanceof PhpParser\Node\Expr\FuncCall && $function_stmt->cond->left->left instanceof PhpParser\Node\Expr\FuncCall
&& $function_stmt->cond->left->left->name instanceof PhpParser\Node\Name && $function_stmt->cond->left->left->name instanceof PhpParser\Node\Name
) { ) {
$function_id = implode('\\', $function_stmt->cond->left->left->name->parts); $inner_function_id = implode('\\', $function_stmt->cond->left->left->name->parts);
if ($function_id === 'func_get_arg' if ($inner_function_id === 'func_get_arg'
|| $function_id === 'func_get_args' || $inner_function_id === 'func_get_args'
|| $function_id === 'func_num_args' || $inner_function_id === 'func_num_args'
) { ) {
$storage->variadic = true; $storage->variadic = true;
} }