From 8daf9c42a9da33cf0295eef26a034bb188a2cc44 Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Tue, 7 Dec 2021 23:42:17 -0500
Subject: [PATCH] Remove useless chunk of code in ScopeAnalyzer

---
 src/Psalm/Internal/Analyzer/ScopeAnalyzer.php | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php b/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
index 3840b83b363..d15b91bbf9e 100644
--- a/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/ScopeAnalyzer.php
@@ -449,30 +449,16 @@ function ($action) {
                     return array_values(array_unique(array_merge($control_actions, $try_statement_actions)));
                 }
 
-                if ($stmt->finally) {
-                    if ($stmt->finally->stmts) {
-                        $finally_statement_actions = self::getControlActions(
-                            $stmt->finally->stmts,
-                            $nodes,
-                            $exit_functions,
-                            $break_types,
-                            $return_is_exit
-                        );
-
-                        if (!in_array(self::ACTION_NONE, $finally_statement_actions, true)) {
-                            return array_merge(
-                                array_filter(
-                                    $control_actions,
-                                    function ($action) {
-                                        return $action !== self::ACTION_NONE;
-                                    }
-                                ),
-                                $finally_statement_actions
-                            );
-                        }
-                    }
+                if ($stmt->finally && $stmt->finally->stmts) {
+                    $finally_statement_actions = self::getControlActions(
+                        $stmt->finally->stmts,
+                        $nodes,
+                        $exit_functions,
+                        $break_types,
+                        $return_is_exit
+                    );
 
-                    if (!$stmt->catches && !in_array(self::ACTION_NONE, $try_statement_actions, true)) {
+                    if (!in_array(self::ACTION_NONE, $finally_statement_actions, true)) {
                         return array_merge(
                             array_filter(
                                 $control_actions,
@@ -480,7 +466,7 @@ function ($action) {
                                     return $action !== self::ACTION_NONE;
                                 }
                             ),
-                            $try_statement_actions
+                            $finally_statement_actions
                         );
                     }
                 }