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

Fix #4366 - possibly-undefined vars in finally block should not error

Browse Source
This commit is contained in:
Matt Brown 2020-10-19 09:56:38 -04:00 committed by Daniil Gentili
parent 8e77de4340
commit dab7da02bd
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,11 @@ class TryAnalyzer
foreach ($context->vars_in_scope as $var_id => $type) {
if (!isset($try_context->vars_in_scope[$var_id])) {
$try_context->vars_in_scope[$var_id] = clone $type;
$try_context->vars_in_scope[$var_id]->from_docblock = true;
if (!$stmt->catches) {
$context->vars_in_scope[$var_id]->possibly_undefined = true;
$context->vars_in_scope[$var_id]->possibly_undefined_from_try = true;
}
} else {
$try_context->vars_in_scope[$var_id] = Type::combineUnionTypes(
$try_context->vars_in_scope[$var_id],
@ -440,11 +444,13 @@ class TryAnalyzer
}
}
foreach ($definitely_newly_assigned_var_ids as $var_id => $_) {
if (isset($context->vars_in_scope[$var_id])) {
$new_type = clone $context->vars_in_scope[$var_id];
$new_type->possibly_undefined_from_try = false;
$context->vars_in_scope[$var_id] = $new_type;
if ($stmt->catches) {
foreach ($definitely_newly_assigned_var_ids as $var_id => $_) {
if (isset($context->vars_in_scope[$var_id])) {
$new_type = clone $context->vars_in_scope[$var_id];
$new_type->possibly_undefined_from_try = false;
$context->vars_in_scope[$var_id] = $new_type;
}
}
}

23
tests/TryCatchTest.php
View File

@ -391,6 +391,29 @@ class TryCatchTest extends TestCase
}
}'
],
'finallyArgMaybeUndefined' => [
'<?php
class TestMe {
private function startTransaction(): void {
}
private function endTransaction(bool $commit): void {
echo $commit ? "Committing" : "Rolling back";
}
public function doWork(): void {
$this->startTransaction();
try {
$this->workThatMayOrMayNotThrow();
$success = true;
} finally {
$this->endTransaction($success ?? false);
}
}
private function workThatMayOrMayNotThrow(): void {}
}'
]
];
}