瀏覽代碼

[FrameworkBundle] removed dependency with the DIC

Noël GUILBERT 14 年之前
父節點
當前提交
d94271ba9c

+ 2 - 4
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,

+ 0 - 1
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>