complete the build of batch consumers from extensions

Author: Bogdan Rancichi

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -353,13 +353,19 @@ protected function loadBatchConsumers()
     {
         foreach ($this->config['batch_consumers'] as $key => $consumer) {
             $definition = new Definition('%old_sound_rabbit_mq.batch_consumer.class%');
+
+            if (!isset($consumer['exchange_options'])) {
+                $consumer['exchange_options'] = $this->getDefaultExchangeOptions();
+            }
+
             $definition
                 ->addTag('old_sound_rabbit_mq.base_amqp')
-                ->addTag('old_sound_rabbit_mq.consumer')
                 ->addTag('old_sound_rabbit_mq.batch_consumer')
                 ->addMethodCall('setTimeoutWait', array($consumer['timeout_wait']))
                 ->addMethodCall('setPrefetchCount', array($consumer['qos_options']['prefetch_count']))
+                ->addMethodCall('setBatchCallback', array(array(new Reference($consumer['callback']), 'batchExecute')))
                 ->addMethodCall('setExchangeOptions', array($this->normalizeArgumentKeys($consumer['exchange_options'])))
+                ->addMethodCall('setQueueOptions', array($this->normalizeArgumentKeys($consumer['queue_options'])))
                 ->addMethodCall('setCallback', array(array(new Reference($consumer['callback']), 'execute')))
                 ->addMethodCall('setQosOptions', array(
                     $consumer['qos_options']['prefetch_size'],
@@ -385,8 +391,7 @@ protected function loadBatchConsumers()
                 $this->injectLogger($definition);
             }
 
-            $name = sprintf('old_sound_rabbit_mq.%s_batch', $key);
-            $this->container->setDefinition($name, $definition);
+            $this->container->setDefinition(sprintf('old_sound_rabbit_mq.%s_batch', $key), $definition);
         }
     }