merged branch fabpot/profiler-listeners (PR #5963)

This PR was merged into the master branch.

Commits
-------

a288521 displayed the full event listener names to avoid name collisions (closes #5019)

Discussion
----------

displayed the full event listener names to avoid name collisions (closes #5019)

---------------------------------------------------------------------------

by stof at 2012-11-09T23:14:41Z

👍

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) }},

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');
     }
 
     /**