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

Fix #4372 - count implicitly-used short-closure vars as used

Browse Source
This commit is contained in:
Matt Brown 2020-10-20 09:32:08 -04:00
parent 234896c73a
commit e7d1fa6798
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Psalm/Internal/Analyzer/ClosureAnalyzer.php
View File

@ -170,10 +170,23 @@ class ClosureAnalyzer extends FunctionLikeAnalyzer
$traverser->traverse($stmt->getStmts());
foreach ($short_closure_visitor->getUsedVariables() as $use_var_id => $_) {
$use_context->vars_in_scope[$use_var_id] =
$context->hasVariable($use_var_id)
? clone $context->vars_in_scope[$use_var_id]
: Type::getMixed();
if ($context->hasVariable($use_var_id)) {
$use_context->vars_in_scope[$use_var_id] = clone $context->vars_in_scope[$use_var_id];
if ($statements_analyzer->data_flow_graph instanceof \Psalm\Internal\Codebase\VariableUseGraph) {
$parent_nodes = $context->vars_in_scope[$use_var_id]->parent_nodes;
foreach ($parent_nodes as $parent_node) {
$statements_analyzer->data_flow_graph->addPath(
$parent_node,
new DataFlowNode('closure-use', 'closure use', null),
'closure-use'
);
}
}
} else {
$use_context->vars_in_scope[$use_var_id] = Type::getMixed();
}
$use_context->vars_possibly_in_scope[$use_var_id] = true;
}

6
tests/UnusedVariableTest.php
View File

@ -2197,6 +2197,12 @@ class UnusedVariableTest extends TestCase
echo $b;
}'
],
'arrowFunctionImplicitlyUsedVar' => [
'<?php
function test(Exception $e): callable {
return fn() => $e->getMessage();
}'
],
];
}