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

Rename var to be more uniform

Browse Source
This commit is contained in:
Brown 2019-07-31 17:14:00 -04:00
parent 7ded79bb27
commit c67e38aded
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ class LoopAnalyzer
}
$final_actions = ScopeAnalyzer::getFinalControlActions($stmts, Config::getInstance()->exit_functions);
$has_break_statement = $final_actions === [ScopeAnalyzer::ACTION_BREAK];
$does_always_break = $final_actions === [ScopeAnalyzer::ACTION_BREAK];
if ($assignment_map) {
$first_var_id = array_keys($assignment_map)[0];
@ -97,7 +97,7 @@ class LoopAnalyzer
$pre_outer_context = $loop_scope->loop_parent_context;
if ($assignment_depth === 0 || $has_break_statement) {
if ($assignment_depth === 0 || $does_always_break) {
$inner_context = clone $loop_scope->loop_context;
foreach ($inner_context->vars_in_scope as $context_var_id => $context_type) {
@ -468,7 +468,7 @@ class LoopAnalyzer
foreach ($inner_context->unreferenced_vars as $var_id => $locations) {
if (!isset($new_referenced_var_ids[$var_id])
|| !isset($pre_outer_context->vars_in_scope[$var_id])
|| $has_break_statement
|| $does_always_break
) {
if (!isset($loop_scope->loop_context->unreferenced_vars[$var_id])) {
$loop_scope->loop_context->unreferenced_vars[$var_id] = $locations;