From a28852120449ea5262d22eda0340f97fc0bceaa2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 9 Nov 2012 17:27:53 +0100 Subject: [PATCH] displayed the full event listener names to avoid name collisions (closes #5019) --- .../WebProfilerBundle/Resources/views/Collector/time.html.twig | 2 +- .../Component/HttpKernel/Debug/TraceableEventDispatcher.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig index 207b9e004d..8f16d54836 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -448,7 +448,7 @@ {% for name, event in events %} {% if '__section__' != name %} { - "name": "{{ name }}", + "name": "{{ name|replace({"\\": "\\\\"}) }}", "category": "{{ event.category }}", "origin": {{ "%F"|format(event.origin) }}, "starttime": {{ "%F"|format(event.starttime) }}, diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php index c6b5ef7436..9c93f29b99 100644 --- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php @@ -241,7 +241,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, TraceableEve $this->called[$eventName.'.'.$info['pretty']] = $info; - return $this->stopwatch->start(isset($info['class']) ? substr($info['class'], strrpos($info['class'], '\\') + 1) : $info['type'], 'event_listener'); + return $this->stopwatch->start(isset($info['class']) ? $info['class'] : $info['type'], 'event_listener'); } /**