Properly fix #1128 with additional check

vimeo · May 20, 2019 · 2637156 · 2637156
1 parent 83a2122
commit 2637156
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php
@@ -51,7 +51,7 @@ public static function analyze(
          */
         $context->possibly_thrown_exceptions = [];
 
-        if ($all_catches_leave) {
+        if ($all_catches_leave && !$stmt->finally) {
             $try_context = $context;
         } else {
             $try_context = clone $context;

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -965,6 +965,26 @@ function foo() : void {
                         }
                     }'
             ],
+            'useTryAssignedVariableInFinallyWhenCatchExits' => [
+                '<?php
+                    /**
+                     * @return resource
+                     */
+                    function getStream() {
+                        throw new \Exception();
+                    }
+
+                    $stream = null;
+
+                    try {
+                        $stream = getStream();
+                        \file_put_contents("./foobar", $stream);
+                    } catch (\Exception $e) {
+                        throw new \Exception("Something went wrong");
+                    } finally {
+                        \fclose($stream);
+                    }',
+            ],
         ];
     }