Fix priority with logger_prototype

HypeMC · HypeMC · commit 1ad6fc7ee4bd · 2025-08-22T03:24:15.000+02:00
diff --git a/DependencyInjection/Compiler/AddProcessorsPass.php b/DependencyInjection/Compiler/AddProcessorsPass.php
@@ -28,6 +28,13 @@ class AddProcessorsPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    private $channelPass;
+
+    public function __construct(?LoggerChannelPass $channelPass = null)
+    {
+        $this->channelPass = $channelPass;
+    }
+
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('monolog.logger')) {
@@ -56,8 +63,8 @@ public function process(ContainerBuilder $container)
             }
 
             if (!empty($tag['handler'])) {
-                $definition = $container->findDefinition(\sprintf('monolog.handler.%s', $tag['handler']));
-                $parentDef = $definition;
+                $parentDef = $container->findDefinition(\sprintf('monolog.handler.%s', $tag['handler']));
+                $definitions = [$parentDef];
                 while (!$parentDef->getClass() && $parentDef instanceof ChildDefinition) {
                     $parentDef = $container->findDefinition($parentDef->getParent());
                 }
@@ -66,13 +73,18 @@ public function process(ContainerBuilder $container)
                     throw new \InvalidArgumentException(\sprintf('The "%s" handler does not accept processors', $tag['handler']));
                 }
             } elseif (!empty($tag['channel'])) {
-                if ('app' === $tag['channel']) {
-                    $definition = $container->getDefinition('monolog.logger');
+                $loggerId = 'app' === $tag['channel'] ? 'monolog.logger' : \sprintf('monolog.logger.%s', $tag['channel']);
+                $definitions = [$container->getDefinition($loggerId)];
+            } else {
+                if ($this->channelPass) {
+                    $definitions = [];
+                    foreach ($this->channelPass->getChannels() as $channel) {
+                        $loggerId = 'app' === $channel ? 'monolog.logger' : \sprintf('monolog.logger.%s', $channel);
+                        $definitions[] = $container->getDefinition($loggerId);
+                    }
                 } else {
-                    $definition = $container->getDefinition(\sprintf('monolog.logger.%s', $tag['channel']));
+                    $definitions = [$container->getDefinition('monolog.logger_prototype')];
                 }
-            } else {
-                $definition = $container->getDefinition('monolog.logger_prototype');
             }
 
             if (!empty($tag['method'])) {
@@ -81,7 +93,9 @@ public function process(ContainerBuilder $container)
                 // If no method is defined, fallback to use __invoke
                 $processor = $reference;
             }
-            $definition->addMethodCall('pushProcessor', [$processor]);
+            foreach ($definitions as $definition) {
+                $definition->addMethodCall('pushProcessor', [$processor]);
+            }
         }
     }
 }
diff --git a/MonologBundle.php b/MonologBundle.php
@@ -37,7 +37,7 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass($channelPass = new LoggerChannelPass());
         $container->addCompilerPass(new FixEmptyLoggerPass($channelPass));
-        $container->addCompilerPass(new AddProcessorsPass());
+        $container->addCompilerPass(new AddProcessorsPass($channelPass));
         $container->addCompilerPass(new AddSwiftMailerTransportPass());
     }
 
diff --git a/Tests/DependencyInjection/Compiler/AddProcessorsPassTest.php b/Tests/DependencyInjection/Compiler/AddProcessorsPassTest.php
@@ -16,6 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\AddProcessorsPass;
+use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -54,6 +55,18 @@ public function testHandlerProcessors()
         $this->assertCount(2, $calls);
         $this->assertEquals(['pushProcessor', [new TypedReference('processor+35+25', 'TestClass')]], $calls[0]);
         $this->assertEquals(['pushProcessor', [new TypedReference('processor+25+35', 'TestClass')]], $calls[1]);
+
+        $service = $container->getDefinition('monolog.logger');
+        $calls = $service->getMethodCalls();
+        $this->assertCount(2, $calls);
+        $this->assertEquals(['useMicrosecondTimestamps', ['%monolog.use_microseconds%']], $calls[0]);
+        $this->assertEquals(['pushProcessor', [new TypedReference('processor_all_channels+0', 'TestClass')]], $calls[1]);
+
+        $service = $container->getDefinition('monolog.logger.test');
+        $calls = $service->getMethodCalls();
+        $this->assertCount(2, $calls);
+        $this->assertEquals(['pushProcessor', [new TypedReference('processor_test_channel-25', 'TestClass')]], $calls[0]);
+        $this->assertEquals(['pushProcessor', [new TypedReference('processor_all_channels+0', 'TestClass')]], $calls[1]);
     }
 
     public function testFailureOnHandlerWithoutPushProcessor()
@@ -88,6 +101,9 @@ protected function getContainer()
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
         $loader->load('monolog.xml');
 
+        $container->setParameter('monolog.additional_channels', ['test']);
+        $container->setParameter('monolog.handlers_to_channels', []);
+
         $definition = $container->getDefinition('monolog.logger_prototype');
         $container->setParameter('monolog.handler.console.class', ConsoleHandler::class);
         $container->setDefinition('monolog.handler.test', new Definition('%monolog.handler.console.class%', [100, false]));
@@ -100,39 +116,48 @@ protected function getContainer()
         $definition->addMethodCall('pushHandler', [new Reference('monolog.handler.priority_test')]);
         $definition->addMethodCall('pushHandler', [new Reference('monolog.handler.priority_test_2')]);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'test']);
         $container->setDefinition('test', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'test2']);
         $container->setDefinition('test2', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'priority_test', 'priority' => 10]);
         $container->setDefinition('processor+10', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'priority_test', 'priority' => -10]);
         $container->setDefinition('processor-10', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'priority_test', 'priority' => 20]);
         $container->setDefinition('processor+20', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'priority_test', 'priority' => 35]);
         $service->addTag('monolog.processor', ['handler' => 'priority_test_2', 'priority' => 25]);
         $container->setDefinition('processor+35+25', $service);
 
-        $service = new Definition('TestClass', ['false', new Reference('logger')]);
+        $service = new Definition('TestClass');
         $service->addTag('monolog.processor', ['handler' => 'priority_test', 'priority' => 25]);
         $service->addTag('monolog.processor', ['handler' => 'priority_test_2', 'priority' => 35]);
         $container->setDefinition('processor+25+35', $service);
 
+        $service = new Definition('TestClass');
+        $service->addTag('monolog.processor', ['priority' => 0]);
+        $container->setDefinition('processor_all_channels+0', $service);
+
+        $service = new Definition('TestClass');
+        $service->addTag('monolog.processor', ['channel' => 'test', 'priority' => -25]);
+        $container->setDefinition('processor_test_channel-25', $service);
+
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
-        $container->addCompilerPass(new AddProcessorsPass());
+        $container->addCompilerPass($channelPass = new LoggerChannelPass());
+        $container->addCompilerPass(new AddProcessorsPass($channelPass));
         $container->compile();
 
         return $container;

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,13 @@ class AddProcessorsPass implements CompilerPassInterface`
`28`	`28`	`{`
`29`	`29`	`use PriorityTaggedServiceTrait;`
`30`	`30`
	`31`	`+ private $channelPass;`
	`32`	`+`
	`33`	`+ public function __construct(?LoggerChannelPass $channelPass = null)`
	`34`	`+ {`
	`35`	`+ $this->channelPass = $channelPass;`
	`36`	`+ }`
	`37`	`+`
`31`	`38`	`public function process(ContainerBuilder $container)`
`32`	`39`	`{`
`33`	`40`	`if (!$container->hasDefinition('monolog.logger')) {`
`@@ -56,8 +63,8 @@ public function process(ContainerBuilder $container)`
`56`	`63`	`}`
`57`	`64`
`58`	`65`	`if (!empty($tag['handler'])) {`
`59`		`- $definition = $container->findDefinition(\sprintf('monolog.handler.%s', $tag['handler']));`
`60`		`- $parentDef = $definition;`
	`66`	`+ $parentDef = $container->findDefinition(\sprintf('monolog.handler.%s', $tag['handler']));`
	`67`	`+ $definitions = [$parentDef];`
`61`	`68`	`while (!$parentDef->getClass() && $parentDef instanceof ChildDefinition) {`
`62`	`69`	`$parentDef = $container->findDefinition($parentDef->getParent());`
`63`	`70`	`}`
`@@ -66,13 +73,18 @@ public function process(ContainerBuilder $container)`
`66`	`73`	`throw new \InvalidArgumentException(\sprintf('The "%s" handler does not accept processors', $tag['handler']));`
`67`	`74`	`}`
`68`	`75`	`} elseif (!empty($tag['channel'])) {`
`69`		`- if ('app' === $tag['channel']) {`
`70`		`- $definition = $container->getDefinition('monolog.logger');`
	`76`	`+ $loggerId = 'app' === $tag['channel'] ? 'monolog.logger' : \sprintf('monolog.logger.%s', $tag['channel']);`
	`77`	`+ $definitions = [$container->getDefinition($loggerId)];`
	`78`	`+ } else {`
	`79`	`+ if ($this->channelPass) {`
	`80`	`+ $definitions = [];`
	`81`	`+ foreach ($this->channelPass->getChannels() as $channel) {`
	`82`	`+ $loggerId = 'app' === $channel ? 'monolog.logger' : \sprintf('monolog.logger.%s', $channel);`
	`83`	`+ $definitions[] = $container->getDefinition($loggerId);`
	`84`	`+ }`
`71`	`85`	`} else {`
`72`		`- $definition = $container->getDefinition(\sprintf('monolog.logger.%s', $tag['channel']));`
	`86`	`+ $definitions = [$container->getDefinition('monolog.logger_prototype')];`
`73`	`87`	`}`
`74`		`- } else {`
`75`		`- $definition = $container->getDefinition('monolog.logger_prototype');`
`76`	`88`	`}`
`77`	`89`
`78`	`90`	`if (!empty($tag['method'])) {`
`@@ -81,7 +93,9 @@ public function process(ContainerBuilder $container)`
`81`	`93`	`// If no method is defined, fallback to use __invoke`
`82`	`94`	`$processor = $reference;`
`83`	`95`	`}`
`84`		`- $definition->addMethodCall('pushProcessor', [$processor]);`
	`96`	`+ foreach ($definitions as $definition) {`
	`97`	`+ $definition->addMethodCall('pushProcessor', [$processor]);`
	`98`	`+ }`
`85`	`99`	`}`
`86`	`100`	`}`
`87`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function build(ContainerBuilder $container)`
`37`	`37`
`38`	`38`	`$container->addCompilerPass($channelPass = new LoggerChannelPass());`
`39`	`39`	`$container->addCompilerPass(new FixEmptyLoggerPass($channelPass));`
`40`		`- $container->addCompilerPass(new AddProcessorsPass());`
	`40`	`+ $container->addCompilerPass(new AddProcessorsPass($channelPass));`
`41`	`41`	`$container->addCompilerPass(new AddSwiftMailerTransportPass());`
`42`	`42`	`}`
`43`	`43`