From 73fd4fe6b00e22dfa582fd8e13261d341edb3ddb Mon Sep 17 00:00:00 2001
From: Lea Haensenberger <lea.haensenberger@gmail.com>
Date: Thu, 24 Jan 2013 15:07:38 +0100
Subject: [PATCH] Creating a serializer callable for every type in an index and
 passing it to elastica

---
 DependencyInjection/Configuration.php        | 10 ++++++++-
 DependencyInjection/FOSElasticaExtension.php | 23 ++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 6f5c35c..7e0af16 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,7 +34,15 @@ class Configuration implements ConfigurationInterface
                 ->scalarNode('default_client')->end()
                 ->scalarNode('default_index')->end()
                 ->scalarNode('default_manager')->defaultValue('orm')->end()
-                ->scalarNode('serializer_id')->end()
+                ->arrayNode('serializer')
+                    ->prototype('array')
+                        ->treatNullLike(array())
+                        ->children()
+                            ->scalarNode('callable_class')->end()
+                            ->scalarNode('id')->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 
diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 4cad42c..1469510 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -40,7 +40,7 @@ class FOSElasticaExtension extends Extension
         }
 
         $clientIdsByName = $this->loadClients($config['clients'], $container);
-        $indexIdsByName  = $this->loadIndexes($config['indexes'], $container, $clientIdsByName, $config['default_client'], $config['serializer_id']);
+        $indexIdsByName  = $this->loadIndexes($config['indexes'], $container, $clientIdsByName, $config['default_client'], $config['serializer']);
         $indexRefsByName = array_map(function($id) {
             return new Reference($id);
         }, $indexIdsByName);
@@ -93,7 +93,7 @@ class FOSElasticaExtension extends Extension
      * @throws \InvalidArgumentException
      * @return array
      */
-    protected function loadIndexes(array $indexes, ContainerBuilder $container, array $clientIdsByName, $defaultClientName, $serializerId)
+    protected function loadIndexes(array $indexes, ContainerBuilder $container, array $clientIdsByName, $defaultClientName, $serializerConfig)
     {
         $indexIds = array();
         foreach ($indexes as $name => $index) {
@@ -128,7 +128,7 @@ class FOSElasticaExtension extends Extension
             if (!empty($index['settings'])) {
                 $this->indexConfigs[$name]['config']['settings'] = $index['settings'];
             }
-            $this->loadTypes(isset($index['types']) ? $index['types'] : array(), $container, $name, $indexId, $typePrototypeConfig, $serializerId);
+            $this->loadTypes(isset($index['types']) ? $index['types'] : array(), $container, $name, $indexId, $typePrototypeConfig, $serializerConfig);
         }
 
         return $indexIds;
@@ -169,9 +169,8 @@ class FOSElasticaExtension extends Extension
      * @param $indexId
      * @param array $typePrototypeConfig
      */
-    protected function loadTypes(array $types, ContainerBuilder $container, $indexName, $indexId, array $typePrototypeConfig, $serializerId)
+    protected function loadTypes(array $types, ContainerBuilder $container, $indexName, $indexId, array $typePrototypeConfig, $serializerConfig)
     {
-        $serializer = $serializerId ? new Reference($serializerId) : null;
         foreach ($types as $name => $type) {
             $type = self::deepArrayUnion($typePrototypeConfig, $type);
             $typeId = sprintf('%s.%s', $indexId, $name);
@@ -179,8 +178,18 @@ class FOSElasticaExtension extends Extension
             $typeDef = new Definition('%fos_elastica.type.class%', $typeDefArgs);
             $typeDef->setFactoryService($indexId);
             $typeDef->setFactoryMethod('getType');
-            if ($serializer) {
-                $typeDef->addMethodCall('setSerializer', array($serializer, $type['serializer']['groups']));
+            if ($serializerConfig) {
+
+                $serializerDefArgs = array(new Reference($serializerConfig['id']));
+                if (isset($type['serializer']['groups'])) {
+                    $serializerDefArgs[] = $type['serializer']['groups'];
+                }
+
+                $serializerDef = new Definition("%{$serializerConfig['callable_class']}%", $serializerDefArgs);
+                $serializerId = sprintf('%s.%s.serializer', $indexId, $name);
+                $container->setDefinition($serializerId, $serializerDef);
+
+                $typeDef->addMethodCall('setSerializer', array(array(new Reference($serializerId), 'serialize')));
             }
             $container->setDefinition($typeId, $typeDef);
             if (isset($type['_source'])) {