Merge branch '3.x' into 4.x

GromNaN · GromNaN · commit c2c37a99a319 · 2025-10-28T00:10:27.000+01:00
* 3.x:
  Deprecate "mongo" handler type in favor of new "mongodb" syntax
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ jobs:
                 php: [ '8.2', '8.3', '8.4' ]
                 symfony: [ false ]
                 deps: [ locked ]
+                extensions: [ '' ]
                 include:
                     -   php: '8.2'
                         deps: lowest
@@ -23,6 +24,10 @@ jobs:
                         deps: highest
                     -   php: '8.4'
                         deps: highest
+                        monolog: '3.*'
+                    -   php: '8.4'
+                        deps: locked
+                        extensions: mongodb
 
         env:
             SYMFONY_REQUIRE: ${{ matrix.symfony }}
@@ -37,11 +42,16 @@ jobs:
                     php-version: ${{ matrix.php }}
                     ini-values: zend.exception_ignore_args=false
                     tools: flex
+                    extensions: ${{ matrix.extensions }}
 
             -   name: Configure composer
                 if: "${{ matrix.deps == 'highest' }}"
                 run: composer config minimum-stability dev
 
+            -   name: Require mongodb/mongodb if ext-mongodb is available
+                if: "${{ contains(matrix.extensions, 'mongodb') }}"
+                run: composer require --no-update mongodb/mongodb
+
             -   name: Composer install
                 uses: ramsey/composer-install@v3
                 with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Add `hosts` configuration for `elastica` handler
 * Add `enabled` option to `handlers` configuration
 * Add `priority` field to `processor` tag
+* Add `mongodb` handler and deprecate `mongo`
 
 ## 3.10.0 (2023-11-06)
 
diff --git a/config/schema/monolog-1.0.xsd b/config/schema/monolog-1.0.xsd
@@ -21,6 +21,7 @@
             <xsd:element name="channels" type="channels" minOccurs="0" maxOccurs="1" />
             <xsd:element name="publisher" type="publisher" minOccurs="0" maxOccurs="1" />
             <xsd:element name="mongo" type="mongo" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="mongodb" type="mongodb" minOccurs="0" maxOccurs="1" />
             <xsd:element name="elasticsearch" type="elasticsearch" minOccurs="0" maxOccurs="1" />
             <xsd:element name="config" type="xsd:anyType" minOccurs="0" maxOccurs="1" />
             <xsd:element name="excluded-http-code" type="excluded-http-code" minOccurs="0" maxOccurs="unbounded" />
@@ -157,6 +158,15 @@
         <xsd:attribute name="collection" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="mongodb">
+        <xsd:attribute name="id" type="xsd:string" />
+        <xsd:attribute name="uri" type="xsd:string" />
+        <xsd:attribute name="username" type="xsd:string" />
+        <xsd:attribute name="password" type="xsd:string" />
+        <xsd:attribute name="database" type="xsd:string" />
+        <xsd:attribute name="collection" type="xsd:string" />
+    </xsd:complexType>
+
     <xsd:complexType name="redis">
         <xsd:attribute name="id" type="xsd:string" />
         <xsd:attribute name="host" type="xsd:string" />
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -91,6 +91,17 @@
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
  *
+ * - mongodb:
+ *    - mongodb:
+ *       - id: optional if uri is given
+ *       - uri: MongoDB connection string, optional if id is given
+ *       - [username]: Username for database authentication
+ *       - [password]: Password for database authentication
+ *       - [database]: Database to which logs are written (not used for auth), defaults to "monolog"
+ *       - [collection]: Collection to which logs are written, defaults to "logs"
+ *    - [level]: level name or int value, defaults to DEBUG
+ *    - [bubble]: bool, defaults to true
+ *
  * - elastic_search:
  *   - elasticsearch:
  *      - id: optional if host is given
@@ -574,6 +585,7 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         $this->addGelfSection($handlerNode);
         $this->addMongoSection($handlerNode);
+        $this->addMongoDBSection($handlerNode);
         $this->addElasticsearchSection($handlerNode);
         $this->addRedisSection($handlerNode);
         $this->addPredisSection($handlerNode);
@@ -753,7 +765,7 @@ private function addMongoSection(ArrayNodeDefinition $handlerNode): void
                     ->ifTrue(function ($v) {
                         return !isset($v['id']) && !isset($v['host']);
                     })
-                    ->thenInvalid('What must be set is either the host or the id.')
+                    ->thenInvalid('The "mongo" handler configuration requires either a service "id" or a connection "host".')
                     ->end()
                     ->validate()
                     ->ifTrue(function ($v) {
@@ -765,7 +777,43 @@ private function addMongoSection(ArrayNodeDefinition $handlerNode): void
             ->end()
             ->validate()
                 ->ifTrue(function ($v) { return 'mongo' === $v['type'] && !isset($v['mongo']); })
-                ->thenInvalid('The mongo configuration has to be specified to use a MongoHandler')
+                ->thenInvalid('The "mongo" configuration has to be specified to use a "mongo" handler type.')
+            ->end()
+        ;
+    }
+
+    private function addMongoDBSection(ArrayNodeDefinition $handlerNode)
+    {
+        $handlerNode
+            ->children()
+                ->arrayNode('mongodb')
+                    ->canBeUnset()
+                    ->beforeNormalization()
+                        ->ifString()
+                        ->then(function ($v) { return ['id' => $v]; })
+                    ->end()
+                    ->children()
+                        ->scalarNode('id')
+                            ->info('ID of a MongoDB\Client service')
+                            ->example('doctrine_mongodb.odm.logs_connection')
+                        ->end()
+                        ->scalarNode('uri')->end()
+                        ->scalarNode('username')->end()
+                        ->scalarNode('password')->end()
+                        ->scalarNode('database')->defaultValue('monolog')->end()
+                        ->scalarNode('collection')->defaultValue('logs')->end()
+                    ->end()
+                    ->validate()
+                        ->ifTrue(function ($v) {
+                            return !isset($v['id']) && !isset($v['uri']);
+                        })
+                        ->thenInvalid('The "mongodb" handler configuration requires either a service "id" or a connection "uri".')
+                    ->end()
+                ->end()
+            ->end()
+            ->validate()
+                ->ifTrue(function ($v) { return 'mongodb' === $v['type'] && !isset($v['mongodb']); })
+                ->thenInvalid('The "mongodb" configuration has to be specified to use a "mongodb" handler type.')
             ->end()
         ;
     }
diff --git a/src/DependencyInjection/MonologExtension.php b/src/DependencyInjection/MonologExtension.php
@@ -230,6 +230,12 @@ private function buildHandler(ContainerBuilder $container, string $name, array $
                 break;
 
             case 'mongo':
+                trigger_deprecation('symfony/monolog-bundle', '3.11', 'The "mongo" handler type is deprecated in MonologBundle since version 3.11.0, use the "mongodb" type instead.');
+
+                if (!class_exists('MongoDB\Client')) {
+                    throw new \RuntimeException('The "mongo" handler requires the mongodb/mongodb package to be installed.');
+                }
+
                 if (isset($handler['mongo']['id'])) {
                     $client = new Reference($handler['mongo']['id']);
                 } else {
@@ -243,9 +249,8 @@ private function buildHandler(ContainerBuilder $container, string $name, array $
 
                     $client = new Definition('MongoDB\Client', [
                         $server,
+                        ['appname' => 'monolog-bundle'],
                     ]);
-
-                    $client->setPublic(false);
                 }
 
                 $definition->setArguments([
@@ -257,6 +262,48 @@ private function buildHandler(ContainerBuilder $container, string $name, array $
                 ]);
                 break;
 
+            case 'mongodb':
+                if (!class_exists('MongoDB\Client')) {
+                    throw new \RuntimeException('The "mongodb" handler requires the mongodb/mongodb package to be installed.');
+                }
+
+                if (isset($handler['mongodb']['id'])) {
+                    $client = new Reference($handler['mongodb']['id']);
+                } else {
+                    $uriOptions = ['appname' => 'monolog-bundle'];
+
+                    if (isset($handler['mongodb']['username'])) {
+                        $uriOptions['username'] = $handler['mongodb']['username'];
+                    }
+
+                    if (isset($handler['mongodb']['password'])) {
+                        $uriOptions['password'] = $handler['mongodb']['password'];
+                    }
+
+                    $client = new Definition('MongoDB\Client', [
+                        $handler['mongodb']['uri'],
+                        $uriOptions,
+                    ]);
+                }
+
+                $definition->setArguments([
+                    $client,
+                    $handler['mongodb']['database'],
+                    $handler['mongodb']['collection'],
+                    $handler['level'],
+                    $handler['bubble'],
+                ]);
+
+                if (empty($handler['formatter'])) {
+                    $formatter = new Definition('Monolog\Formatter\MongoDBFormatter');
+                    $definition->addMethodCall('setFormatter', [$formatter]);
+                }
+                break;
+
+            case 'elasticsearch':
+                trigger_deprecation('symfony/monolog-bundle', '3.8', 'The "elasticsearch" handler type is deprecated in MonologBundle since version 3.8.0, use the "elastica" type instead, or switch to the official Elastic client using the "elastic_search" type.');
+                // no break
+
             case 'elastica':
             case 'elastic_search':
                 if (isset($handler['elasticsearch']['id'])) {
@@ -811,6 +858,7 @@ private function getHandlerClassByType(string $handlerType): string
             'fingers_crossed' => 'Monolog\Handler\FingersCrossedHandler',
             'filter' => 'Monolog\Handler\FilterHandler',
             'mongo' => 'Monolog\Handler\MongoDBHandler',
+            'mongodb' => 'Monolog\Handler\MongoDBHandler',
             'telegram' => 'Monolog\Handler\TelegramBotHandler',
             'server_log' => 'Symfony\Bridge\Monolog\Handler\ServerLogHandler',
             'redis', 'predis' => 'Monolog\Handler\RedisHandler',
diff --git a/tests/DependencyInjection/FixtureMonologExtensionTestCase.php b/tests/DependencyInjection/FixtureMonologExtensionTestCase.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MonologBundle\Tests\DependencyInjection;
 
 use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
+use Monolog\Handler\MongoDBHandler;
 use Monolog\Handler\NoopHandler;
 use Monolog\Handler\NullHandler;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
@@ -263,6 +264,23 @@ public function testEnabledHandleOption()
         $this->assertFalse($container->hasDefinition('monolog.handler.disabled'));
     }
 
+    public function testMongoDB()
+    {
+        if (!class_exists('MongoDB\Client')) {
+            $this->markTestSkipped('mongodb/mongodb is not installed.');
+        }
+
+        $container = $this->getContainer('mongodb');
+
+        $this->assertTrue($container->hasDefinition('monolog.handler.mongodb'));
+        $handler = $container->getDefinition('monolog.handler.mongodb');
+        $this->assertDICDefinitionClass($handler, MongoDBHandler::class);
+        $client = $handler->getArgument(0);
+        $this->assertDICDefinitionClass($client, 'MongoDB\Client');
+        $this->assertDICConstructorArguments($client, ['mongodb://localhost:27018', ['appname' => 'monolog-bundle', 'username' => 'username', 'password' => 'password']]);
+        $this->assertDICConstructorArguments($handler, [$client, 'db', 'coll', 'DEBUG', true]);
+    }
+
     protected function getContainer($fixture): ContainerBuilder
     {
         $container = new ContainerBuilder();
diff --git a/tests/DependencyInjection/Fixtures/xml/mongodb.xml b/tests/DependencyInjection/Fixtures/xml/mongodb.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    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">
+
+    <config>
+        <handler name="mongodb" type="mongodb">
+            <mongodb uri="mongodb://localhost:27018" username="username" password="password" database="db" collection="coll" />
+        </handler>
+    </config>
+</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/yml/mongodb.yml b/tests/DependencyInjection/Fixtures/yml/mongodb.yml
@@ -0,0 +1,10 @@
+monolog:
+    handlers:
+        mongodb:
+            type: mongodb
+            mongodb:
+                uri: "mongodb://localhost:27018"
+                username: username
+                password: password
+                database: db
+                collection: coll
diff --git a/tests/DependencyInjection/MonologExtensionTest.php b/tests/DependencyInjection/MonologExtensionTest.php
