Selaa lähdekoodia

[FrameworkBundle] removed exception_listener.controller parameter

Fabien Potencier 14 vuotta sitten
vanhempi
commit
c8fe15bfcf

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -30,7 +30,7 @@ class Configuration
                 ->scalarNode('charset')->end()
                 ->scalarNode('document_root')->end()
                 ->scalarNode('error_handler')->end()
-                ->scalarNode('exception_controller')->end()
+                ->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
                 ->scalarNode('ide')->end()
                 ->booleanNode('test')->end()
             ->end()

+ 1 - 3
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -81,9 +81,7 @@ class FrameworkExtension extends Extension
             }
         }
 
-        if (isset($config['exception_controller'])) {
-            $container->setParameter('exception_listener.controller', $config['exception_controller']);
-        }
+        $container->getDefinition('exception_listener')->setArgument(0, $config['exception_controller']);
 
         $pattern = '';
         if (isset($config['ide'])) {

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

@@ -10,7 +10,6 @@
         <parameter key="controller_name_converter.class">Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser</parameter>
         <parameter key="response_listener.class">Symfony\Component\HttpKernel\ResponseListener</parameter>
         <parameter key="exception_listener.class">Symfony\Component\HttpKernel\Debug\ExceptionListener</parameter>
-        <parameter key="exception_listener.controller">Symfony\Bundle\FrameworkBundle\Controller\ExceptionController::showAction</parameter>
     </parameters>
 
     <services>
@@ -39,7 +38,7 @@
 
         <service id="exception_listener" class="%exception_listener.class%">
             <tag name="kernel.listener" event="onCoreException" priority="-128" />
-            <argument>%exception_listener.controller%</argument>
+            <argument /> <!-- controller name -->
             <argument type="service" id="logger" on-invalid="null" />
         </service>
     </services>