diff --git a/UPDATE.md b/UPDATE.md
index 0b28087238..c28308d922 100644
--- a/UPDATE.md
+++ b/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:
-
+
- * After:
+ * After:
-
+
+ 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
--------------
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
index 6b67386115..7da73f2606 100755
--- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
+++ b/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;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
index 1d6ea58d3c..6e726812fd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
@@ -59,7 +59,7 @@ class RequestDataCollector extends BaseRequestDataCollector
}
}
- public function onCoreController(FilterControllerEvent $event)
+ public function onKernelController(FilterControllerEvent $event)
{
$this->controllers[$event->getRequest()] = $event->getController();
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 2e631829c2..2160a14e85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -127,7 +127,7 @@ class FrameworkExtension extends Extension
'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',
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
index 379ef6fd03..c114bb07ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
+++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
@@ -42,7 +42,7 @@ class RouterListener
$this->logger = $logger;
}
- public function onEarlyCoreRequest(GetResponseEvent $event)
+ public function onEarlyKernelRequest(GetResponseEvent $event)
{
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
return;
@@ -64,7 +64,7 @@ class RouterListener
$this->router->setContext($context);
}
- public function onCoreRequest(GetResponseEvent $event)
+ public function onKernelRequest(GetResponseEvent $event)
{
$request = $event->getRequest();
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
index 07a8cd8c45..4869687e15 100644
--- a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
+++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
@@ -33,7 +33,7 @@ class SessionListener
$this->container = $container;
}
- public function onCoreRequest(GetResponseEvent $event)
+ public function onKernelRequest(GetResponseEvent $event)
{
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
return;
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
index 43a4f2c867..21f3df2d8c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
+++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
@@ -36,7 +36,7 @@ class TestSessionListener
$this->container = $container;
}
- public function onCoreRequest(GetResponseEvent $event)
+ public function onKernelRequest(GetResponseEvent $event)
{
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
return;
@@ -55,11 +55,11 @@ class TestSessionListener
/**
* 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;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index a3b8455d56..3b73f6d5f3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
index 98aff6a978..015afef397 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index a5a9fe1889..ac12bc3485 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -24,8 +24,8 @@
-
-
+
+
%profiler_listener.only_exceptions%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
index 54d639549d..ce186311c6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -26,8 +26,8 @@
-
-
+
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index a00edbd13a..6c568e2307 100755
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -27,8 +27,8 @@
-
-
+
+
%request_listener.http_port%
@@ -37,17 +37,17 @@
-
+
-
+
%kernel.charset%
-
+
%exception_listener.controller%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/RouterListenerTest.php
index 9047632bdd..6f1af22f6b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/RouterListenerTest.php
@@ -49,7 +49,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
->with($expectedContext);
$event = $this->createGetResponseEventForUri($uri);
- $listener->onEarlyCoreRequest($event);
+ $listener->onEarlyKernelRequest($event);
}
public function getPortData()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php
index 7088f8a934..8cd94c0079 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php
@@ -62,7 +62,7 @@ class TestSessionListenerTest extends \PHPUnit_Framework_TestCase
$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());
}
diff --git a/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php b/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php
index a94f0b2381..88f05cba21 100644
--- a/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php
+++ b/src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php
@@ -127,7 +127,7 @@ class MonologExtension extends Extension
$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':
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/ResponseListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/ResponseListener.php
index 6a24570aa0..822fce6143 100644
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/ResponseListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/EventListener/ResponseListener.php
@@ -22,7 +22,7 @@ use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
*/
class ResponseListener
{
- public function onCoreResponse(FilterResponseEvent $event)
+ public function onKernelResponse(FilterResponseEvent $event)
{
$request = $event->getRequest();
$response = $event->getResponse();
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 263fbb883c..b6c577e712 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -98,7 +98,7 @@
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index 8d8d1cc093..983ef576f1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -54,7 +54,7 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index ce4cfa5fe1..80429832c1 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -20,7 +20,7 @@ use Symfony\Bundle\TwigBundle\TwigEngine;
/**
* 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