Merge pull request #220 from bburnichon/feature/add-connection-parameters

Add "ssl_context" to dependency injection

Author: videlalvaro

DependencyInjection/Configuration.php

@@ -56,6 +56,11 @@ protected function addConnections(ArrayNodeDefinition $node)
                             ->booleanNode('lazy')->defaultFalse()->end()
                             ->scalarNode('connection_timeout')->defaultValue(3)->end()
                             ->scalarNode('read_write_timeout')->defaultValue(3)->end()
+                            ->arrayNode('ssl_context')
+                                ->useAttributeAsKey('key')
+                                ->canBeUnset()
+                                ->prototype('variable')->end()
+                            ->end()
                             ->booleanNode('keepalive')->defaultFalse()->info('requires php-amqplib v2.4.1+ and PHP5.4+')->end()
                             ->scalarNode('heartbeat')->defaultValue(0)->info('requires php-amqplib v2.4.1+')->end()
                         ->end()

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -74,6 +74,8 @@ protected function loadConnections()
                     ? '%old_sound_rabbit_mq.lazy.connection.class%'
                     : '%old_sound_rabbit_mq.connection.class%';
 
+            $context = ! empty($connection['ssl_context'])
+                ? stream_context_create(array('ssl' => $connection['ssl_context'])) : null;
             $definition = new Definition($classParam, array(
                 $connection['host'],
                 $connection['port'],
@@ -86,7 +88,7 @@ protected function loadConnections()
                 'en_US',    // locale
                 $connection['connection_timeout'],
                 $connection['read_write_timeout'],
-                null,       // context
+                $context,   // context
                 $connection['keepalive'],
                 $connection['heartbeat'],
             ));

Tests/DependencyInjection/Fixtures/test.yml

@@ -10,6 +10,15 @@ old_sound_rabbit_mq:
             password: foo_password
             vhost:    /foo
 
+        ssl_connection:
+            host:     ssl_host
+            port:     123
+            user:     ssl_user
+            password: ssl_password
+            vhost:    /ssl
+            ssl_context:
+                verify_peer: false
+
         lazy_connection:
             host:     lazy_host
             port:     456

Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

@@ -25,6 +25,27 @@ public function testFooConnectionDefinition()
         $this->assertEquals('%old_sound_rabbit_mq.connection.class%', $definition->getClass());
     }
 
+    public function testSslConnectionDefinition()
+    {
+        $container = $this->getContainer('test.yml');
+
+        $this->assertTrue($container->has('old_sound_rabbit_mq.connection.ssl_connection'));
+        $definition = $container->getDefinition('old_sound_rabbit_mq.connection.ssl_connection');
+        $this->assertEquals('ssl_host', $definition->getArgument(0));
+        $this->assertEquals(123, $definition->getArgument(1));
+        $this->assertEquals('ssl_user', $definition->getArgument(2));
+        $this->assertEquals('ssl_password', $definition->getArgument(3));
+        $this->assertEquals('/ssl', $definition->getArgument(4));
+
+        $context = $definition->getArgument(11);
+        $this->assertInternalType('resource', $context);
+        $this->assertEquals('stream-context', get_resource_type($context));
+        $options = stream_context_get_options($context);
+        $this->assertEquals(array('ssl' => array('verify_peer' => false)), $options);
+
+        $this->assertEquals('%old_sound_rabbit_mq.connection.class%', $definition->getClass());
+    }
+
     public function testLazyConnectionDefinition()
     {
         $container = $this->getContainer('test.yml');