8000 updated all HttpKernel event listeners to implement EventSubscriberIn… · echavez/symfony@beda03b · GitHub
[go: up one dir, main page]
Skip to content

Commit beda03b

Browse files
fabpotfabpot
committed
updated all HttpKernel event listeners to implement EventSubscriberInterface
1 parent 38fb43c commit beda03b

File tree

10 files changed

+57
-14
lines changed

10 files changed

+57
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<service id="esi" class="%esi.class%" />
1414

1515
<service id="esi_listener" class="%esi_listener.class%">
16-
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
16+
<tag name="kernel.event_subscriber" />
1717
<argument type="service" id="esi" on-invalid="ignore" />
1818
</service>
1919
</services>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
</service>
2525

2626
<service id="profiler_listener" class="%profiler_listener.class%">
27-
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-100" />
28-
<tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" />
27+
<tag name="kernel.event_subscriber" />
2928
<argument type="service" id="profiler" />
3029
<argument type="service" id="profiler.request_matcher" on-invalid="null" />
3130
<argument>%profiler_listener.only_exceptions%</argument>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@
8484
</service>
8585

8686
<service id="router_listener" class="%router_listener.class%">
87-
<tag name="kernel.event_listener" event="kernel.request" method="onEarlyKernelRequest" priority="255" />
88-
<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
87+
<tag name="kernel.event_subscriber" />
8988
<tag name="monolog.logger" channel="request" />
9089
<argument type="service" id="router" />
9190
<argument type="service" id="logger" on-invalid="ignore" />

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

Lines changed: 2 additions & 3 deletions
< 6D4E tr class="diff-line-row">
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
</service>
2626

2727
<service id="response_listener" class="%response_listener.class%">
28-
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
28+
<tag name="kernel.event_subscriber" />
2929
<argument>%kernel.charset%</argument>
3030
</service>
3131

3232
<service id="locale_listener" class="%locale_listener.class%">
33-
<tag name="kernel.event_listener" event="kernel.request" method="onEarlyKernelRequest" priority="255" />
34-
<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="-1" />
33+
<tag name="kernel.event_subscriber" />
3534
<argument>%kernel.default_locale%</argument>
3635
<argument type="service" id="router" on-invalid="ignore" />
3736
</service>

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</service>
8484

8585
<service id="twig.exception_listener" class="%twig.exception_listener.class%">
86-
<tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-128" />
86+
<tag name="kernel.event_subscriber" />
8787
<tag name="monolog.logger" channel="request" />
8888
<argument>%twig.exception_listener.controller%</argument>
8989
<argument type="service" id="logger" on-invalid="null" />

‎src/Symfony/Component/HttpKernel/EventListener/EsiListener.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
use Symfony\Component\HttpFoundation\Response;
1515
use Symfony\Component\HttpKernel\HttpKernelInterface;
1616
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
17+
use Symfony\Component\HttpKernel\KernelEvents;
1718
use Symfony\Component\HttpKernel\HttpCache\Esi;
19+
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1820

1921
/**
2022
* EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
2123
*
2224
* @author Fabien Potencier <fabien@symfony.com>
2325
*/
24-
class EsiListener
26+
class EsiListener implements EventSubscriberInterface
2527
{
2628
private $i;
2729
private $esi;
@@ -49,4 +51,11 @@ public function onKernelResponse(FilterResponseEvent $event)
4951

5052
$this->esi->addSurrogateControl($event->getResponse());
5153
}
54+
55+
static public function getSubscribedEvents()
56+
{
57+
return array(
58+
KernelEvents::RESPONSE => 'onKernelResponse',
59+
);
60+
}
5261
}

‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@
1414
use Symfony\Component\HttpKernel\Log\LoggerInterface;
1515
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
1616
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
17+
use Symfony\Component\HttpKernel\KernelEvents;
1718
use Symfony\Component\HttpKernel\HttpKernelInterface;
1819
use Symfony\Component\HttpKernel\Exception\FlattenException;
1920
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
2021
use Symfony\Component\HttpFoundation\Request;
22+
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
2123

2224
/**
2325
* ExceptionListener.
2426
*
2527
* @author Fabien Potencier <fabien@symfony.com>
2628
*/
27-
class ExceptionListener
29+
class ExceptionListener implements EventSubscriberInterface
2830
{
2931
private $controller;
3032
private $logger;
@@ -101,4 +103,11 @@ public function onKernelException(GetResponseForExceptionEvent $event)
101103

102104
$handling = false;
103105
}
106+
107+
static public function getSubscribedEvents()
108+
{
109+
return array(
110+
KernelEvents::EXCEPTION => array('onKernelException', -128),
111+
);
112+
}
104113
}

‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313

1414
use Symfony\Component\HttpKernel\HttpKernelInterface;
1515
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
16+
use Symfony\Component\HttpKernel\KernelEvents;
1617
use Symfony\Component\Routing\RouterInterface;
18+
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1719

1820
/**
1921
* Initializes the locale based on the current request.
2022
*
2123
* @author Fabien Potencier <fabien@symfony.com>
2224
*/
23-
class LocaleListener
25+
class LocaleListener implements EventSubscriberInterface
2426
{
2527
private $router;
2628
private $defaultLocale;
@@ -60,4 +62,11 @@ public function onKernelRequest(GetResponseEvent $event)
6062
$this->router->getContext()->setParameter('_locale', $request->getLocale());
6163
}
6264
}
65+
66+
static public function getSubscribedEvents()
67+
{
68+
return array(
69+
KernelEvents::REQUEST => array(array('onEarlyKernelRequest', 255), array('onKernelRequest', -1)),
70+
);
71+
}
6372
}

‎src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@
1616
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
1717
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
1818
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
19+
use Symfony\Component\HttpKernel\KernelEvents;
1920
use Symfony\Component\HttpKernel\Profiler\Profiler;
2021
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
22+
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
2123

2224
/**
2325
* ProfilerListener collects data for the current request by listening to the onKernelResponse event.
2426
*
2527
* @author Fabien Potencier <fabien@symfony.com>
2628
*/
27-
class ProfilerListener
29+
class ProfilerListener implements EventSubscriberInterface
2830
{
2931
protected $profiler;
3032
protected $matcher;
@@ -100,4 +102,12 @@ public function onKernelResponse(FilterResponseEvent $event)
100102
}
101103
}
102104
}
105+
106+
static public function getSubscribedEvents()
107+
{
108+
return array(
109+
KernelEvents::RESPONSE => array('onKernelResponse', -100),
110+
KernelEvents::EXCEPTION => 'onKernelException',
111+
);
112+
}
103113
}

‎src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
1515
use Symfony\Component\HttpFoundation\Response;
1616
use Symfony\Component\HttpKernel\HttpKernelInterface;
17+
use Symfony\Component\HttpKernel\KernelEvents;
18+
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1719

1820
/**
1921
* ResponseListener fixes the Response headers based on the Request.
2022
*
2123
* @author Fabien Potencier <fabien@symfony.com>
2224
*/
23-
class ResponseListener
25+
class ResponseListener implements EventSubscriberInterface
2426
{
2527
private $charset;
2628

@@ -65,4 +67,11 @@ public function onKernelResponse(FilterResponseEvent $event)
6567
$response->headers->set('Content-Type', $mimeType);
6668
}
6769
}
70+
71+
static public function getSubscribedEvents()
72+
{
73+
return array(
74+
KernelEvents::RESPONSE => 'onKernelResponse',
75+
);
76+
}
6877
}

0 commit comments

Comments
 (0)
0