8000 Revert "merged branch fabpot/data-collector (PR #5619)" · dirkaholic/symfony@93b084c · GitHub
[go: up one dir, main page]
Skip to content

Commit 93b084c

Browse files
fabpotfabpot
committed
Revert "merged branch fabpot/data-collector (PR symfony#5619)"
This reverts commit 3f0a370, reversing changes made to bf1ab93.
1 parent 3f0a370 commit 93b084c

File tree

9 files changed

+206
-432
lines changed

9 files changed

+206
-432
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CHANGELOG
44
2.2.0
55
-----
66

7-
* replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
87
* added Client::enableProfiler()
98

109
2.1.0

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public function load(array $configs, ContainerBuilder $container)
4949

5050
if ($container->getParameter('kernel.debug')) {
5151
$loader->load('debug.xml');
52-
$container->setDefinition('event_dispatcher.original', $container->findDefinition('event_dispatcher'));
5352
$container->setDefinition('event_dispatcher', $container->findDefinition('debug.event_dispatcher'));
5453
$container->setAlias('debug.event_dispatcher', 'event_dispatcher');
5554

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<parameters>
8-
<parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher</parameter>
8+
<parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher</parameter>
99
<parameter key="debug.stopwatch.class">Symfony\Component\HttpKernel\Debug\Stopwatch</parameter>
1010
<parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
1111
<parameter key="debug.controller_resolver.class">Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver</parameter>
@@ -16,10 +16,9 @@
1616

1717
<service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
1818
<tag name="monolog.logger" channel="event" />
19-
<argument type="service" id="event_dispatcher.original" />
19+
<argument type="service" id="service_container" />
2020
<argument type="service" id="debug.stopwatch" />
2121
<argument type="service" id="logger" on-invalid="null" />
22-
<call method="setProfiler"><argument type="service" id="profiler" /></call>
2322
</service>
2423

2524
<service id="debug.controller_resolver" class="%debug.controller_resolver.class%">

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
<table>
2727
<tr>
2828
<th>Event name</th>
29+
<th>Priority</th>
2930
<th>Listener</th>
3031
</tr>
3132
{% for listener in collector.calledlisteners %}
3233
<tr>
3334
<td><code>{{ listener.event }}</code></td>
35+
<td><code>{{ listener.priority }}</code></td>
3436
<td><code>{{ display_listener(listener) }}</code></td>
3537
</tr>
3638
{% endfor %}
@@ -42,12 +44,14 @@
4244
<table>
4345
<tr>
4446
<th>Event name</th>
47+
<th>Priority</th>
4548
<th>Listener</th>
4649
</tr>
4750
{% set listeners = collector.notcalledlisteners %}
4851
{% for listener in listeners|keys|sort %}
4952
<tr>
5053
<td><code>{{ listeners[listener].event }}</code></td>
54+
<td><code>{{ listeners[listener].priority }}</code></td>
5155
<td><code>{{ display_listener(listeners[listener]) }}</code></td>
5256
</tr>
5357
{% endfor %}

‎src/Symfony/Component/EventDispatcher/Event.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ public function stopPropagation()
7474
/**
7575
* Stores the EventDispatcher that dispatches this Event
7676
*
77-
* @param EventDispatcherInterface $dispatcher
77+
* @param EventDispatcher $dispatcher
7878
*
7979
* @api
8080
*/
81-
public function setDispatcher(EventDispatcherInterface $dispatcher)
81+
public function setDispatcher(EventDispatcher $dispatcher)
8282
{
8383
$this->dispatcher = $dispatcher;
8484
}
8585

8686
/**
8787
* Returns the EventDispatcher that dispatches this Event
8888
A0CC *
89-
* @return EventDispatcherInterface
89+
* @return EventDispatcher
9090
*
9191
* @api
9292
*/

‎src/Symfony/Component/HttpKernel/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CHANGELOG
44
2.2.0
55
-----
66

7-
* added TraceableEventDispatcher (removed ContainerAwareTraceableEventDispatcher)
87
* added support for WinCache opcode cache in ConfigDataCollector
98

109
2.1.0

0 commit comments

Comments
 (0)
0