Skip to content

Commit 17a9d5a

Browse files
Make mappings configuration unique to allow prepend of configuration (#882)
* Make mappings configuration unique to allow prepend of configuration * Fix travis ci by set distribution
1 parent e52332a commit 17a9d5a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sudo: false
2+
dist: trusty
23
language: php
34

45
matrix:

DependencyInjection/ONGRElasticsearchExtension.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,15 @@ public function load(array $configs, ContainerBuilder $container)
4646
$config['profiler'] = isset($config['profiler']) ?
4747
$config['profiler'] : $container->getParameter('kernel.debug');
4848

49+
50+
$managers = $config['managers'];
51+
foreach ($managers as &$manager) {
52+
$manager['mappings'] = array_unique($manager['mappings']);
53+
}
54+
4955
$container->setParameter('es.cache', $config['cache']);
5056
$container->setParameter('es.analysis', $config['analysis']);
51-
$container->setParameter('es.managers', $config['managers']);
57+
$container->setParameter('es.managers', $managers);
5258
$definition = new Definition(
5359
'ONGR\ElasticsearchBundle\Service\ManagerFactory',
5460
[

0 commit comments

Comments
 (0)