浏览代码

[FrameworkBundle] removed unused variable

Fabien Potencier 14 年之前
父节点
当前提交
8dbaf2aa38

+ 2 - 7
src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php

@@ -24,18 +24,15 @@ use Symfony\Component\HttpKernel\Log\LoggerInterface;
 class ControllerNameParser
 {
     protected $kernel;
-    protected $logger;
 
     /**
      * Constructor.
      *
      * @param KernelInterface $kernel A KernelInterface instance
-     * @param LoggerInterface $logger A LoggerInterface instance
      */
-    public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
+    public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;
-        $this->logger = $logger;
     }
 
     /**
@@ -57,9 +54,7 @@ class ControllerNameParser
         foreach ($this->kernel->getBundle($bundle, false) as $b) {
             $try = $b->getNamespace().'\\Controller\\'.$controller.'Controller';
             if (!class_exists($try)) {
-                if (null !== $this->logger) {
-                    $logs[] = sprintf('Unable to find controller "%s:%s" - class "%s" does not exist.', $bundle, $controller, $try);
-                }
+                $logs[] = sprintf('Unable to find controller "%s:%s" - class "%s" does not exist.', $bundle, $controller, $try);
             } else {
                 $class = $try;
 

+ 0 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml

@@ -17,7 +17,6 @@
         <service id="controller_name_converter" class="%controller_name_converter.class%" public="false">
             <tag name="monolog.logger" channel="request" />
             <argument type="service" id="kernel" />
-            <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
         <service id="controller_resolver" class="%controller_resolver.class%" public="false">