Merge pull request #263 from Padam87/rpc_settings

RPC Server exchange options

Author: videlalvaro

DependencyInjection/Configuration.php

@@ -202,6 +202,7 @@ protected function addRpcServers(ArrayNodeDefinition $node)
                     ->canBeUnset()
                     ->useAttributeAsKey('key')
                     ->prototype('array')
+                        ->append($this->getExchangeConfiguration())
                         ->append($this->getQueueConfiguration())
                         ->children()
                             ->scalarNode('connection')->defaultValue('default')->end()

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -346,6 +346,9 @@ protected function loadRpcServers()
                     $server['qos_options']['global']
                 ));
             }
+            if (array_key_exists('exchange_options', $server)) {
+                $definition->addMethodCall('setExchangeOptions', array($server['exchange_options']));
+            }
             if (array_key_exists('queue_options', $server)) {
                 $definition->addMethodCall('setQueueOptions', array($server['queue_options']));
             }

README.md

@@ -377,6 +377,7 @@ rpc_servers:
         connection: default
         callback:   random_int_server
         qos_options: {prefetch_size: 0, prefetch_count: 1, global: false}
+        exchange_options: {name: exchange, type: topic}
         queue_options: {name: random_int_queue, durable: false, auto_delete: true}
         serializer: json_encode
 ```

Tests/DependencyInjection/Fixtures/test.yml

@@ -164,3 +164,9 @@ old_sound_rabbit_mq:
             callback:        server_with_queue_options.callback
             queue_options:
                 name: "server_with_queue_options-queue"
+
+        server_with_exchange_options:
+            callback:        server_with_exchange_options.callback
+            exchange_options:
+                name: exchange
+                type: topic

Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

@@ -565,6 +565,36 @@ public function testRpcServerWithQueueOptionsDefinition()
         $this->assertEquals('%old_sound_rabbit_mq.rpc_server.class%', $definition->getClass());
     }
 
+    public function testRpcServerWithExchangeOptionsDefinition()
+    {
+        $container = $this->getContainer('test.yml');
+
+        $this->assertTrue($container->has('old_sound_rabbit_mq.server_with_exchange_options_server'));
+        $definition = $container->getDefinition('old_sound_rabbit_mq.server_with_exchange_options_server');
+        $this->assertEquals((string) $definition->getArgument(0), 'old_sound_rabbit_mq.connection.default');
+        $this->assertEquals((string) $definition->getArgument(1), 'old_sound_rabbit_mq.channel.server_with_exchange_options');
+        $this->assertEquals(array(
+            array('initServer', array('server_with_exchange_options')),
+            array('setCallback', array(array(new Reference('server_with_exchange_options.callback'), 'execute'))),
+            array('setExchangeOptions', array(array(
+                'name'         => 'exchange',
+                'type'         => 'topic',
+                'passive'      => false,
+                'durable'      => true,
+                'auto_delete'  => false,
+                'internal'     => null,
+                'nowait'       => false,
+                'declare'      => true,
+                'arguments'    => null,
+                'ticket'       => null,
+            ))),
+            array('setSerializer', array('serialize')),
+        ),
+            $definition->getMethodCalls()
+        );
+        $this->assertEquals('%old_sound_rabbit_mq.rpc_server.class%', $definition->getClass());
+    }
+
     public function testHasCollectorWhenChannelsExist()
     {
         $container = $this->getContainer('collector.yml');