From e2cc4f965b370f1c153e07f36e47ef1a1bf2663c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Piechota?= Date: Thu, 22 Nov 2012 11:30:13 +0100 Subject: [PATCH 1/2] Fix register custom finder for entity --- DependencyInjection/FOQElasticaExtension.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php index 92310cc..434339b 100644 --- a/DependencyInjection/FOQElasticaExtension.php +++ b/DependencyInjection/FOQElasticaExtension.php @@ -363,15 +363,17 @@ class FOQElasticaExtension extends Extension protected function loadTypeFinder(array $typeConfig, ContainerBuilder $container, $elasticaToModelId, $typeDef, $indexName, $typeName) { if (isset($typeConfig['finder']['service'])) { - return $typeConfig['finder']['service']; + $finderId = $typeConfig['finder']['service']; } - $abstractFinderId = 'foq_elastica.finder.prototype'; - $finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName); - $finderDef = new DefinitionDecorator($abstractFinderId); - $finderDef->replaceArgument(0, $typeDef); - $finderDef->replaceArgument(1, new Reference($elasticaToModelId)); - $container->setDefinition($finderId, $finderDef); - + else{ + $abstractFinderId = 'foq_elastica.finder.prototype'; + $finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName); + $finderDef = new DefinitionDecorator($abstractFinderId); + $finderDef->replaceArgument(0, $typeDef); + $finderDef->replaceArgument(1, new Reference($elasticaToModelId)); + $container->setDefinition($finderId, $finderDef); + } + $managerId = sprintf('foq_elastica.manager.%s', $typeConfig['driver']); $managerDef = $container->getDefinition($managerId); $arguments = array( $typeConfig['model'], new Reference($finderId)); From 10ce9a6d0a43b915178f6bcc0f8eb0c3c406f08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Piechota?= Date: Wed, 30 Jan 2013 22:24:19 +0100 Subject: [PATCH 2/2] CS --- DependencyInjection/FOQElasticaExtension.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php index 434339b..4eba776 100644 --- a/DependencyInjection/FOQElasticaExtension.php +++ b/DependencyInjection/FOQElasticaExtension.php @@ -364,8 +364,7 @@ class FOQElasticaExtension extends Extension { if (isset($typeConfig['finder']['service'])) { $finderId = $typeConfig['finder']['service']; - } - else{ + } else { $abstractFinderId = 'foq_elastica.finder.prototype'; $finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName); $finderDef = new DefinitionDecorator($abstractFinderId);