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 tag). * This means that the WDT is never included in sub-requests or ESI requests. @@ -45,7 +45,7 @@ class WebDebugToolbarListener return $this->verbose; } - public function onCoreResponse(FilterResponseEvent $event) + public function onKernelResponse(FilterResponseEvent $event) { if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { return; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml index 916f4f43ee..874008a4b9 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml @@ -10,7 +10,7 @@ - + %web_profiler.debug_toolbar.intercept_redirects% %web_profiler.debug_toolbar.verbose% diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php index fb1357c25e..b6986176e8 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php @@ -59,7 +59,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $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 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response); $listener = new WebDebugToolbarListener($this->getTemplatingMock()); - $listener->onCoreResponse($event); + $listener->onKernelResponse($event); $this->assertEquals("\nWDT\n", $response->getContent()); } @@ -90,7 +90,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response); $listener = new WebDebugToolbarListener($this->getTemplatingMock()); - $listener->onCoreResponse($event); + $listener->onKernelResponse($event); $this->assertEquals('', $response->getContent()); } @@ -106,7 +106,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response); $listener = new WebDebugToolbarListener($this->getTemplatingMock()); - $listener->onCoreResponse($event); + $listener->onKernelResponse($event); $this->assertEquals('', $response->getContent()); } @@ -122,7 +122,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::SUB_REQUEST, $response); $listener = new WebDebugToolbarListener($this->getTemplatingMock()); - $listener->onCoreResponse($event); + $listener->onKernelResponse($event); $this->assertEquals('', $response->getContent()); } @@ -138,7 +138,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response); $listener = new WebDebugToolbarListener($this->getTemplatingMock()); - $listener->onCoreResponse($event); + $listener->onKernelResponse($event); $this->assertEquals('
Some content
', $response->getContent()); } @@ -154,7 +154,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $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('', $response->getContent()); } @@ -170,7 +170,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase $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('', $response->getContent()); } diff --git a/src/Symfony/Component/HttpKernel/EventListener/EsiListener.php b/src/Symfony/Component/HttpKernel/EventListener/EsiListener.php index 1ebe0dde8f..d05153e842 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/EsiListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/EsiListener.php @@ -41,7 +41,7 @@ class EsiListener * * @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; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index a965ddaf71..df862a8318 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -35,7 +35,7 @@ class ExceptionListener $this->logger = $logger; } - public function onCoreException(GetResponseForExceptionEvent $event) + public function onKernelException(GetResponseForExceptionEvent $event) { static $handling; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index 3d8f5ec744..4a58ce3798 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Profiler\Profiler; 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 */ @@ -51,11 +51,11 @@ class ProfilerListener } /** - * 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 @@ class ProfilerListener } /** - * 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) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php index 83120634a3..446515b518 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php @@ -34,7 +34,7 @@ class ResponseListener * * @param FilterResponseEvent $event A FilterResponseEvent instance */ - public function onCoreResponse(FilterResponseEvent $event) + public function onKernelResponse(FilterResponseEvent $event) { $request = $event->getRequest(); $response = $event->getResponse(); diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index 57999fc082..d0c15578f9 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -89,7 +89,7 @@ class HttpKernel implements HttpKernelInterface { // request $event = new GetResponseEvent($this, $request, $type); - $this->dispatcher->dispatch(CoreEvents::REQUEST, $event); + $this->dispatcher->dispatch(KernelEvents::REQUEST, $event); if ($event->hasResponse()) { return $this->filterResponse($event->getResponse(), $request, $type); @@ -101,7 +101,7 @@ class HttpKernel implements HttpKernelInterface } $event = new FilterControllerEvent($this, $controller, $request, $type); - $this->dispatcher->dispatch(CoreEvents::CONTROLLER, $event); + $this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event); $controller = $event->getController(); // controller arguments @@ -113,7 +113,7 @@ class HttpKernel implements HttpKernelInterface // view if (!$response instanceof Response) { $event = new GetResponseForControllerResultEvent($this, $request, $type, $response); - $this->dispatcher->dispatch(CoreEvents::VIEW, $event); + $this->dispatcher->dispatch(KernelEvents::VIEW, $event); if ($event->hasResponse()) { $response = $event->getResponse(); @@ -148,7 +148,7 @@ class HttpKernel implements HttpKernelInterface { $event = new FilterResponseEvent($this, $request, $type, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); return $event->getResponse(); } @@ -165,7 +165,7 @@ class HttpKernel implements HttpKernelInterface private function handleException(\Exception $e, $request, $type) { $event = new GetResponseForExceptionEvent($this, $request, $type, $e); - $this->dispatcher->dispatch(CoreEvents::EXCEPTION, $event); + $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event); if (!$event->hasResponse()) { throw $e; diff --git a/src/Symfony/Component/HttpKernel/CoreEvents.php b/src/Symfony/Component/HttpKernel/KernelEvents.php similarity index 90% rename from src/Symfony/Component/HttpKernel/CoreEvents.php rename to src/Symfony/Component/HttpKernel/KernelEvents.php index f0abb63146..4f69f8acd1 100644 --- a/src/Symfony/Component/HttpKernel/CoreEvents.php +++ b/src/Symfony/Component/HttpKernel/KernelEvents.php @@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel; * * @author Bernhard Schussek */ -final class CoreEvents +final class KernelEvents { /** * The REQUEST event occurs at the very beginning of request @@ -29,7 +29,7 @@ final class CoreEvents * * @var string */ - const REQUEST = 'core.request'; + const REQUEST = 'kernel.request'; /** * The EXCEPTION event occurs when an uncaught exception appears @@ -41,7 +41,7 @@ final class CoreEvents * * @var string */ - const EXCEPTION = 'core.exception'; + const EXCEPTION = 'kernel.exception'; /** * The VIEW event occurs when the return value of a controller @@ -54,7 +54,7 @@ final class CoreEvents * * @var string */ - const VIEW = 'core.view'; + const VIEW = 'kernel.view'; /** * The CONTROLLER event occurs once a controller was found for @@ -66,7 +66,7 @@ final class CoreEvents * * @var string */ - const CONTROLLER = 'core.controller'; + const CONTROLLER = 'kernel.controller'; /** * The RESPONSE event occurs once a response was created for @@ -78,5 +78,5 @@ final class CoreEvents * * @var string */ - const RESPONSE = 'core.response'; + const RESPONSE = 'kernel.response'; } diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php index 774303dc5a..996df297bd 100644 --- a/src/Symfony/Component/Security/Http/Firewall.php +++ b/src/Symfony/Component/Security/Http/Firewall.php @@ -50,7 +50,7 @@ class Firewall * * @param GetResponseEvent $event An GetResponseEvent instance */ - public function onCoreRequest(GetResponseEvent $event) + public function onKernelRequest(GetResponseEvent $event) { if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { return; diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index fc8203a635..4cbd6ddc5f 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -21,7 +21,6 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\SessionUnavailableException; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\CoreEvents; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index 332e3f86fe..66d0ea1745 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -18,7 +18,6 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; use Symfony\Component\Security\Http\SecurityEvents; use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\HttpKernel\CoreEvents; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 49362666a9..6fb77e9d60 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -16,7 +16,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\HttpKernel\CoreEvents; +use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; @@ -50,7 +50,7 @@ class ContextListener implements ListenerInterface $this->logger = $logger; if (null !== $dispatcher) { - $dispatcher->addListener(CoreEvents::RESPONSE, array($this, 'onCoreResponse')); + $dispatcher->addListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse')); } } @@ -87,7 +87,7 @@ class ContextListener implements ListenerInterface * * @param FilterResponseEvent $event A FilterResponseEvent instance */ - public function onCoreResponse(FilterResponseEvent $event) + public function onKernelResponse(FilterResponseEvent $event) { if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { return; diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index 5755c2def6..5242815132 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -23,7 +23,7 @@ use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Symfony\Component\Security\Core\Exception\InsufficientAuthenticationException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\CoreEvents; +use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -53,13 +53,13 @@ class ExceptionListener } /** - * Registers a onCoreException listener to take care of security exceptions. + * Registers a onKernelException listener to take care of security exceptions. * * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function register(EventDispatcherInterface $dispatcher) { - $dispatcher->addListener(CoreEvents::EXCEPTION, array($this, 'onCoreException')); + $dispatcher->addListener(KernelEvents::EXCEPTION, array($this, 'onKernelException')); } /** @@ -67,7 +67,7 @@ class ExceptionListener * * @param GetResponseForExceptionEvent $event An GetResponseForExceptionEvent instance */ - public function onCoreException(GetResponseForExceptionEvent $event) + public function onKernelException(GetResponseForExceptionEvent $event) { $exception = $event->getException(); $request = $event->getRequest(); diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index 9b144b6202..0b3bc78aec 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -6,7 +6,6 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\HttpKernel\CoreEvents; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; diff --git a/tests/Symfony/Tests/Component/HttpKernel/EventListener/EsiListenerTest.php b/tests/Symfony/Tests/Component/HttpKernel/EventListener/EsiListenerTest.php index de4ff396aa..19ff187699 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/EventListener/EsiListenerTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/EventListener/EsiListenerTest.php @@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\HttpKernel\EventListener; use Symfony\Component\HttpKernel\HttpCache\Esi; use Symfony\Component\HttpKernel\EventListener\EsiListener; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\HttpKernel\CoreEvents; +use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; @@ -29,9 +29,9 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase $response = new Response('foo '); $listener = new EsiListener(new Esi()); - $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse')); + $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse')); $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response); - $dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('', $event->getResponse()->headers->get('Surrogate-Control')); } @@ -43,9 +43,9 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase $response = new Response('foo '); $listener = new EsiListener(new Esi()); - $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse')); + $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse')); $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response); - $dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('content="ESI/1.0"', $event->getResponse()->headers->get('Surrogate-Control')); } @@ -57,9 +57,9 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase $response = new Response('foo'); $listener = new EsiListener(new Esi()); - $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse')); + $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse')); $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response); - $dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('', $event->getResponse()->headers->get('Surrogate-Control')); } diff --git a/tests/Symfony/Tests/Component/HttpKernel/EventListener/ExceptionListenerTest.php b/tests/Symfony/Tests/Component/HttpKernel/EventListener/ExceptionListenerTest.php index 944dc21401..5062498366 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/EventListener/ExceptionListenerTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/EventListener/ExceptionListenerTest.php @@ -49,12 +49,12 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase $errorLog = ini_set('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul'); $l = new ExceptionListener('foo'); - $l->onCoreException($event); + $l->onKernelException($event); $this->assertEquals(new Response('foo'), $event->getResponse()); try { - $l->onCoreException($event2); + $l->onKernelException($event2); } catch(\Exception $e) { $this->assertSame('foo', $e->getMessage()); } @@ -71,12 +71,12 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase $logger = new TestLogger(); $l = new ExceptionListener('foo', $logger); - $l->onCoreException($event); + $l->onKernelException($event); $this->assertEquals(new Response('foo'), $event->getResponse()); try { - $l->onCoreException($event2); + $l->onKernelException($event2); } catch(\Exception $e) { $this->assertSame('foo', $e->getMessage()); } diff --git a/tests/Symfony/Tests/Component/HttpKernel/EventListener/ResponseListenerTest.php b/tests/Symfony/Tests/Component/HttpKernel/EventListener/ResponseListenerTest.php index 9b5e831b10..4ba4ca2280 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/EventListener/ResponseListenerTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/EventListener/ResponseListenerTest.php @@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\HttpKernel\CoreEvents; +use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\EventDispatcher\EventDispatcher; class ResponseListenerTest extends \PHPUnit_Framework_TestCase @@ -29,7 +29,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase { $this->dispatcher = new EventDispatcher(); $listener = new ResponseListener('UTF-8'); - $this->dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse')); + $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse')); $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'); @@ -46,7 +46,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $response = new Response('foo'); $event = new FilterResponseEvent($this->kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('', $event->getResponse()->headers->get('content-type')); } @@ -57,7 +57,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $response->headers->set('Content-Type', 'text/plain'); $event = new FilterResponseEvent($this->kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('text/plain', $event->getResponse()->headers->get('content-type')); } @@ -67,7 +67,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $response = new Response('foo'); $event = new FilterResponseEvent($this->kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('text/html', $event->getResponse()->headers->get('content-type')); } @@ -79,7 +79,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $request->setRequestFormat('json'); $event = new FilterResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('application/json', $event->getResponse()->headers->get('content-type')); } @@ -90,7 +90,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $request = Request::create('/', 'HEAD'); $event = new FilterResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('', $response->getContent()); } @@ -98,12 +98,12 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase public function testFilterSetsNonDefaultCharsetIfNotOverridden() { $listener = new ResponseListener('ISO-8859-15'); - $this->dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'), 1); + $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1); $response = new Response('foo'); $event = new FilterResponseEvent($this->kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('ISO-8859-15', $response->getCharset()); } @@ -111,13 +111,13 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase public function testFilterDoesNothingIfCharsetIsOverridden() { $listener = new ResponseListener('ISO-8859-15'); - $this->dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'), 1); + $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1); $response = new Response('foo'); $response->setCharset('ISO-8859-1'); $event = new FilterResponseEvent($this->kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('ISO-8859-1', $response->getCharset()); } @@ -125,14 +125,14 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase public function testFiltersSetsNonDefaultCharsetIfNotOverriddenOnNonTextContentType() { $listener = new ResponseListener('ISO-8859-15'); - $this->dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'), 1); + $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1); $response = new Response('foo'); $request = Request::create('/'); $request->setRequestFormat('application/json'); $event = new FilterResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response); - $this->dispatcher->dispatch(CoreEvents::RESPONSE, $event); + $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event); $this->assertEquals('ISO-8859-15', $response->getCharset()); } diff --git a/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php b/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php index 22126dcc31..149cbeb8de 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php @@ -13,7 +13,7 @@ namespace Symfony\Tests\Component\HttpKernel; use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\CoreEvents; +use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -43,7 +43,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalse() { $dispatcher = new EventDispatcher(); - $dispatcher->addListener(CoreEvents::EXCEPTION, function ($event) + $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) { $event->setResponse(new Response($event->getException()->getMessage())); }); @@ -56,7 +56,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase public function testHandleWhenAListenerReturnsAResponse() { $dispatcher = new EventDispatcher(); - $dispatcher->addListener(CoreEvents::REQUEST, function ($event) + $dispatcher->addListener(KernelEvents::REQUEST, function ($event) { $event->setResponse(new Response('hello')); }); @@ -143,7 +143,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase public function testHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegistered() { $dispatcher = new EventDispatcher(); - $dispatcher->addListener(CoreEvents::VIEW, function ($event) + $dispatcher->addListener(KernelEvents::VIEW, function ($event) { $event->setResponse(new Response($event->getControllerResult())); }); @@ -155,7 +155,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase public function testHandleWithAResponseListener() { $dispatcher = new EventDispatcher(); - $dispatcher->addListener(CoreEvents::RESPONSE, function ($event) + $dispatcher->addListener(KernelEvents::RESPONSE, function ($event) { $event->setResponse(new Response('foo')); });