Merge branch '3.x' into 4.x

* 3.x:
  Fix 'hosts' key in Elastic 8 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 `hosts` configuration for `elastica` handler
 * Add `enabled` option to `handlers` configuration
 
 ## 3.10.0 (2023-11-06)

tests/DependencyInjection/MonologExtensionTest.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\MonologBundle\Tests\DependencyInjection;
 
+use Monolog\Handler\ElasticaHandler;
+use Monolog\Handler\ElasticsearchHandler;
 use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
 use Monolog\Handler\RollbarHandler;
 use Monolog\Processor\UidProcessor;
@@ -504,6 +506,56 @@ public function testWithLoggerChannelAutoconfiguration()
         ], $container->getDefinition(ServiceWithChannel::class)->getTag('monolog.logger'));
     }
 
+    public function testElasticsearchAndElasticaHandlers()
+    {
+        $container = new ContainerBuilder();
+        $container->setDefinition('elasticsearch.client', new Definition('Elasticsearch\\Client'));
+        $container->setDefinition('elastica.client', new Definition('Elastica\\Client'));
+
+        $config = [[
+            'handlers' => [
+                'es_handler' => [
+                    'type' => 'elastic_search',
+                    'elasticsearch' => [
+                        'hosts' => ['es:9200'],
+                    ],
+                    'index' => 'my-index',
+                    'document_type' => 'my-type',
+                ],
+                'elastica_handler' => [
+                    'type' => 'elastica',
+                    'elasticsearch' => [
+                        'hosts' => ['es:9200'],
+                    ],
+                    'index' => 'my-index',
+                    'document_type' => 'my-type',
+                ],
+            ],
+        ]];
+
+        $extension = new MonologExtension();
+        $extension->load($config, $container);
+
+        $this->assertTrue($container->hasDefinition('monolog.handler.es_handler'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.elastica_handler'));
+
+        // Elasticsearch handler should receive the elasticsearch.client as first argument
+        $esHandler = $container->getDefinition('monolog.handler.es_handler');
+        $this->assertSame(ElasticsearchHandler::class,$esHandler->getClass());
+        $esClient = $esHandler->getArgument(0);
+        $this->assertInstanceOf(Definition::class, $esClient);
+        $this->assertStringEndsWith('Elasticsearch\Client', $esClient->getClass());
+        $this->assertSame(['hosts' => ['es:9200']], $esClient->getArgument(0));
+
+        // Elastica handler should receive the elastica.client as first argument
+        $elasticaHandler = $container->getDefinition('monolog.handler.elastica_handler');
+        $this->assertSame(ElasticaHandler::class,$elasticaHandler->getClass());
+        $elasticaClient = $elasticaHandler->getArgument(0);
+        $this->assertInstanceOf(Definition::class, $elasticaClient);
+        $this->assertSame('Elastica\Client', $elasticaClient->getClass());
+        $this->assertSame(['hosts' => ['es:9200'], 'transport' => 'Http'], $elasticaClient->getArgument(0));
+    }
+
     private function getContainer(array $config = [], array $thirdPartyDefinitions = []): ContainerBuilder
     {
         $container = new ContainerBuilder(new EnvPlaceholderParameterBag());