Merge branch '3.x' into 4.x

* 3.x:
  Add enabled parameter in configuration

Author: GromNaN

CHANGELOG.md

@@ -14,6 +14,7 @@
 * Deprecate `sentry` and `raven` handler, use a `service` handler with [`sentry/sentry-symfony`](https://docs.sentry.io/platforms/php/guides/symfony/logs/) instead
 * Add configuration for Gelf encoders
 * Fix `host` configuration for `elastic_search` handler
+* Add `enabled` option to `handlers` configuration
 
 ## 3.10.0 (2023-11-06)
 

config/schema/monolog-1.0.xsd

@@ -87,6 +87,7 @@
         <xsd:attribute name="content-type" type="xsd:string" />
         <xsd:attribute name="webhook-url" type="xsd:string" />
         <xsd:attribute name="region" type="xsd:string" />
+        <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:simpleType name="level">

src/DependencyInjection/Configuration.php

@@ -409,6 +409,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
                 ->scalarNode('id')->end() // service & rollbar
+                ->booleanNode('enabled')->defaultTrue()->end()
                 ->scalarNode('priority')->defaultValue(0)->end()
                 ->scalarNode('level')->defaultValue('DEBUG')->end()
                 ->booleanNode('bubble')->defaultTrue()->end()

src/DependencyInjection/MonologExtension.php

@@ -60,6 +60,9 @@ public function load(array $configs, ContainerBuilder $container): void
             $handlers = [];
 
             foreach ($config['handlers'] as $name => $handler) {
+                if (!$handler['enabled']) {
+                    continue;
+                }
                 $handlers[$handler['priority']][] = [
                     'id' => $this->buildHandler($container, $name, $handler),
                     'channels' => empty($handler['channels']) ? null : $handler['channels'],

tests/DependencyInjection/Compiler/LoggerChannelPassTest.php

@@ -11,9 +11,11 @@
 
 namespace Symfony\Bundle\MonologBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
+use Symfony\Bundle\MonologBundle\DependencyInjection\MonologExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -229,6 +231,29 @@ private function getFunctionalContainer(): ContainerBuilder
 
         return $container;
     }
+
+    #[TestWith([true])]
+    #[TestWith([false])]
+    public function testEnabledHandler(bool $enabled)
+    {
+        $container = new ContainerBuilder();
+        $loader = new MonologExtension();
+
+        $config = [
+            'handlers' => [
+                'main' => [
+                    'enabled' => $enabled,
+                    'type' => 'stream',
+                    'path' => '%kernel.logs_dir%/%kernel.environment%.log',
+                    'level' => 'debug',
+                ],
+            ],
+        ];
+
+        $loader->load([$config], $container);
+
+        $this->assertSame($enabled, $container->hasDefinition('monolog.handler.main'));
+    }
 }
 
 class DummyService

tests/DependencyInjection/FixtureMonologExtensionTestCase.php

@@ -254,6 +254,15 @@ public function testTypeNull()
         $this->assertSame('DEBUG', $logger->getArgument(0));
     }
 
+    public function testEnabledHandleOption()
+    {
+        $container = $this->getContainer('enabled_handlers');
+
+        $this->assertTrue($container->hasDefinition('monolog.handler.default'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.enabled'));
+        $this->assertFalse($container->hasDefinition('monolog.handler.disabled'));
+    }
+
     protected function getContainer($fixture): ContainerBuilder
     {
         $container = new ContainerBuilder();

tests/DependencyInjection/Fixtures/xml/enabled_handlers.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<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="default" type="stream" path="/tmp/symfony.log"/>
+        <monolog:handler name="enabled" type="stream" path="/tmp/symfony.log" enabled="true"/>
+        <monolog:handler name="disabled" type="stream" path="/tmp/symfony.log" enabled="false"/>
+    </monolog:config>
+</container>

tests/DependencyInjection/Fixtures/yml/enabled_handlers.yml

@@ -0,0 +1,13 @@
+monolog:
+    handlers:
+        default:
+            type: stream
+            path: /tmp/symfony.log
+        enabled:
+            type: stream
+            path: /tmp/symfony.log
+            enabled: true
+        disabled:
+            type: stream
+            path: /tmp/symfony.log
+            enabled: false