Fix #4315 - prevent crash when setting unknown property in finally

vimeo · Oct 15, 2020 · cb3a793 · cb3a793
1 parent 8f21179
commit cb3a793
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php
@@ -537,7 +537,7 @@ function ($fq_catch_class) use ($codebase): Type\Atomic {
                             $finally_context->vars_in_scope[$var_id],
                             $codebase
                         );
-                    } else {
+                    } elseif (isset($finally_context->vars_in_scope[$var_id])) {
                         $context->vars_in_scope[$var_id] = clone $finally_context->vars_in_scope[$var_id];
                     }
                 }

diff --git a/tests/TryCatchTest.php b/tests/TryCatchTest.php
@@ -365,6 +365,13 @@ class_alias(
                         }
                     }'
             ],
+            'suppressUndefinedVarInFinally' => [
+                '<?php
+                    try {} finally {
+                        /** @psalm-suppress UndefinedGlobalVariable, MixedPropertyAssignment */
+                        $event->end = null;
+                    }',
+            ],
         ];
     }