From d94271ba9c5e27d8767693a5e073fc4849535694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20GUILBERT?= <noelguilbert@gmail.com>
Date: Mon, 30 Aug 2010 16:00:37 +0200
Subject: [PATCH] [FrameworkBundle] removed dependency with the DIC

---
 .../Bundle/FrameworkBundle/Debug/ExceptionListener.php      | 6 ++----
 src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php
 mode change 100644 => 100755 src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml

diff --git a/src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php b/src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php
old mode 100644
new mode 100755
index 0f0d0a6c42..1574744a6b
--- a/src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php
@@ -26,13 +26,11 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class ExceptionListener
 {
-    protected $container;
     protected $controller;
     protected $logger;
 
-    public function __construct(ContainerInterface $container, $controller, LoggerInterface $logger = null)
+    public function __construct($controller, LoggerInterface $logger = null)
     {
-        $this->container = $container;
         $this->controller = $controller;
         $this->logger = $logger;
     }
@@ -63,7 +61,7 @@ class ExceptionListener
             error_log(sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine()));
         }
 
-        $logger = $this->container->has('logger') ? $this->container->get('logger')->getDebugLogger() : null;
+        $logger = null !== $this->logger ? $this->logger->getDebugLogger() : null;
 
         $attributes = array(
             '_controller' => $this->controller,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
old mode 100644
new mode 100755
index 24b5ed0da6..e7fb6eb771
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -46,7 +46,6 @@
 
         <service id="exception_listener" class="%exception_listener.class%">
             <tag name="kernel.listener" priority="128" />
-            <argument type="service" id="service_container" />
             <argument>%exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />
         </service>