do not register the debug logger as a Monolog processor

xabbuh · xabbuh · commit 81baf5318246 · 2023-11-02T14:19:47.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
         }
 
         $container->getDefinition('monolog.logger_prototype')
-            ->setConfigurator([new Reference('debug.debug_logger_configurator'), 'pushDebugLogger']);
+            ->setConfigurator([new Reference('debug.debug_logger_configurator'), 'registerForDebugLogger']);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerConfigurator.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerConfigurator.php
@@ -18,20 +18,21 @@
  */
 class DebugLoggerConfigurator
 {
-    private ?DebugLoggerInterface $processor = null;
+    private static \WeakMap $registeredLoggers;
+    private ?DebugLoggerInterface $debugLogger = null;
 
-    public function __construct(DebugLoggerInterface $processor, bool $enable = null)
+    public function __construct(DebugLoggerInterface $debugLogger, bool $enable = null)
     {
+        self::$registeredLoggers ??= new \WeakMap();
+
         if ($enable ?? !\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
-            $this->processor = $processor;
+            $this->debugLogger = $debugLogger;
         }
     }
 
-    public function pushDebugLogger(Logger $logger): void
+    public function registerForDebugLogger(Logger $logger): void
     {
-        if ($this->processor) {
-            $logger->pushProcessor($this->processor);
-        }
+        self::$registeredLoggers[$logger] = $this->debugLogger;
     }
 
     public static function getDebugLogger(mixed $logger): ?DebugLoggerInterface
@@ -44,12 +45,6 @@ public static function getDebugLogger(mixed $logger): ?DebugLoggerInterface
             return null;
         }
 
-        foreach ($logger->getProcessors() as $processor) {
-            if ($processor instanceof DebugLoggerInterface) {
-                return $processor;
-            }
-        }
-
-        return null;
+        return self::$registeredLoggers[$logger] ?? null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$container->getDefinition('monolog.logger_prototype')`
`36`		`- ->setConfigurator([new Reference('debug.debug_logger_configurator'), 'pushDebugLogger']);`
	`36`	`+ ->setConfigurator([new Reference('debug.debug_logger_configurator'), 'registerForDebugLogger']);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,20 +18,21 @@`
`18`	`18`	`*/`
`19`	`19`	`class DebugLoggerConfigurator`
`20`	`20`	`{`
`21`		`- private ?DebugLoggerInterface $processor = null;`
	`21`	`+ private static \WeakMap $registeredLoggers;`
	`22`	`+ private ?DebugLoggerInterface $debugLogger = null;`
`22`	`23`
`23`		`- public function __construct(DebugLoggerInterface $processor, bool $enable = null)`
	`24`	`+ public function __construct(DebugLoggerInterface $debugLogger, bool $enable = null)`
`24`	`25`	`{`
	`26`	`+ self::$registeredLoggers ??= new \WeakMap();`
	`27`	`+`
`25`	`28`	`if ($enable ?? !\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {`
`26`		`- $this->processor = $processor;`
	`29`	`+ $this->debugLogger = $debugLogger;`
`27`	`30`	`}`
`28`	`31`	`}`
`29`	`32`
`30`		`- public function pushDebugLogger(Logger $logger): void`
	`33`	`+ public function registerForDebugLogger(Logger $logger): void`
`31`	`34`	`{`
`32`		`- if ($this->processor) {`
`33`		`- $logger->pushProcessor($this->processor);`
`34`		`- }`
	`35`	`+ self::$registeredLoggers[$logger] = $this->debugLogger;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public static function getDebugLogger(mixed $logger): ?DebugLoggerInterface`
`@@ -44,12 +45,6 @@ public static function getDebugLogger(mixed $logger): ?DebugLoggerInterface`
`44`	`45`	`return null;`
`45`	`46`	`}`
`46`	`47`
`47`		`- foreach ($logger->getProcessors() as $processor) {`
`48`		`- if ($processor instanceof DebugLoggerInterface) {`
`49`		`- return $processor;`
`50`		`- }`
`51`		`- }`
`52`		`-`
`53`		`- return null;`
	`48`	`+ return self::$registeredLoggers[$logger] ?? null;`
`54`	`49`	`}`
`55`	`50`	`}`