Rename kernel.listener to kernel.event_listener

Better consistency with doctrine.event_listener
symfony · Jun 21, 2011 · edbdf7b · edbdf7b
1 parent 73b22e5
commit edbdf7b
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 17 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -21,6 +21,17 @@ beta5 to RC1
     * `attributes` to `widget_attributes`
     * `options` to `widget_choice_options`
 
+* Kernel listeners must now be tagged with kernel.event_listener:
+
+    * Before:
+
+            <tag name="kernel.listener" event="core.request" method="onCoreRequest" />
+
+    * After:
+
+            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" />
+
+
 beta4 to beta5
 --------------
 

diff --git a/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php
@@ -25,12 +25,12 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('event_dispatcher');
 
-        foreach ($container->findTaggedServiceIds('kernel.listener') as $id => $events) {
+        foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events) {
             foreach ($events as $event) {
                 $priority = isset($event['priority']) ? $event['priority'] : 0;
 
                 if (!isset($event['event'])) {
-                    throw new \InvalidArgumentException(sprintf('Service "%s" must define the "event" attribute on "kernel.listener" tags.', $id));
+                    throw new \InvalidArgumentException(sprintf('Service "%s" must define the "event" attribute on "kernel.event_listener" tags.', $id));
                 }
 
                 if (!isset($event['method'])) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -21,7 +21,7 @@
         </service>
 
         <service id="data_collector.request" class="%data_collector.request.class%">
-            <tag name="kernel.listener" event="core.controller" method="onCoreController"/>
+            <tag name="kernel.event_listener" event="core.controller" method="onCoreController"/>
             <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="255" />
         </service>
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
@@ -13,7 +13,7 @@
         <service id="esi" class="%esi.class%" />
 
         <service id="esi_listener" class="%esi_listener.class%">
-          <tag name="kernel.listener" event="core.response" method="onCoreResponse" />
+          <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" />
           <argument type="service" id="esi" on-invalid="ignore" />
         </service>
     </services>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -24,8 +24,8 @@
         </service>
 
         <service id="profiler_listener" class="%profiler_listener.class%">
-            <tag name="kernel.listener" event="core.response" method="onCoreResponse" priority="-100" />
-            <tag name="kernel.listener" event="core.exception" method="onCoreException" />
+            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" priority="-100" />
+            <tag name="kernel.event_listener" event="core.exception" method="onCoreException" />
             <argument type="service" id="profiler" />
             <argument type="service" id="profiler.request_matcher" on-invalid="null" />
             <argument>%profiler_listener.only_exceptions%</argument>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -26,8 +26,8 @@
 
         <service id="test.session.listener" class="%test.session.listener.class%">
             <argument type="service" id="service_container" />
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="192" />
-            <tag name="kernel.listener" event="core.response" method="onCoreResponse" priority="-128" />
+            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" priority="192" />
+            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" priority="-128" />
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -27,8 +27,8 @@
         </service>
 
         <service id="router_listener" class="%router_listener.class%">
-            <tag name="kernel.listener" event="core.request" method="onEarlyCoreRequest" priority="255" />
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" />
+            <tag name="kernel.event_listener" event="core.request" method="onEarlyCoreRequest" priority="255" />
+            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" />
             <tag name="monolog.logger" channel="request" />
             <argument type="service" id="router" />
             <argument>%request_listener.http_port%</argument>
@@ -37,17 +37,17 @@
         </service>
 
         <service id="session_listener" class="%session_listener.class%">
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="128" />
+            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" priority="128" />
             <argument type="service" id="service_container" />
         </service>
 
         <service id="response_listener" class="%response_listener.class%">
-            <tag name="kernel.listener" event="core.response" method="onCoreResponse" />
+            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" />
             <argument>%kernel.charset%</argument>
         </service>
 
         <service id="exception_listener" class="%exception_listener.class%">
-            <tag name="kernel.listener" event="core.exception" method="onCoreException" priority="-128" />
+            <tag name="kernel.event_listener" event="core.exception" method="onCoreException" priority="-128" />
             <tag name="monolog.logger" channel="request" />
             <argument>%exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />

diff --git a/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php b/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php
@@ -127,7 +127,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['level'],
                 $handler['bubble'],
             ));
-            $definition->addTag('kernel.listener', array('event' => 'core.response', 'method' => 'onCoreResponse'));
+            $definition->addTag('kernel.event_listener', array('event' => 'core.response', 'method' => 'onCoreResponse'));
             break;
 
         case 'rotating_file':

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -98,7 +98,7 @@
 
         <!-- Firewall related services -->
         <service id="security.firewall" class="%security.firewall.class%">
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="64" />
+            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" priority="64" />
             <argument type="service" id="security.firewall.map" />
             <argument type="service" id="event_dispatcher" />
         </service>

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -54,7 +54,7 @@
         </service>
 
         <service id="security.rememberme.response_listener" class="%security.rememberme.response_listener.class%">
-            <tag name="kernel.listener" event="core.response" method="onCoreResponse" />
+            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" />
         </service>
     </services>
 

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
@@ -10,7 +10,7 @@
 
     <services>
         <service id="web_profiler.debug_toolbar" class="%web_profiler.debug_toolbar.class%">
-            <tag name="kernel.listener" event="core.response" method="onCoreResponse" priority="-128" />
+            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" priority="-128" />
             <argument type="service" id="templating.engine.twig" />
             <argument>%web_profiler.debug_toolbar.intercept_redirects%</argument>
             <argument>%web_profiler.debug_toolbar.verbose%</argument>