Merge branch '6.3' into 6.4

xabbuh · xabbuh · commit 5fe8d55cc24b · 2023-10-13T12:12:25.000+02:00
* 6.3:
  [Cache][VarExporter] Fix proxy generation to deal with edgy behaviors of internal classes
  Fix merge error with ErrorLoggerCompilerPass
diff --git a/DependencyInjection/Compiler/ErrorLoggerCompilerPass.php b/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`	`}`