Merge index definitions extending a template recursively

sineflow · Sep 29, 2022 · 8213a43 · 8213a43
1 parent 0d78fc6
commit 8213a43
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -140,7 +140,7 @@ private function getIndicesNode(): NodeDefinition
                             if (!isset($templates[$values['extends']])) {
                                 throw new \InvalidArgumentException(\sprintf('Index manager "%s" extends "%s", but it is not defined', $indexManager, $values['extends']));
                             }
-                            $v[$indexManager] = \array_merge($templates[$values['extends']], $v[$indexManager]);
+                            $v[$indexManager] = \array_replace_recursive($templates[$values['extends']], $v[$indexManager]);
                         }
                         unset($v[$indexManager]['extends']);
                     }

diff --git a/tests/Unit/DependencyInjection/ElasticsearchExtensionTest.php b/tests/Unit/DependencyInjection/ElasticsearchExtensionTest.php
@@ -47,7 +47,23 @@ public function getData()
                     ],
                 ],
                 'indices' => [
+                    '_base' => [
+                        'settings' => [
+                            'index' => [
+                                'mapping.nested_fields.limit' => 10,
+                            ],
+                            'number_of_replicas' => 1,
+                            'analysis' => [
+                                'filter' => [
+                                    'base_filter' => [
+                                        'type' => 'custom',
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
                     'test' => [
+                        'extends' => '_base',
                         'name' => 'testname',
                         'connection' => 'test1',
                         'use_aliases' => false,
@@ -102,8 +118,14 @@ public function getData()
                 'settings' => [
                     'refresh_interval' => 2,
                     'number_of_replicas' => 3,
+                    'index' => [
+                        'mapping.nested_fields.limit' => 10,
+                    ],
                     'analysis' => [
                         'filter' => [
+                            'base_filter' => [
+                                'type' => 'custom',
+                            ],
                             'test_filter' => [
                                 'type' => 'ngram',
                             ],