From 9a2e053cbc841d02baa13b15805e0b1af7a1884e Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Sun, 9 Jan 2011 11:25:50 +0100 Subject: [PATCH] [Event] Collected data is about listener (not event) calls --- .../FrameworkBundle/Debug/EventDispatcher.php | 29 +++++++------------ .../Resources/views/Collector/events.twig | 20 ++++++------- .../DataCollector/EventDataCollector.php | 20 ++++++------- .../EventDispatcherTraceableInterface.php | 14 +++++++-- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Debug/EventDispatcher.php b/src/Symfony/Bundle/FrameworkBundle/Debug/EventDispatcher.php index 22739721ea..4f832d8a9c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Debug/EventDispatcher.php +++ b/src/Symfony/Bundle/FrameworkBundle/Debug/EventDispatcher.php @@ -39,11 +39,7 @@ class EventDispatcher extends BaseEventDispatcher implements EventDispatcherTrac } /** - * Notifies all listeners of a given event. - * - * @param Event $event A Event instance - * - * @return Event The Event instance + * {@inheritDoc} */ public function notify(Event $event) { @@ -57,11 +53,7 @@ class EventDispatcher extends BaseEventDispatcher implements EventDispatcherTrac } /** - * Notifies all listeners of a given event until one returns a non null value. - * - * @param Event $event A Event instance - * - * @return Event The Event instance + * {@inheritDoc} */ public function notifyUntil(Event $event) { @@ -87,12 +79,7 @@ class EventDispatcher extends BaseEventDispatcher implements EventDispatcherTrac } /** - * Filters a value by calling all listeners of a given event. - * - * @param Event $event A Event instance - * @param mixed $value The value to be filtered - * - * @return Event The Event instance + * {@inheritDoc} */ public function filter(Event $event, $value) { @@ -107,12 +94,18 @@ class EventDispatcher extends BaseEventDispatcher implements EventDispatcherTrac return $event; } - public function getCalledEvents() + /** + * {@inheritDoc} + */ + public function getCalledListeners() { return $this->called; } - public function getNotCalledEvents() + /** + * {@inheritDoc} + */ + public function getNotCalledListeners() { $notCalled = array(); diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig index f8ce2e68ca..f790668394 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig @@ -6,7 +6,7 @@ Events {% endblock %} {% block panel %} -

Called Events

+

Called Listeners

@@ -14,27 +14,27 @@ Events - {% for event in collector.calledevents %} + {% for elements in collector.calledlisteners %} - - - + + + {% endfor %}
Caller Listener
{{ event.event }}{{ event.caller|abbr_class }}{{ event.listener|abbr_method }}(){{ elements.event }}{{ elements.caller|abbr_class }}{{ elements.listener|abbr_method }}()
- {% if collector.notcalledevents %} -

Not Called Events

+ {% if collector.notcalledlisteners %} +

Not Called Listeners

- {% for event in collector.notcalledevents %} + {% for elements in collector.notcalledlisteners %} - - + + {% endfor %}
Event Listener
{{ event.event }}{{ event.listener|abbr_method }}(){{ elements.event }}{{ elements.listener|abbr_method }}()
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php index 531236715a..ba07ff8309 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php @@ -38,33 +38,33 @@ class EventDataCollector extends DataCollector public function collect(Request $request, Response $response, \Exception $exception = null) { $this->data = array( - 'called_events' => null !== $this->dispatcher ? $this->dispatcher->getCalledEvents() : array(), - 'not_called_events' => null !== $this->dispatcher ? $this->dispatcher->getNotCalledEvents() : array(), + 'called_listeners' => null !== $this->dispatcher ? $this->dispatcher->getCalledListeners() : array(), + 'not_called_listeners' => null !== $this->dispatcher ? $this->dispatcher->getNotCalledListeners() : array(), ); } /** - * Gets the called events. + * Gets the called listeners. * - * @return array An array of called events + * @return array An array of called listeners * * @see EventDispatcherTraceableInterface */ - public function getCalledEvents() + public function getCalledListeners() { - return $this->data['called_events']; + return $this->data['called_listeners']; } /** - * Gets the not called events. + * Gets the not called listeners. * - * @return array An array of not called events + * @return array An array of not called listeners * * @see EventDispatcherTraceableInterface */ - public function getNotCalledEvents() + public function getNotCalledListeners() { - return $this->data['not_called_events']; + return $this->data['not_called_listeners']; } /** diff --git a/src/Symfony/Component/HttpKernel/Debug/EventDispatcherTraceableInterface.php b/src/Symfony/Component/HttpKernel/Debug/EventDispatcherTraceableInterface.php index cc74a883df..82dd5c1392 100644 --- a/src/Symfony/Component/HttpKernel/Debug/EventDispatcherTraceableInterface.php +++ b/src/Symfony/Component/HttpKernel/Debug/EventDispatcherTraceableInterface.php @@ -16,7 +16,17 @@ namespace Symfony\Component\HttpKernel\Debug; */ interface EventDispatcherTraceableInterface { - function getCalledEvents(); + /** + * Gets the called listeners. + * + * @return array An array of called listeners + */ + function getCalledListeners(); - function getNotCalledEvents(); + /** + * Gets the not called listeners. + * + * @return array An array of not called listeners + */ + function getNotCalledListeners(); }