Permalink
Browse files

merged branch lmcd/kernelevents-constants (PR #6499)

This PR was merged into the master branch.

Commits
-------

d5948f1 Use KernelEvents constants in TraceableEventDispatcher

Discussion
----------

[HttpKernel] Use KernelEvents constants in TraceableEventDispatcher

Can't see any reason why we're not using constants here.
  • Loading branch information...
2 parents 3931131 + d5948f1 commit 3778bf916e8fb77f7dc6609aee4d7676fab91d19 @fabpot fabpot committed Dec 28, 2012
Showing with 8 additions and 7 deletions.
  1. +8 −7 src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Debug;
use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Profiler\Profile;
use Symfony\Component\HttpKernel\Profiler\Profiler;
@@ -374,18 +375,18 @@ private function preDispatch($eventName, Event $event)
}
switch ($eventName) {
- case 'kernel.request':
+ case KernelEvents::REQUEST:
$this->stopwatch->openSection();
break;
- case 'kernel.view':
- case 'kernel.response':
+ case KernelEvents::VIEW:
+ case KernelEvents::RESPONSE:
// stop only if a controller has been executed
try {
$this->stopwatch->stop('controller');
} catch (\LogicException $e) {
}
break;
- case 'kernel.terminate':
+ case KernelEvents::TERMINATE:
$token = $event->getResponse()->headers->get('X-Debug-Token');
$this->stopwatch->openSection($token);
break;
@@ -395,10 +396,10 @@ private function preDispatch($eventName, Event $event)
private function postDispatch($eventName, Event $event)
{
switch ($eventName) {
- case 'kernel.controller':
+ case KernelEvents::CONTROLLER:
$this->stopwatch->start('controller', 'section');
break;
- case 'kernel.response':
+ case KernelEvents::RESPONSE:
$token = $event->getResponse()->headers->get('X-Debug-Token');
$this->stopwatch->stopSection($token);
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
@@ -407,7 +408,7 @@ private function postDispatch($eventName, Event $event)
$this->updateProfiles($token, true);
}
break;
- case 'kernel.terminate':
+ case KernelEvents::TERMINATE:
$token = $event->getResponse()->headers->get('X-Debug-Token');
$this->stopwatch->stopSection($token);
// The children profiles have been updated by the previous 'kernel.response'

0 comments on commit 3778bf9

Please sign in to comment.