From aa5bac2ccc3621ecb114dc85f54748f4cd50da22 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Sat, 7 Jan 2012 08:52:49 +1100 Subject: [PATCH] Fix index wide finder config check Fixes index wide finder configuration. Fixes #61 --- DependencyInjection/Configuration.php | 5 ++++- DependencyInjection/FOQElasticaExtension.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 82f674b..e3cb3e6 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -71,7 +71,10 @@ class Configuration ->performNoDeepMerging() ->children() ->scalarNode('client')->end() - ->scalarNode('finder')->end() + ->scalarNode('finder') + ->treatNullLike(true) + ->defaultFalse() + ->end() ->arrayNode('type_prototype') ->children() ->arrayNode('persistence') diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php index 60029a8..8c56fb9 100644 --- a/DependencyInjection/FOQElasticaExtension.php +++ b/DependencyInjection/FOQElasticaExtension.php @@ -113,7 +113,7 @@ class FOQElasticaExtension extends Extension 'mappings' => array() ) ); - if (isset($index['finder'])) { + if ($index['finder']) { $this->loadIndexFinder($container, $name, $indexId); } if (!empty($index['settings'])) {