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 bad variable check

Browse Source
This commit is contained in:
Matt Brown 2018-04-18 12:10:49 -04:00
parent 4ee0298558
commit 9099a0972b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Psalm/Checker/Statements/Block/TryChecker.php
View File

@ -275,8 +275,7 @@ class TryChecker
if ($catch_actions[$i] !== [ScopeChecker::ACTION_END]) { if ($catch_actions[$i] !== [ScopeChecker::ACTION_END]) {
foreach ($catch_context->vars_in_scope as $var_id => $type) { foreach ($catch_context->vars_in_scope as $var_id => $type) {
if ((!is_string($catch->var->name) || ('$' . $catch->var->name) !== $var_id) if ($context->hasVariable($var_id)
&& $context->hasVariable($var_id)
&& $context->vars_in_scope[$var_id]->getId() !== $type->getId() && $context->vars_in_scope[$var_id]->getId() !== $type->getId()
) { ) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes( $context->vars_in_scope[$var_id] = Type::combineUnionTypes(