fix(bridge): Make sure the client config option is an array

Refs: #187
jolicode · Jul 12, 2024 · 5ed5b40 · 5ed5b40
1 parent cd13b81
commit 5ed5b40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Bridge/Symfony/DependencyInjection/Configuration.php b/src/Bridge/Symfony/DependencyInjection/Configuration.php
@@ -28,13 +28,15 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->normalizeKeys(false)
                     ->prototype('array')
                         ->children()
-                            ->variableNode('client')
+                            ->arrayNode('client')
                                 ->info('All options for the Elastica client constructor')
                                 ->example([
                                     'host' => '%env(ELASTICSEARCH_HOST)%',
                                     'transport' => 'JoliCode\Elastically\Transport\HttpClientTransport',
                                 ])
+                                ->normalizeKeys(false)
                                 ->defaultValue([])
+                                ->prototype('variable')->end()
                             ->end()
                             ->scalarNode('mapping_directory')
                                 ->info('Path to the mapping directory (in YAML)')

diff --git a/src/Bridge/Symfony/DependencyInjection/ElasticallyExtension.php b/src/Bridge/Symfony/DependencyInjection/ElasticallyExtension.php
@@ -70,7 +70,7 @@ private function buildConnection(string $name, array $config, bool $isDefaultCon
         if (\array_key_exists('client', $config) && \array_key_exists('transport', $config['client'])) {
             $config['client']['transport'] = new Reference($config['client']['transport']);
         }
-        $client->replaceArgument('$config', $config['client']);
+        $client->replaceArgument('$config', $config['client'] ?? []);
         $client->replaceArgument('$resultSetBuilder', new Reference("elastically.{$name}.result_set_builder"));
         $client->replaceArgument('$indexNameMapper', new Reference("elastically.{$name}.index_name_mapper"));
         $container->setDefinition($id = "elastically.{$name}.client", $client);