diff --git a/src/Symfony/Components/HttpKernel/Listener/WebDebugToolbar.php b/src/Symfony/Components/HttpKernel/Listener/WebDebugToolbar.php index 93936884e333..e762e0c3cca4 100644 --- a/src/Symfony/Components/HttpKernel/Listener/WebDebugToolbar.php +++ b/src/Symfony/Components/HttpKernel/Listener/WebDebugToolbar.php @@ -2,7 +2,6 @@ namespace Symfony\Components\HttpKernel\Listener; -use Symfony\Components\DependencyInjection\ContainerInterface; use Symfony\Components\EventDispatcher\EventDispatcher; use Symfony\Components\EventDispatcher\Event; use Symfony\Components\HttpKernel\Response; @@ -27,12 +26,10 @@ */ class WebDebugToolbar { - protected $container; protected $profiler; - public function __construct(ContainerInterface $container, Profiler $profiler) + public function __construct(Profiler $profiler) { - $this->container = $container; $this->profiler = $profiler; } @@ -52,7 +49,7 @@ public function handle(Event $event, Response $response) return $response; } - $request = $this->container->getRequestService(); + $request = $event->getParameter('request'); if ('3' === substr($response->getStatusCode(), 0, 1) || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html')) diff --git a/src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml b/src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml index 062fcbfc0551..f5596dd4e768 100644 --- a/src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml +++ b/src/Symfony/Framework/WebBundle/Resources/config/toolbar.xml @@ -11,7 +11,6 @@ -