Commitfac3cc4

committed

[FrameworkBundle] register ErrorHandler at boot time

1 parent4acf5d3 commitfac3cc4Copy full SHA for fac3cc4

File tree

-6

lines changed

-6

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,6 @@ public function load(array $configs, ContainerBuilder $container)`
`133`	`133`	`if ($container->getParameter('kernel.debug')) {`
`134`	`134`	`$loader->load('debug.xml');`
`135`	`135`
`136`		`-$definition->replaceArgument(3,E_ALL \|E_STRICT);`
`137`		`-`
`138`	`136`	`$definition =$container->findDefinition('http_kernel');`
`139`	`137`	`$definition->replaceArgument(2,newReference('debug.controller_resolver'));`
`140`	`138`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`useSymfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass;`
`31`	`31`	`useSymfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FragmentRendererPass;`
`32`	`32`	`useSymfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;`
	`33`	`+useSymfony\Component\Debug\ErrorHandler;`
`33`	`34`	`useSymfony\Component\DependencyInjection\ContainerBuilder;`
`34`	`35`	`useSymfony\Component\DependencyInjection\Compiler\PassConfig;`
`35`	`36`	`useSymfony\Component\DependencyInjection\Scope;`
`@@ -46,6 +47,8 @@ class FrameworkBundle extends Bundle`
`46`	`47`	`{`
`47`	`48`	`publicfunctionboot()`
`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`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`<parameterkey="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher</parameter>`
`9`	`9`	`<parameterkey="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>`
`10`	`10`	`<parameterkey="debug.controller_resolver.class">Symfony\Component\HttpKernel\Controller\TraceableControllerResolver</parameter>`
	`11`	`+ <parameterkey="debug.error_handler.throw_at">-1</parameter>`
`11`	`12`	`</parameters>`
`12`	`13`
`13`	`14`	`<services>`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`<parameters>`
`8`	`8`	`<parameterkey="debug.debug_handlers_listener.class">Symfony\Component\HttpKernel\EventListener\DebugHandlersListener</parameter>`
`9`		`- <parameterkey="debug.error_handler.class">Symfony\Component\Debug\ErrorHandler</parameter>`
`10`	`9`	`<parameterkey="debug.stopwatch.class">Symfony\Component\Stopwatch\Stopwatch</parameter>`
	`10`	`+ <parameterkey="debug.error_handler.throw_at">0</parameter>`
`11`	`11`	`</parameters>`
`12`	`12`
`13`	`13`	`<services>`
`@@ -17,13 +17,11 @@`
`17`	`17`	`<argument /><!-- Exception handler-->`
`18`	`18`	`<argumenttype="service"id="logger"on-invalid="null" />`
`19`	`19`	`<argument /><!-- Log levels map for enabled error levels-->`
`20`		`- <argument>0</argument>`
	`20`	`+ <argument>null</argument>`
`21`	`21`	`<argument>true</argument>`
`22`	`22`	`<argument>null</argument><!-- %templating.helper.code.file_link_format%-->`
`23`	`23`	`</service>`
`24`	`24`
`25`		`- <serviceid="debug.error_handler"class="%debug.error_handler.class%"factory-class="%debug.error_handler.class%"factory-method="register" />`
`26`		`-`
`27`	`25`	`<serviceid="debug.stopwatch"class="%debug.stopwatch.class%" />`
`28`	`26`	`</services>`
`29`	`27`	`</container>`

Comments

(0)