danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2197 - prevent false positive from try in while

Browse Source
This commit is contained in:
Matthew Brown 2019-11-09 11:01:48 -05:00
parent 7028a64440
commit 62a3598ed3
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php
View File

@ -414,6 +414,20 @@ class TryAnalyzer
$statements_analyzer->registerVariableUses($locations);
}
}
$newly_unreferenced_vars = array_merge(
$newly_unreferenced_vars,
array_diff_key(
$try_context->unreferenced_vars,
$old_unreferenced_vars
)
);
foreach ($newly_unreferenced_vars as $var_id => $locations) {
if (!isset($context->unreferenced_vars[$var_id])) {
$context->unreferenced_vars[$var_id] = $locations;
}
}
}
if ($stmt->finally) {

23
tests/UnusedVariableTest.php
View File

@ -1171,6 +1171,29 @@ class UnusedVariableTest extends TestCase
echo $b;
}'
],
'tryWithWhile' => [
'<?php
function foo(): void {
$done = false;
while (!$done) {
try {
$done = true;
} catch (\Exception $e) {
}
}
}',
],
'tryWithWhileWithoutTry' => [
'<?php
function foo(): void {
$done = false;
while (!$done) {
$done = true;
}
}',
],
];
}