Merge branch '2.0'

2021-05-10 13:14:14 +02:00 · 2021-05-10 13:14:14 +02:00 · 0021758e0b
parent 649087d6de d56387edb7
commit 0021758e0b
1 changed files with 5 additions and 1 deletions
--- a/src/Composer/EventDispatcher/EventDispatcher.php
+++ b/src/Composer/EventDispatcher/EventDispatcher.php
@ -305,7 +305,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;