From e5410a5b650cddd3e1b9f128c7701496b3bda5b9 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Wed, 23 Jul 2014 21:38:46 +1000
Subject: [PATCH] Fix indexable callbacks being overwritten by another index

closes #663
---
 DependencyInjection/FOSElasticaExtension.php | 15 ++++++++-------
 Tests/Functional/app/ORM/config.yml          | 12 ++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 292a9a5..e523bf4 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -128,6 +128,8 @@ class FOSElasticaExtension extends Extension
      */
     private function loadIndexes(array $indexes, ContainerBuilder $container)
     {
+        $indexableCallbacks = array();
+
         foreach ($indexes as $name => $index) {
             $indexId = sprintf('fos_elastica.index.%s', $name);
             $indexName = isset($index['index_name']) ? $index['index_name']: $name;
@@ -159,8 +161,11 @@ class FOSElasticaExtension extends Extension
                 $this->loadIndexFinder($container, $name, $reference);
             }
 
-            $this->loadTypes((array) $index['types'], $container, $this->indexConfigs[$name]);
+            $this->loadTypes((array) $index['types'], $container, $this->indexConfigs[$name], $indexableCallbacks);
         }
+
+        $indexable = $container->getDefinition('fos_elastica.indexable');
+        $indexable->replaceArgument(0, $indexableCallbacks);
     }
 
     /**
@@ -194,11 +199,10 @@ class FOSElasticaExtension extends Extension
      * @param array $types
      * @param ContainerBuilder $container
      * @param array $indexConfig
+     * @param array $indexableCallbacks
      */
-    private function loadTypes(array $types, ContainerBuilder $container, array $indexConfig)
+    private function loadTypes(array $types, ContainerBuilder $container, array $indexConfig, array &$indexableCallbacks)
     {
-        $indexableCallbacks = array();
-
         foreach ($types as $name => $type) {
             $indexName = $indexConfig['name'];
 
@@ -269,9 +273,6 @@ class FOSElasticaExtension extends Extension
                 $container->setDefinition($typeSerializerId, $typeSerializerDef);
             }
         }
-
-        $indexable = $container->getDefinition('fos_elastica.indexable');
-        $indexable->replaceArgument(0, $indexableCallbacks);
     }
 
     /**
diff --git a/Tests/Functional/app/ORM/config.yml b/Tests/Functional/app/ORM/config.yml
index 3dc0e63..02d7a92 100644
--- a/Tests/Functional/app/ORM/config.yml
+++ b/Tests/Functional/app/ORM/config.yml
@@ -63,3 +63,15 @@ fos_elastica:
                         provider: ~
                         listener:
                             is_indexable_callback: [ 'FOS\ElasticaBundle\Tests\Functional\app\ORM\IndexableService', 'isntIndexable' ]
+        second_index:
+            index_name: foselastica_orm_test_second_%kernel.environment%
+            types:
+                type:
+                    properties:
+                        field1: ~
+                        coll: ~
+                    persistence:
+                        driver: orm
+                        model: FOS\ElasticaBundle\Tests\Functional\TypeObj
+                        listener:
+                            is_indexable_callback: 'object.isIndexable() && !object.isntIndexable()'