[HttpKernel] unified the way the traceable event dispatcher injects information into the profiler (closes #5733)

fabpot · fabpot · commit c682f67df61d · 2012-10-13T12:32:02.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -32,9 +32,6 @@
 
         <service id="data_collector.events" class="%data_collector.events.class%" public="false">
             <tag name="data_collector" template="WebProfilerBundle:Collector:events" id="events" priority="255" />
-            <call method="setEventDispatcher">
-                <argument type="service" id="event_dispatcher" />
-            </call>
         </service>
 
         <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -14,7 +14,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * EventDataCollector.
@@ -23,26 +22,29 @@
  */
 class EventDataCollector extends DataCollector
 {
-    private $dispatcher;
-
-    public function setEventDispatcher(EventDispatcherInterface $dispatcher)
-    {
-        if ($dispatcher instanceof TraceableEventDispatcherInterface) {
-            $this->dispatcher = $dispatcher;
-        }
-    }
-
     /**
      * {@inheritdoc}
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         $this->data = array(
-            'called_listeners'     => null !== $this->dispatcher ? $this->dispatcher->getCalledListeners() : array(),
-            'not_called_listeners' => null !== $this->dispatcher ? $this->dispatcher->getNotCalledListeners() : array(),
+            'called_listeners'     => array(),
+            'not_called_listeners' => array(),
         );
     }
 
+    /**
+     * Sets the called listeners.
+     *
+     * @param array $listeners An array of called listeners
+     *
+     * @see TraceableEventDispatcherInterface
+     */
+    public function setCalledListeners(array $listeners)
+    {
+        $this->data['called_listeners'] = $listeners;
+    }
+
     /**
      * Gets the called listeners.
      *
@@ -55,6 +57,18 @@ public function getCalledListeners()
         return $this->data['called_listeners'];
     }
 
+    /**
+     * Sets the not called listeners.
+     *
+     * @param array $listeners An array of not called listeners
+     *
+     * @see TraceableEventDispatcherInterface
+     */
+    public function setNotCalledListeners(array $listeners)
+    {
+        $this->data['not_called_listeners'] = $listeners;
+    }
+
     /**
      * Gets the not called listeners.
      *
diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -318,23 +318,25 @@ private function updateProfiles($token, $updateChildren)
             return;
         }
 
-        $this->saveStopwatchInfoInProfile($profile, $updateChildren);
+        $this->saveInfoInProfile($profile, $updateChildren);
     }
 
     /**
-     * Update the profiles with the timing info and saves them.
+     * Update the profiles with the timing and events information and saves them.
      *
      * @param Profile $profile        The root profile
      * @param Boolean $updateChildren Whether to update the children altogether
      */
-    private function saveStopwatchInfoInProfile(Profile $profile, $updateChildren)
+    private function saveInfoInProfile(Profile $profile, $updateChildren)
     {
         $profile->getCollector('time')->setEvents($this->stopwatch->getSectionEvents($profile->getToken()));
+        $profile->getCollector('events')->setCalledListeners($this->getCalledListeners());
+        $profile->getCollector('events')->setNotCalledListeners($this->getNotCalledListeners());
         $this->profiler->saveProfile($profile);
 
         if ($updateChildren) {
             foreach ($profile->getChildren() as $child) {
-                $this->saveStopwatchInfoInProfile($child, true);
+                $this->saveInfoInProfile($child, true);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -318,23 +318,25 @@ private function updateProfiles($token, $updateChildren)`
`318`	`318`	`return;`
`319`	`319`	`}`
`320`	`320`
`321`		`- $this->saveStopwatchInfoInProfile($profile, $updateChildren);`
	`321`	`+ $this->saveInfoInProfile($profile, $updateChildren);`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`/**`
`325`		`- * Update the profiles with the timing info and saves them.`
	`325`	`+ * Update the profiles with the timing and events information and saves them.`
`326`	`326`	`*`
`327`	`327`	`* @param Profile $profile The root profile`
`328`	`328`	`* @param Boolean $updateChildren Whether to update the children altogether`
`329`	`329`	`*/`
`330`		`- private function saveStopwatchInfoInProfile(Profile $profile, $updateChildren)`
	`330`	`+ private function saveInfoInProfile(Profile $profile, $updateChildren)`
`331`	`331`	`{`
`332`	`332`	`$profile->getCollector('time')->setEvents($this->stopwatch->getSectionEvents($profile->getToken()));`
	`333`	`+ $profile->getCollector('events')->setCalledListeners($this->getCalledListeners());`
	`334`	`+ $profile->getCollector('events')->setNotCalledListeners($this->getNotCalledListeners());`
`333`	`335`	`$this->profiler->saveProfile($profile);`
`334`	`336`
`335`	`337`	`if ($updateChildren) {`
`336`	`338`	`foreach ($profile->getChildren() as $child) {`
`337`		`- $this->saveStopwatchInfoInProfile($child, true);`
	`339`	`+ $this->saveInfoInProfile($child, true);`
`338`	`340`	`}`
`339`	`341`	`}`
`340`	`342`	`}`