From 51bcdb8dc38b7ab17c80da2f9441ec6a1a015825 Mon Sep 17 00:00:00 2001
From: mlievertz <matt.lievertz@blackboard.com>
Date: Fri, 28 Dec 2018 07:55:37 -0500
Subject: [PATCH] [Event Dispatcher] fixed 29703: TraceableEventDispatcher
 reset now sets callStack to null with test to dispatch after reset.

---
 .../Debug/TraceableEventDispatcher.php               |  2 +-
 .../Tests/Debug/TraceableEventDispatcherTest.php     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 1696f66b6a83..4cf0a66d1ec4 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -221,7 +221,7 @@ public function getNotCalledListeners()
 
     public function reset()
     {
-        $this->callStack = array();
+        $this->callStack = null;
     }
 
     /**
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index a7efcafa9680..b322d9d682c3 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -139,6 +139,18 @@ public function testClearCalledListeners()
         $this->assertEquals(array(array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
     }
 
+    public function testDispatchAfterReset()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->addListener('foo', function () {}, 5);
+
+        $tdispatcher->reset();
+        $tdispatcher->dispatch('foo');
+
+        $listeners = $tdispatcher->getCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners[0]);
+    }
+
     public function testGetCalledListenersNested()
     {
         $tdispatcher = null;