From 3f7640eb366f4e1b04eade8b2a0d9963681f777c Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Sat, 17 Jul 2021 15:00:20 -0700
Subject: [PATCH] Make sure we always call restore_error_handler() (#2915)

---
 src/Handler/StreamHandler.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Handler/StreamHandler.php b/src/Handler/StreamHandler.php
index ef87709b2..c76b1c605 100644
--- a/src/Handler/StreamHandler.php
+++ b/src/Handler/StreamHandler.php
@@ -237,8 +237,11 @@ private function createResource(callable $callback)
             return true;
         });
 
-        $resource = $callback();
-        \restore_error_handler();
+        try {
+            $resource = $callback();
+        } finally {
+            \restore_error_handler();
+        }
 
         if (!$resource) {
             $message = 'Error creating resource: ';