From d56387edb7bbeb6dd67394d2f2c7dc199d50cde7 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 10 May 2021 13:13:41 +0200
Subject: [PATCH] Also handle throwable on supported php versions

---
 src/Composer/EventDispatcher/EventDispatcher.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php
index ce8a588c6..a1f685511 100644
--- a/src/Composer/EventDispatcher/EventDispatcher.php
+++ b/src/Composer/EventDispatcher/EventDispatcher.php
@@ -295,7 +295,11 @@ class EventDispatcher
                     break;
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Exception $e) { // TODO Composer 2.2 turn all this into a finally
+            $this->popEvent();
+
+            throw $e;
+        } catch (\Throwable $e) {
             $this->popEvent();
 
             throw $e;