Respect parent class contract in ContainerAwareDoctrineEventManager

Koc · Koc · commit 43205af51eb4 · 2019-05-06T22:59:08.000+03:00
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -29,13 +29,6 @@ class ContainerAwareEventManager extends EventManager
      */
     private $listeners = [];
 
-    /**
-     * Map of initialized listener hash per listener service id.
-     *
-     * <service_name> => <object_hash>
-     */
-    private $initializedHashes = [];
-
     private $initialized = [];
 
     private $container;
@@ -146,10 +139,6 @@ public function removeEventListener($events, $listener)
     {
         if (\is_string($listener)) {
             $hash = '_service_'.$listener;
-            // Service already initialized
-            if (isset($this->initializedHashes[$hash])) {
-                $hash = $this->initializedHashes[$hash];
-            }
         } else {
             // Picks the hash code related to that listener
             $hash = spl_object_hash($listener);
@@ -170,9 +159,7 @@ private function initializeListeners($eventName)
     {
         foreach ($this->listeners[$eventName] as $hash => $listener) {
             if (\is_string($listener)) {
-                $listener = $this->container->get($listener);
-                $this->listeners[$eventName][$hash] = $listener;
-                $this->initializedHashes[$hash] = spl_object_hash($listener);
+                $this->listeners[$eventName][$hash] = $this->container->get($listener);
             }
         }
         $this->initialized[$eventName] = true;
