Merge branch '3.x' into 4.x

* 3.x:
  Support null for the NullHandler

Author: GromNaN

src/DependencyInjection/Configuration.php

@@ -403,10 +403,9 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->children()
                 ->scalarNode('type')
                     ->isRequired()
-                    ->treatNullLike('null')
                     ->beforeNormalization()
-                        ->always()
-                        ->then(function ($v) { return strtolower($v); })
+                        ->ifString()->then(function ($v) { return strtolower($v); })
+                        ->ifNull()->then(function ($v) { return 'null'; })
                     ->end()
                 ->end()
                 ->scalarNode('id')->end() // service & rollbar

tests/DependencyInjection/FixtureMonologExtensionTestCase.php

@@ -13,6 +13,7 @@
 
 use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
 use Monolog\Handler\NoopHandler;
+use Monolog\Handler\NullHandler;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
 use Symfony\Bundle\MonologBundle\DependencyInjection\MonologExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -243,6 +244,16 @@ public function testNativeMailer()
         $this->assertSame(['addHeader', [['Foo: bar', 'Baz: inga']]], $methodCalls[1]);
     }
 
+    public function testTypeNull()
+    {
+        $container = $this->getContainer('type_null');
+
+        $logger = $container->getDefinition('monolog.handler.null_handler');
+
+        $this->assertSame(NullHandler::class, $logger->getClass());
+        $this->assertSame('DEBUG', $logger->getArgument(0));
+    }
+
     protected function getContainer($fixture): ContainerBuilder
     {
         $container = new ContainerBuilder();

tests/DependencyInjection/Fixtures/xml/type_null.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:monolog="http://symfony.com/schema/dic/monolog"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <monolog:config>
+        <monolog:handler
+            name="null_handler"
+            type="null" />
+    </monolog:config>
+</container>

tests/DependencyInjection/Fixtures/yml/type_null.yml

@@ -0,0 +1,4 @@
+monolog:
+    handlers:
+        null_handler:
+            type: null