[FrameworkBundle] register ErrorHandler at boot time

nicolas-grekas · nicolas-grekas · commit fac3cc4d035e · 2014-10-02T18:47:18.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -133,8 +133,6 @@ public function load(array $configs, ContainerBuilder $container)
         if ($container->getParameter('kernel.debug')) {
             $loader->load('debug.xml');
 
-            $definition->replaceArgument(3, E_ALL | E_STRICT);
-
             $definition = $container->findDefinition('http_kernel');
             $definition->replaceArgument(2, new Reference('debug.controller_resolver'));
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -30,6 +30,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FragmentRendererPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
+use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Scope;
@@ -46,6 +47,8 @@ class FrameworkBundle extends Bundle
 {
     public function boot()
     {
+        ErrorHandler::register($this->container->getParameter('debug.error_handler.throw_at'));
+
         if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {
             Request::setTrustedProxies($trustedProxies);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -8,6 +8,7 @@
         <parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher</parameter>
         <parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
         <parameter key="debug.controller_resolver.class">Symfony\Component\HttpKernel\Controller\TraceableControllerResolver</parameter>
+        <parameter key="debug.error_handler.throw_at">-1</parameter>
     </parameters>
 
     <services>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -6,8 +6,8 @@
 
     <parameters>
         <parameter key="debug.debug_handlers_listener.class">Symfony\Component\HttpKernel\EventListener\DebugHandlersListener</parameter>
-        <parameter key="debug.error_handler.class">Symfony\Component\Debug\ErrorHandler</parameter>
         <parameter key="debug.stopwatch.class">Symfony\Component\Stopwatch\Stopwatch</parameter>
+        <parameter key="debug.error_handler.throw_at">0</parameter>
     </parameters>
 
     <services>
@@ -17,13 +17,11 @@
             <argument /><!-- Exception handler -->
             <argument type="service" id="logger" on-invalid="null" />
             <argument /><!-- Log levels map for enabled error levels -->
-            <argument>0</argument>
+            <argument>null</argument>
             <argument>true</argument>
             <argument>null</argument><!-- %templating.helper.code.file_link_format% -->
         </service>
 
-        <service id="debug.error_handler" class="%debug.error_handler.class%" factory-class="%debug.error_handler.class%" factory-method="register" />
-
         <service id="debug.stopwatch" class="%debug.stopwatch.class%" />
     </services>
 </container>

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass;`
`31`	`31`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FragmentRendererPass;`
`32`	`32`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;`
	`33`	`+use Symfony\Component\Debug\ErrorHandler;`
`33`	`34`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`34`	`35`	`use Symfony\Component\DependencyInjection\Compiler\PassConfig;`
`35`	`36`	`use Symfony\Component\DependencyInjection\Scope;`
`@@ -46,6 +47,8 @@ class FrameworkBundle extends Bundle`
`46`	`47`	`{`
`47`	`48`	`public function boot()`
`48`	`49`	`{`
	`50`	`+ ErrorHandler::register($this->container->getParameter('debug.error_handler.throw_at'));`
	`51`	`+`
`49`	`52`	`if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {`
`50`	`53`	`Request::setTrustedProxies($trustedProxies);`
`51`	`54`	`}`