symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+25-2Lines changed: 25 additions & 2 deletions b/‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+25-2Lines changed: 25 additions & 2 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
+28Lines changed: 28 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
+28Lines changed: 28 additions & 0 deletions
@@ -32,6 +32,7 @@ class ContainerAwareEventManager extends EventManager
     private $subscribers;
     private $initialized = [];
     private $initializedSubscribers = false;
+    private $initializedHashMapping = [];
     private $methods = [];
     private $container;
 
@@ -138,6 +139,7 @@ public function addEventListener($events, $listener)
 
             if (\is_string($listener)) {
                 unset($this->initialized[$event]);
+                unset($this->initializedHashMapping[$event][$hash]);
             } else {
                 $this->methods[$event][$hash] = $this->getMethod($listener, $event);
             }
@@ -158,6 +160,15 @@ public function removeEventListener($events, $listener)
         $hash = $this->getHash($listener);
 
         foreach ((array) $events as $event) {
+            if (!isset($this->initialized[$event])) {
+                $this->initializeListeners($event);
+            }
+
+            if (isset($this->initializedHashMapping[$event][$hash])) {
+                $hash = $this->initializedHashMapping[$event][$hash];
+                unset($this->initializedHashMapping[$event][$hash]);
+            }
+
             // Check if we actually have this listener associated
             if (isset($this->listeners[$event][$hash])) {
                 unset($this->listeners[$event][$hash]);
@@ -190,13 +201,25 @@ public function removeEventSubscriber(EventSubscriber $subscriber): void
     private function initializeListeners(string $eventName)
     {
         $this->initialized[$eventName] = true;
+
+        // We'll refill the whole array in order to keep the same order
+        $listeners = [];
         foreach ($this->listeners[$eventName] as $hash => $listener) {
             if (\is_string($listener)) {
-                $this->listeners[$eventName][$hash] = $listener = $this->container->get($listener);
+                $listener = $this->container->get($listener);
+                $newHash = $this->getHash($listener);
+
+                $this->initializedHashMapping[$eventName][$hash] = $newHash;
+
+                $listeners[$newHash] = $listener;
 
-                $this->methods[$eventName][$hash] = $this->getMethod($listener, $eventName);
+                $this->methods[$eventName][$newHash] = $this->getMethod($listener, $eventName);
+            } else {
+                $listeners[$hash] = $listener;
             }
         }
+
+        $this->listeners[$eventName] = $listeners;
     }
 
     private function initializeSubscribers()
 
@@ -202,6 +202,34 @@ public function testRemoveEventListener()
         $this->assertSame([], $this->evm->getListeners('foo'));
     }
 
+    public function testRemoveAllEventListener()
+    {
+        $this->container->set('lazy', new MyListener());
+        $this->evm->addEventListener('foo', 'lazy');
+        $this->evm->addEventListener('foo', new MyListener());
+
+        foreach ($this->evm->getAllListeners() as $event => $listeners) {
+            foreach ($listeners as $listener) {
+                $this->evm->removeEventListener($event, $listener);
+            }
+        }
+
+        $this->assertSame([], $this->evm->getListeners('foo'));
+    }
+
+    public function testRemoveSameLazyListenerWithInstance()
+    {
+        $listener = new MyListener();
+        $this->container->set('lazy', $listener);
+        $this->container->set('lazy2', $listener);
+        $this->evm->addEventListener('foo', 'lazy');
+        $this->evm->addEventListener('foo', 'lazy2');
+
+        $this->evm->removeEventListener('foo', $listener);
+
+        $this->assertSame([], $this->evm->getListeners('foo'));
+    }
+
     public function testRemoveEventListenerAfterDispatchEvent()
     {
         $this->container->set('lazy', $listener1 = new MyListener());