minor #52023 [FrameworkBundle] Fix merge error with ErrorLoggerCompilerPass (PhilETaylor)

nicolas-grekas · nicolas-grekas · commit 39a56d31f194 · 2023-10-13T09:38:47.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [FrameworkBundle] Fix merge error with `ErrorLoggerCompilerPass` | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT `@nicolas`-grekas `@MatTheCat` does this make sense? If I change these 2 lines in 6.4 then my app loads fine. relates to #52009 (comment) This comment from `@HypeMC` #52009 (comment) guided my debugging or am I barking up the wrong tree? Commits ------- 0d418de Fix merge error with ErrorLoggerCompilerPass
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ErrorLoggerCompilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ErrorLoggerCompilerPass.php
@@ -22,11 +22,11 @@ class ErrorLoggerCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (!$container->hasDefinition('debug.debug_handlers_listener')) {
+        if (!$container->hasDefinition('debug.error_handler_configurator')) {
             return;
         }
 
-        $definition = $container->getDefinition('debug.debug_handlers_listener');
+        $definition = $container->getDefinition('debug.error_handler_configurator');
         if ($container->hasDefinition('monolog.logger.php')) {
             $definition->replaceArgument(0, new Reference('monolog.logger.php'));
         }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ class ErrorLoggerCompilerPass implements CompilerPassInterface`
`22`	`22`	`{`
`23`	`23`	`public function process(ContainerBuilder $container): void`
`24`	`24`	`{`
`25`		`- if (!$container->hasDefinition('debug.debug_handlers_listener')) {`
	`25`	`+ if (!$container->hasDefinition('debug.error_handler_configurator')) {`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`
`29`		`- $definition = $container->getDefinition('debug.debug_handlers_listener');`
	`29`	`+ $definition = $container->getDefinition('debug.error_handler_configurator');`
`30`	`30`	`if ($container->hasDefinition('monolog.logger.php')) {`
`31`	`31`	`$definition->replaceArgument(0, new Reference('monolog.logger.php'));`
`32`	`32`	`}`