Merge branch '3.x' into 4.x

By Jérôme Tamarelle (1) and Sarim Khan (1)
* 3.x:
  Add service definition for SyslogFormatter
  Allow unset of excluded_http_codes

Author: GromNaN

CHANGELOG.md

@@ -18,6 +18,7 @@
 * Add `enabled` option to `handlers` configuration
 * Add `priority` field to `processor` tag
 * Add `mongodb` handler and deprecate `mongo`
+* Add `monolog.formatter.syslog` service definition to format RFC5424-compliant messages
 
 ## 3.10.0 (2023-11-06)
 

config/monolog.php

@@ -20,6 +20,7 @@
 use Monolog\Formatter\LogstashFormatter;
 use Monolog\Formatter\NormalizerFormatter;
 use Monolog\Formatter\ScalarFormatter;
+use Monolog\Formatter\SyslogFormatter;
 use Monolog\Formatter\WildfireFormatter;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
@@ -48,6 +49,7 @@
         ->set('monolog.formatter.html', HtmlFormatter::class)
         ->set('monolog.formatter.json', JsonFormatter::class)
         ->set('monolog.formatter.line', LineFormatter::class)
+        ->set('monolog.formatter.syslog', SyslogFormatter::class)
         ->set('monolog.formatter.loggly', LogglyFormatter::class)
         ->set('monolog.formatter.normalizer', NormalizerFormatter::class)
         ->set('monolog.formatter.scalar', ScalarFormatter::class)

src/DependencyInjection/Configuration.php

@@ -453,9 +453,15 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->booleanNode('stop_buffering')->defaultTrue()->end()// fingers_crossed
                 ->scalarNode('passthru_level')->defaultNull()->end() // fingers_crossed
                 ->arrayNode('excluded_http_codes') // fingers_crossed
+                    ->info('Only for "fingers_crossed" handler type')
+                    ->example([403, 404, [400 => ['^/foo', '^/bar']]])
                     ->canBeUnset()
                     ->beforeNormalization()
                         ->always(function ($values) {
+                            if (false === $values) {
+                                return false;
+                            }
+
                             return array_map(function ($value) {
                                 /*
                                  * Allows YAML:

tests/DependencyInjection/ConfigurationTest.php

@@ -73,6 +73,43 @@ public function testProcessStringChannels(string $string, string $expectedString
         $this->assertEquals($expectedString, $config['handlers']['foobar']['channels']['elements'][0]);
     }
 
+    public function testUnsetExcludedHttpCodes()
+    {
+        $configs = [
+            [
+                'handlers' => [
+                    'main' => [
+                        'type' => 'fingers_crossed',
+                        'action_level' => 'error',
+                        'handler' => 'nested',
+                        'excluded_http_codes' => [404, 405],
+                        'channels' => ['!event'],
+                    ],
+                    'nested' => [
+                        'type' => 'stream',
+                        'path' => '%kernel.logs_dir%/%kernel.environment%.log',
+                        'level' => 'debug',
+                    ],
+                ],
+            ],
+            [
+                'handlers' => [
+                    'main' => [
+                        'type' => 'stream',
+                        'path' => '%kernel.logs_dir%/%kernel.environment%.log',
+                        'level' => 'debug',
+                        'excluded_http_codes' => false,
+                    ],
+                ],
+            ],
+        ];
+
+        $config = $this->process($configs);
+
+        $this->assertArrayNotHasKey('excluded_http_codes', $config['handlers']['main']);
+        $this->assertIsArray($config['handlers']['main']['channels']);
+    }
+
     public static function provideGelfPublisher(): array
     {
         return [