danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-29 20:28:59 +01:00
Code Issues Projects Releases Wiki Activity

Make more try vars potentially undefined

Browse Source 
Fixes #4764
This commit is contained in:
Matt Brown 2020-12-03 11:44:10 -05:00 committed by Daniil Gentili
parent ba1a076059
commit dd20e838ce
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ class TryAnalyzer
$context->has_returned = false; $context->has_returned = false;
$stmt_control_actions = ScopeAnalyzer::getControlActions( $try_block_control_actions = ScopeAnalyzer::getControlActions(
$stmt->stmts, $stmt->stmts,
$statements_analyzer->node_data, $statements_analyzer->node_data,
$codebase->config->exit_functions, $codebase->config->exit_functions,
@ -387,17 +387,18 @@ class TryAnalyzer
$context->mergeExceptions($catch_context); $context->mergeExceptions($catch_context);
} }
if ($catch_actions[$i] !== [ScopeAnalyzer::ACTION_END] $catch_doesnt_leave_parent_scope = $catch_actions[$i] !== [ScopeAnalyzer::ACTION_END]
&& $catch_actions[$i] !== [ScopeAnalyzer::ACTION_CONTINUE] && $catch_actions[$i] !== [ScopeAnalyzer::ACTION_CONTINUE]
&& $catch_actions[$i] !== [ScopeAnalyzer::ACTION_BREAK] && $catch_actions[$i] !== [ScopeAnalyzer::ACTION_BREAK];
) {
if ($catch_doesnt_leave_parent_scope) {
$definitely_newly_assigned_var_ids = array_intersect_key( $definitely_newly_assigned_var_ids = array_intersect_key(
$new_catch_assigned_var_ids, $new_catch_assigned_var_ids,
$definitely_newly_assigned_var_ids $definitely_newly_assigned_var_ids
); );
foreach ($catch_context->vars_in_scope as $var_id => $type) { foreach ($catch_context->vars_in_scope as $var_id => $type) {
if ($stmt_control_actions === [ScopeAnalyzer::ACTION_END]) { if ($try_block_control_actions === [ScopeAnalyzer::ACTION_END]) {
$context->vars_in_scope[$var_id] = $type; $context->vars_in_scope[$var_id] = $type;
} elseif (isset($context->vars_in_scope[$var_id])) { } elseif (isset($context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes( $context->vars_in_scope[$var_id] = Type::combineUnionTypes(
@ -432,6 +433,8 @@ class TryAnalyzer
} }
} else { } else {
$try_context->finally_scope->vars_in_scope[$var_id] = $type; $try_context->finally_scope->vars_in_scope[$var_id] = $type;
$type->possibly_undefined = true;
$type->possibly_undefined_from_try = true;
} }
} }
} }
@ -499,7 +502,7 @@ class TryAnalyzer
} }
} }
$body_has_returned = !in_array(ScopeAnalyzer::ACTION_NONE, $stmt_control_actions, true); $body_has_returned = !in_array(ScopeAnalyzer::ACTION_NONE, $try_block_control_actions, true);
$context->has_returned = ($body_has_returned && $all_catches_leave) || $finally_has_returned; $context->has_returned = ($body_has_returned && $all_catches_leave) || $finally_has_returned;
return null; return null;

12
tests/TryCatchTest.php
View File

@ -475,6 +475,18 @@ class TryCatchTest extends TestCase
} }
}' }'
], ],
'issetExceptionInFinally' => [
'<?php
try {
if (rand(0, 1)) {
throw new \Exception("bad");
}
} catch (Throwable $exception) {
//throw $exception;
} finally {
if (isset($exception)) {}
}'
],
]; ];
} }