deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify configuration and make it more robust

Browse source
This commit is contained in:
ornicar 2011-04-17 10:55:46 -07:00
parent 333f8850cf
commit 3a409df971
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DependencyInjection/Configuration.php
View file

@ -105,8 +105,9 @@ class Configuration
->useAttributeAsKey('name')
->prototype('array')
->treatNullLike(array())
->addDefaultsIfNotSet()
->children()
->scalarNode('type')->end()
->scalarNode('type')->defaultValue('string')->end()
->scalarNode('boost')->end()
->scalarNode('store')->end()
->scalarNode('index')->end()

8
DependencyInjection/FOQElasticaExtension.php
View file

@ -25,12 +25,16 @@ class FOQElasticaExtension extends Extension
$config = $processor->process($configuration->getConfigTree(), $configs);
if (empty ($config['default_client'])) {
if (empty($config['clients']) || empty($config['indexes'])) {
throw new InvalidArgumentException('You must define at least one client and one index');
}
if (empty($config['default_client'])) {
$keys = array_keys($config['clients']);
$config['default_client'] = reset($keys);
}
if (empty ($config['default_index'])) {
if (empty($config['default_index'])) {
$keys = array_keys($config['indexes']);
$config['default_index'] = reset($keys);
}