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

Remove useless chunk of code in ScopeAnalyzer

Browse Source
This commit is contained in:
Matthew Brown 2021-12-07 23:42:17 -05:00
parent 0ca856b597
commit 8daf9c42a9
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
View File

@ -449,30 +449,16 @@ class ScopeAnalyzer
return array_values(array_unique(array_merge($control_actions, $try_statement_actions)));
}
if ($stmt->finally) {
if ($stmt->finally->stmts) {
$finally_statement_actions = self::getControlActions(
$stmt->finally->stmts,
$nodes,
$exit_functions,
$break_types,
$return_is_exit
);
if ($stmt->finally && $stmt->finally->stmts) {
$finally_statement_actions = self::getControlActions(
$stmt->finally->stmts,
$nodes,
$exit_functions,
$break_types,
$return_is_exit
);
if (!in_array(self::ACTION_NONE, $finally_statement_actions, true)) {
return array_merge(
array_filter(
$control_actions,
function ($action) {
return $action !== self::ACTION_NONE;
}
),
$finally_statement_actions
);
}
}
if (!$stmt->catches && !in_array(self::ACTION_NONE, $try_statement_actions, true)) {
if (!in_array(self::ACTION_NONE, $finally_statement_actions, true)) {
return array_merge(
array_filter(
$control_actions,
@ -480,7 +466,7 @@ class ScopeAnalyzer
return $action !== self::ACTION_NONE;
}
),
$try_statement_actions
$finally_statement_actions
);
}
}