feature #21625 Remove some container injections in favor of service locators (nicolas-grekas, chalasr)

fabpot · fabpot · commit b366aa1e03bc · 2017-02-27T18:18:26.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- Remove some container injections in favor of service locators | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/symfony#21553 (comment) | License | MIT | Doc PR | n/a Commits ------- 8293b753cf Replace some container injections by service locators 0be9ea8ba1 [EventDispatcher] Fix abstract event subscribers registration
diff --git a/DependencyInjection/RegisterListenersPass.php b/DependencyInjection/RegisterListenersPass.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Compiler pass to register tagged services for an event dispatcher.
@@ -105,8 +106,8 @@ public function process(ContainerBuilder $container)
             }
             $container->addObjectResource($class);
 
-            $r = new \ReflectionClass($class);
-            $extractingDispatcher->addSubscriber($r->newInstanceWithoutConstructor());
+            ExtractingEventDispatcher::$subscriber = $class;
+            $extractingDispatcher->addSubscriber($extractingDispatcher);
             foreach ($extractingDispatcher->listeners as $args) {
                 $args[1] = new ClosureProxyArgument($id, $args[1]);
                 $definition->addMethodCall('addListener', $args);
@@ -119,12 +120,21 @@ public function process(ContainerBuilder $container)
 /**
  * @internal
  */
-class ExtractingEventDispatcher extends EventDispatcher
+class ExtractingEventDispatcher extends EventDispatcher implements EventSubscriberInterface
 {
     public $listeners = array();
 
+    public static $subscriber;
+
     public function addListener($eventName, $listener, $priority = 0)
     {
         $this->listeners[] = array($eventName, $listener[1], $priority);
     }
+
+    public static function getSubscribedEvents()
+    {
+        $callback = array(self::$subscriber, 'getSubscribedEvents');
+
+        return $callback();
+    }
 }
