Renamed core.* events to kernel.* and CoreEvents to KernelEvents

UPDATE.md

@@ -21,16 +21,23 @@ beta5 to RC1
     * `attributes` to `widget_attributes`
     * `options` to `widget_choice_options`
 
-* Kernel listeners must now be tagged with kernel.event_listener:
+* Kernel event changes:
+    * Kernel events are now properly prefixed with `kernel` instead of `core`:
+    * Kernel listeners must now be tagged with kernel.event_listener:
 
-    * Before:
+        * Before:
+
+                <tag name="kernel.listener" event="core.request" method="onCoreRequest" />
 
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" />
+        * After:
 
-    * After:
+                <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
 
-            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" />
+    Note: the method can of course remain as `onCoreRequest`, but renaming it
+    as well for consistency with future projects makes sense.
 
+    * The `Symfony\Component\HttpKernel\CoreEvents` class has been renamed to
+      `Symfony\Component\HttpKernel\KernelEvents`
 
 beta4 to beta5
 --------------

src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

@@ -36,7 +36,7 @@ class FirePHPHandler extends BaseFirePHPHandler
     /**
      * Adds the headers to the response once it's created
      */
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;

src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php

@@ -59,7 +59,7 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
-    public function onCoreController(FilterControllerEvent $event)
+    public function onKernelController(FilterControllerEvent $event)
     {
         $this->controllers[$event->getRequest()] = $event->getController();
     }

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

@@ -127,7 +127,7 @@ public function load(array $configs, ContainerBuilder $container)
             'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
             'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
             'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
-            'Symfony\\Component\\HttpKernel\\CoreEvents',
+            'Symfony\\Component\\HttpKernel\\KernelEvents',
 
             'Symfony\\Bundle\\FrameworkBundle\\EventListener\\RouterListener',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',

src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php

@@ -42,7 +42,7 @@ public function __construct(RouterInterface $router, $httpPort = 80, $httpsPort
         $this->logger = $logger;
     }
 
-    public function onEarlyCoreRequest(GetResponseEvent $event)
+    public function onEarlyKernelRequest(GetResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
@@ -64,7 +64,7 @@ public function onEarlyCoreRequest(GetResponseEvent $event)
         $this->router->setContext($context);
     }
 
-    public function onCoreRequest(GetResponseEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
 

src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php

@@ -33,7 +33,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function onCoreRequest(GetResponseEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;

src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php

@@ -36,7 +36,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function onCoreRequest(GetResponseEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
@@ -55,11 +55,11 @@ public function onCoreRequest(GetResponseEvent $event)
 
     /**
      * Checks if session was initialized and saves if current request is master
-     * Runs on 'core.response' in test environment
+     * Runs on 'kernel.response' in test environment
      *
      * @param FilterResponseEvent $event
      */
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;

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.event_listener" event="core.controller" method="onCoreController"/>
+            <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
             <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="255" />
         </service>
 

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.event_listener" event="core.response" method="onCoreResponse" />
+          <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
           <argument type="service" id="esi" on-invalid="ignore" />
         </service>
     </services>

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

@@ -24,8 +24,8 @@
         </service>
 
         <service id="profiler_listener" class="%profiler_listener.class%">
-            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" priority="-100" />
-            <tag name="kernel.event_listener" event="core.exception" method="onCoreException" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-100" />
+            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" />
             <argument type="service" id="profiler" />
             <argument type="service" id="profiler.request_matcher" on-invalid="null" />
             <argument>%profiler_listener.only_exceptions%</argument>

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.event_listener" event="core.request" method="onCoreRequest" priority="192" />
-            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" priority="-128" />
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="192" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-128" />
         </service>
     </services>
 </container>

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

@@ -27,8 +27,8 @@
         </service>
 
         <service id="router_listener" class="%router_listener.class%">
-            <tag name="kernel.event_listener" event="core.request" method="onEarlyCoreRequest" priority="255" />
-            <tag name="kernel.event_listener" event="core.request" method="onCoreRequest" />
+            <tag name="kernel.event_listener" event="kernel.request" method="onEarlyKernelRequest" priority="255" />
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
             <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.event_listener" event="core.request" method="onCoreRequest" priority="128" />
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="128" />
             <argument type="service" id="service_container" />
         </service>
 
         <service id="response_listener" class="%response_listener.class%">
-            <tag name="kernel.event_listener" event="core.response" method="onCoreResponse" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
             <argument>%kernel.charset%</argument>
         </service>
 
         <service id="exception_listener" class="%exception_listener.class%">
-            <tag name="kernel.event_listener" event="core.exception" method="onCoreException" priority="-128" />
+            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-128" />
             <tag name="monolog.logger" channel="request" />
             <argument>%exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />

src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/RouterListenerTest.php

@@ -49,7 +49,7 @@ public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHtt
                      ->with($expectedContext);
 
         $event = $this->createGetResponseEventForUri($uri);
-        $listener->onEarlyCoreRequest($event);
+        $listener->onEarlyKernelRequest($event);
     }
 
     public function getPortData()

src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php

@@ -62,7 +62,7 @@ private function filterResponse(Request $request, $type = HttpKernelInterface::M
         $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
         $event = new FilterResponseEvent($kernel, $request, $type, $response);
 
-        $this->listener->onCoreResponse($event);
+        $this->listener->onKernelResponse($event);
 
         $this->assertSame($response, $event->getResponse());
     }

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.event_listener', array('event' => 'core.response', 'method' => 'onCoreResponse'));
+            $definition->addTag('kernel.event_listener', array('event' => 'kernel.response', 'method' => 'onKernelResponse'));
             break;
 
         case 'rotating_file':

src/Symfony/Bundle/SecurityBundle/EventListener/ResponseListener.php

@@ -22,7 +22,7 @@
  */
 class ResponseListener
 {
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         $request = $event->getRequest();
         $response = $event->getResponse();

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.event_listener" event="core.request" method="onCoreRequest" priority="64" />
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="64" />
             <argument type="service" id="security.firewall.map" />
             <argument type="service" id="event_dispatcher" />
         </service>

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.event_listener" event="core.response" method="onCoreResponse" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
         </service>
     </services>
 

src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php

@@ -20,7 +20,7 @@
 /**
  * WebDebugToolbarListener injects the Web Debug Toolbar.
  *
- * The handle method must be connected to the onCoreResponse event.
+ * The onKernelResponse method must be connected to the kernel.response event.
  *
  * The WDT is only injected on well-formed HTML (with a proper </body> tag).
  * This means that the WDT is never included in sub-requests or ESI requests.
@@ -45,7 +45,7 @@ public function getVerbose()
         return $this->verbose;
     }
 
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;

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.event_listener" event="core.response" method="onCoreResponse" priority="-128" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-128" />
             <argument type="service" id="templating.engine.twig" />
             <argument>%web_profiler.debug_toolbar.intercept_redirects%</argument>
             <argument>%web_profiler.debug_toolbar.verbose%</argument>

src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php

@@ -59,7 +59,7 @@ public function testRedirectionIsIntercepted()
             $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
             $listener = new WebDebugToolbarListener($this->getTemplatingMock('Redirection'), true);
-            $listener->onCoreResponse($event);
+            $listener->onKernelResponse($event);
 
             $this->assertEquals(200, $response->getStatusCode());
             $this->assertEquals('Redirection', $response->getContent());
@@ -74,7 +74,7 @@ public function testToolbarIsInjected()
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals("<html><head></head><body>\nWDT\n</body></html>", $response->getContent());
     }
@@ -90,7 +90,7 @@ public function testToolbarIsNotInjectedOnRedirection()
             $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
             $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-            $listener->onCoreResponse($event);
+            $listener->onKernelResponse($event);
 
             $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
         }
@@ -106,7 +106,7 @@ public function testToolbarIsNotInjectedWhenThereIsNoNoXDebugTokenResponseHeader
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
     }
@@ -122,7 +122,7 @@ public function testToolbarIsNotInjectedWhenOnSubRequest()
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::SUB_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
     }
@@ -138,7 +138,7 @@ public function testToolbarIsNotInjectedOnIncompleteHtmlResponses()
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals('<div>Some content</div>', $response->getContent());
     }
@@ -154,7 +154,7 @@ public function testToolbarIsNotInjectedOnXmlHttpRequests()
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(true), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
     }
@@ -170,7 +170,7 @@ public function testToolbarIsNotInjectedOnNonHtmlRequests()
         $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json'), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTemplatingMock());
-        $listener->onCoreResponse($event);
+        $listener->onKernelResponse($event);
 
         $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
     }

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

@@ -41,7 +41,7 @@ public function __construct(Esi $esi = null)
      *
      * @param FilterResponseEvent $event A FilterResponseEvent instance
      */
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType() || null === $this->esi) {
             return;

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

@@ -35,7 +35,7 @@ public function __construct($controller, LoggerInterface $logger = null)
         $this->logger = $logger;
     }
 
-    public function onCoreException(GetResponseForExceptionEvent $event)
+    public function onKernelException(GetResponseForExceptionEvent $event)
     {
         static $handling;
 

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

@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 
 /**
- * ProfilerListener collects data for the current request by listening to the onCoreResponse event.
+ * ProfilerListener collects data for the current request by listening to the onKernelResponse event.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -51,11 +51,11 @@ public function __construct(Profiler $profiler, RequestMatcherInterface $matcher
     }
 
     /**
-     * Handles the onCoreException event.
+     * Handles the onKernelException event.
      *
      * @param GetResponseForExceptionEvent $event A GetResponseForExceptionEvent instance
      */
-    public function onCoreException(GetResponseForExceptionEvent $event)
+    public function onKernelException(GetResponseForExceptionEvent $event)
     {
         if ($this->onlyMasterRequests && HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
@@ -65,11 +65,11 @@ public function onCoreException(GetResponseForExceptionEvent $event)
     }
 
     /**
-     * Handles the onCoreResponse event.
+     * Handles the onKernelResponse event.
      *
      * @param FilterResponseEvent $event A FilterResponseEvent instance
      */
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         $master = HttpKernelInterface::MASTER_REQUEST === $event->getRequestType();
         if ($this->onlyMasterRequests && !$master) {

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

@@ -34,7 +34,7 @@ public function __construct($charset)
      *
      * @param FilterResponseEvent $event    A FilterResponseEvent instance
      */
-    public function onCoreResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FilterResponseEvent $event)
     {
         $request = $event->getRequest();
         $response = $event->getResponse();