danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Add extra loops for more reliable analysis

Browse Source
This commit is contained in:
Brown 2020-09-25 00:59:58 -04:00 committed by Daniil Gentili
parent 999a8aa4a8
commit 20edbd9b0c
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php
View File

@ -51,7 +51,7 @@ class LoopAnalyzer
$assignment_mapper = new \Psalm\Internal\PhpVisitor\AssignmentMapVisitor($loop_scope->loop_context->self);
$traverser->addVisitor($assignment_mapper);
$traverser->traverse(array_merge($stmts, $post_expressions));
$traverser->traverse(array_merge($pre_conditions, $stmts, $post_expressions));
$assignment_map = $assignment_mapper->getAssignmentMap();
@ -96,12 +96,20 @@ class LoopAnalyzer
$does_always_break = $final_actions === [ScopeAnalyzer::ACTION_BREAK];
$has_continue = in_array(ScopeAnalyzer::ACTION_CONTINUE, $final_actions, true);
if ($assignment_map) {
$first_var_id = array_keys($assignment_map)[0];
$assignment_depth = self::getAssignmentMapDepth($first_var_id, $assignment_map);
}
if ($has_continue) {
// this intuuitively feels right to me – if there's a continue statement,
// maybe more assignment intrigue is possible
$assignment_depth++;
}
$loop_scope->loop_context->parent_context = $loop_scope->loop_parent_context;
$pre_outer_context = $loop_scope->loop_parent_context;
@ -601,7 +609,7 @@ class LoopAnalyzer
if ($inner_do_context) {
$inner_context = $inner_do_context;
}
return null;
}