Log level mapping is done inside the handlers

symfony · Dec 2, 2022 · 6204234 · 6204234
1 parent d84d39c
commit 6204234
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 99 deletions.
diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -48,33 +48,6 @@ class MonologExtension extends Extension
 
     private $swiftMailerHandlers = [];
 
-    private function levelToMonologConst($level, ContainerBuilder $container)
-    {
-        if (null === $level || is_numeric($level)) {
-            return $level;
-        }
-
-        if (is_string($level) && (str_contains($level, 'env_') || str_contains($level, '%'))) {
-            $serviceId = 'monolog.level.' . $level;
-            if (!$container->has($serviceId)) {
-                $container->register($serviceId)
-                    ->setClass('int')
-                    ->setFactory([Logger::class, 'toMonologLevel'])
-                    ->setArguments([$level]);
-            }
-
-            return new Reference($serviceId);
-        }
-
-        $level = Logger::toMonologLevel($level);
-
-        if (function_exists('enum_exists') && enum_exists(Level::class) && $level instanceof Level) {
-            $level = $level->value;
-        }
-
-        return $level;
-    }
-
     /**
      * Loads the Monolog configuration.
      *
@@ -199,8 +172,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
         $handlerClass = $this->getHandlerClassByType($handler['type']);
         $definition = new Definition($handlerClass);
 
-        $handler['level'] = $this->levelToMonologConst($handler['level'], $container);
-
         if ($handler['include_stacktraces']) {
             $definition->setConfigurator(['Symfony\\Bundle\\MonologBundle\\MonologBundle', 'includeStacktraces']);
         }
@@ -434,10 +405,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             break;
 
         case 'fingers_crossed':
-            $handler['action_level'] = $this->levelToMonologConst($handler['action_level'], $container);
-            if (null !== $handler['passthru_level']) {
-                $handler['passthru_level'] = $this->levelToMonologConst($handler['passthru_level'], $container);
-            }
             $nestedHandlerId = $this->getHandlerId($handler['handler']);
             $this->markNestedHandler($nestedHandlerId);
 
@@ -483,12 +450,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             break;
 
         case 'filter':
-            $handler['min_level'] = $this->levelToMonologConst($handler['min_level'], $container);
-            $handler['max_level'] = $this->levelToMonologConst($handler['max_level'], $container);
-            foreach (array_keys($handler['accepted_levels']) as $k) {
-                $handler['accepted_levels'][$k] = $this->levelToMonologConst($handler['accepted_levels'][$k], $container);
-            }
-
             $nestedHandlerId = $this->getHandlerId($handler['handler']);
             $this->markNestedHandler($nestedHandlerId);
             $minLevelOrList = !empty($handler['accepted_levels']) ? $handler['accepted_levels'] : $handler['min_level'];

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -189,6 +189,7 @@ public function testMergingInvalidChannels()
         $config = $this->process($configs);
     }
 
+    /** @group legacy */
     public function testWithSwiftMailerHandler()
     {
         if (\Monolog\Logger::API >= 3) {

diff --git a/Tests/DependencyInjection/FixtureMonologExtensionTest.php b/Tests/DependencyInjection/FixtureMonologExtensionTest.php
@@ -29,7 +29,7 @@ public function testLegacyLoadWithSeveralHandlers()
             $this->markTestSkipped('Symfony MonologBridge < 5.2 is needed.');
         }
 
-        $this->doTestLoadWithSeveralHandlers(\Monolog\Logger::ERROR);
+        $this->doTestLoadWithSeveralHandlers('ERROR');
     }
 
     public function testLoadWithSeveralHandlers()
@@ -38,7 +38,7 @@ public function testLoadWithSeveralHandlers()
             $this->markTestSkipped('Symfony MonologBridge >= 5.2 is needed.');
         }
 
-        $this->doTestLoadWithSeveralHandlers(new Definition(ErrorLevelActivationStrategy::class, [\Monolog\Logger::ERROR]));
+        $this->doTestLoadWithSeveralHandlers(new Definition(ErrorLevelActivationStrategy::class, ['ERROR']));
     }
 
     private function doTestLoadWithSeveralHandlers($activation)
@@ -59,15 +59,15 @@ private function doTestLoadWithSeveralHandlers($activation)
 
         $handler = $container->getDefinition('monolog.handler.custom');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\StreamHandler');
-        $this->assertDICConstructorArguments($handler, ['/tmp/symfony.log', \Monolog\Logger::ERROR, false, 0666, false]);
+        $this->assertDICConstructorArguments($handler, ['/tmp/symfony.log', 'ERROR', false, 0666, false]);
 
         $handler = $container->getDefinition('monolog.handler.main');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\FingersCrossedHandler');
-        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested'), $activation, 0, true, true, \Monolog\Logger::NOTICE]);
+        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested'), $activation, 0, true, true, 'NOTICE']);
 
         $handler = $container->getDefinition('monolog.handler.filtered');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\FilterHandler');
-        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested2'), [\Monolog\Logger::WARNING, \Monolog\Logger::ERROR], \Monolog\Logger::EMERGENCY, true]);
+        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested2'), ['WARNING', 'ERROR'], 'EMERGENCY', true]);
     }
 
     /** @group legacy */
@@ -77,7 +77,7 @@ public function testLegacyLoadWithOverwriting()
             $this->markTestSkipped('Symfony MonologBridge < 5.2 is needed.');
         }
 
-        $this->doTestLoadWithOverwriting(\Monolog\Logger::ERROR);
+        $this->doTestLoadWithOverwriting('ERROR');
     }
 
     public function testLoadWithOverwriting()
@@ -86,7 +86,7 @@ public function testLoadWithOverwriting()
             $this->markTestSkipped('Symfony MonologBridge >= 5.2 is needed.');
         }
 
-        $this->doTestLoadWithOverwriting(new Definition(ErrorLevelActivationStrategy::class, [\Monolog\Logger::ERROR]));
+        $this->doTestLoadWithOverwriting(new Definition(ErrorLevelActivationStrategy::class, ['ERROR']));
     }
 
     private function doTestLoadWithOverwriting($activation)
@@ -106,7 +106,7 @@ private function doTestLoadWithOverwriting($activation)
 
         $handler = $container->getDefinition('monolog.handler.custom');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\StreamHandler');
-        $this->assertDICConstructorArguments($handler, ['/tmp/symfony.log', \Monolog\Logger::WARNING, true, null, false]);
+        $this->assertDICConstructorArguments($handler, ['/tmp/symfony.log', 'WARNING', true, null, false]);
 
         $handler = $container->getDefinition('monolog.handler.main');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\FingersCrossedHandler');
@@ -132,7 +132,7 @@ public function testLoadWithNewAtEnd()
 
         $handler = $container->getDefinition('monolog.handler.new');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\StreamHandler');
-        $this->assertDICConstructorArguments($handler, ['/tmp/monolog.log', \Monolog\Logger::ERROR, true, null, false]);
+        $this->assertDICConstructorArguments($handler, ['/tmp/monolog.log', 'ERROR', true, null, false]);
     }
 
     public function testLoadWithNewAndPriority()
@@ -156,15 +156,15 @@ public function testLoadWithNewAndPriority()
 
         $handler = $container->getDefinition('monolog.handler.main');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\BufferHandler');
-        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested'), 0, \Monolog\Logger::INFO, true, false]);
+        $this->assertDICConstructorArguments($handler, [new Reference('monolog.handler.nested'), 0, 'INFO', true, false]);
 
         $handler = $container->getDefinition('monolog.handler.first');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\RotatingFileHandler');
-        $this->assertDICConstructorArguments($handler, ['/tmp/monolog.log', 0, \Monolog\Logger::ERROR, true, null, false]);
+        $this->assertDICConstructorArguments($handler, ['/tmp/monolog.log', 0, 'ERROR', true, null, false]);
 
         $handler = $container->getDefinition('monolog.handler.last');
         $this->assertDICDefinitionClass($handler, 'Monolog\Handler\StreamHandler');
-        $this->assertDICConstructorArguments($handler, ['/tmp/last.log', \Monolog\Logger::ERROR, true, null, false]);
+        $this->assertDICConstructorArguments($handler, ['/tmp/last.log', 'ERROR', true, null, false]);
     }
 
     public function testHandlersWithChannels()
@@ -209,7 +209,7 @@ public function testServerLog()
 
         $this->assertEquals([
             '0:9911',
-            100,
+            'DEBUG',
             true,
         ], $container->getDefinition('monolog.handler.server_log')->getArguments());
     }