NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit49b23f1

committed

Remove the exception listener if not used

1 parent9bc74f9 commit49b23f1Copy full SHA for 49b23f1

File tree

1 file changed

+10

-7

lines changed

src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler
- ExceptionListenerPass.php

1 file changed

+10

-7

lines changed

`‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php‎`

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`useSymfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`15`	`15`	`useSymfony\Component\DependencyInjection\ContainerBuilder;`
`16`		`-useSymfony\Component\EventDispatcher\EventSubscriberInterface;`
`17`	`16`
`18`	`17`	`/**`
`19`	`18`	`* Registers the Twig exception listener if Twig is registered as a templating engine.`
`@@ -31,13 +30,17 @@ public function process(ContainerBuilder $container)`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`// to be removed in 5.0`
`34`		`-// register the exceptioncontroller only ifTwig is enabled and required dependencies do exist`
`35`		`-if (!interface_exists(EventSubscriberInterface::class) \|\|$container->hasDefinition('exception_listener')) {`
	`33`	`+// register the exceptionlistener only ifit's currently used, else use the provided by FrameworkBundle`
	`34`	`+if ('twig.controller.exception::showAction' ===$container->getParameter('twig.exception_listener.controller') &&$container->hasDefinition('exception_listener')) {`
`36`	`35`	`$container->removeDefinition('twig.exception_listener');`
`37`		`- }elseif ($container->hasParameter('templating.engines')) {`
`38`		`-$engines =$container->getParameter('templating.engines');`
`39`		`-if (!\in_array('twig',$engines)) {`
`40`		`-$container->removeDefinition('twig.exception_listener');`
	`36`	`+ }else {`
	`37`	`+$container->removeDefinition('exception_listener');`
	`38`	`+`
	`39`	`+if ($container->hasParameter('templating.engines')) {`
	`40`	`+$engines =$container->getParameter('templating.engines');`
	`41`	`+if (!\in_array('twig',$engines,true)) {`
	`42`	`+$container->removeDefinition('twig.exception_listener');`
	`43`	`+ }`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit49b23f1

File tree

1 file changed

1 file changed

`‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php‎`

0 commit comments