AMQPSocketConnection has a different parameters order, lets consider it

Author: goetas

RabbitMq/AMQPConnectionFactory.php

@@ -60,22 +60,40 @@ public function __construct(
      */
     public function createConnection()
     {
-        return new $this->class(
-            $this->parameters['host'],
-            $this->parameters['port'],
-            $this->parameters['user'],
-            $this->parameters['password'],
-            $this->parameters['vhost'],
-            false,      // insist
-            'AMQPLAIN', // login_method
-            null,       // login_response
-            'en_US',    // locale
-            $this->parameters['connection_timeout'],
-            $this->parameters['read_write_timeout'],
-            $this->parameters['ssl_context'],
-            $this->parameters['keepalive'],
-            $this->parameters['heartbeat']
-        );
+        if ($this->class == 'PhpAmqpLib\Connection\AMQPSocketConnection' || is_subclass_of($this->class , 'PhpAmqpLib\Connection\AMQPSocketConnection')) {
+            return new $this->class(
+                $this->parameters['host'],
+                $this->parameters['port'],
+                $this->parameters['user'],
+                $this->parameters['password'],
+                $this->parameters['vhost'],
+                false,      // insist
+                'AMQPLAIN', // login_method
+                null,       // login_response
+                'en_US',    // locale
+                isset($this->parameters['read_timeout']) ? $this->parameters['read_timeout'] : $this->parameters['read_write_timeout'],
+                $this->parameters['keepalive'],
+                isset($this->parameters['write_timeout']) ? $this->parameters['write_timeout'] : $this->parameters['read_write_timeout'],
+                $this->parameters['heartbeat']
+            );
+        } else {
+            return new $this->class(
+                $this->parameters['host'],
+                $this->parameters['port'],
+                $this->parameters['user'],
+                $this->parameters['password'],
+                $this->parameters['vhost'],
+                false,      // insist
+                'AMQPLAIN', // login_method
+                null,       // login_response
+                'en_US',    // locale
+                $this->parameters['connection_timeout'],
+                $this->parameters['read_write_timeout'],
+                $this->parameters['ssl_context'],
+                $this->parameters['keepalive'],
+                $this->parameters['heartbeat']
+            );
+        }
     }
 
     /**

Tests/RabbitMq/AMQPConnectionFactoryTest.php

@@ -5,6 +5,7 @@
 use OldSound\RabbitMqBundle\Provider\ConnectionParametersProviderInterface;
 use OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory;
 use OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures\AMQPConnection;
+use OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures\AMQPSocketConnection;
 use PHPUnit\Framework\TestCase;
 
 class AMQPConnectionFactoryTest extends TestCase
@@ -37,6 +38,63 @@ public function testDefaultValues()
         ), $instance->constructParams);
     }
 
+    public function testSocketConnection()
+    {
+        $factory = new AMQPConnectionFactory(
+            'OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures\AMQPSocketConnection',
+            array()
+        );
+
+        /** @var AMQPSocketConnection $instance */
+        $instance = $factory->createConnection();
+        $this->assertInstanceOf('PhpAmqpLib\Connection\AMQPSocketConnection', $instance);
+        $this->assertEquals(array(
+            'localhost', // host
+            5672,        // port
+            'guest',     // user
+            'guest',     // password
+            '/',         // vhost
+            false,       // insist
+            "AMQPLAIN",  // login method
+            null,        // login response
+            "en_US",     // locale
+            3,           // read_timeout
+            false,       // keepalive
+            3,           // write_timeout
+            0,           // heartbeat
+        ), $instance->constructParams);
+    }
+
+    public function testSocketConnectionWithParams()
+    {
+        $factory = new AMQPConnectionFactory(
+            'OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures\AMQPSocketConnection',
+            array(
+                'read_timeout' => 31,
+                'write_timeout' => 32,
+            )
+        );
+
+        /** @var AMQPSocketConnection $instance */
+        $instance = $factory->createConnection();
+        $this->assertInstanceOf('PhpAmqpLib\Connection\AMQPSocketConnection', $instance);
+        $this->assertEquals(array(
+            'localhost', // host
+            5672,        // port
+            'guest',     // user
+            'guest',     // password
+            '/',         // vhost
+            false,       // insist
+            "AMQPLAIN",  // login method
+            null,        // login response
+            "en_US",     // locale
+            31,           // read_timeout
+            false,       // keepalive
+            32,           // write_timeout
+            0,           // heartbeat
+        ), $instance->constructParams);
+    }
+
     public function testStandardConnectionParameters()
     {
         $factory = new AMQPConnectionFactory(

Tests/RabbitMq/Fixtures/AMQPSocketConnection.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace OldSound\RabbitMqBundle\Tests\RabbitMq\Fixtures;
+
+use PhpAmqpLib\Connection\AMQPSocketConnection as BaseAMQPSocketConnection;
+
+class AMQPSocketConnection extends BaseAMQPSocketConnection
+{
+    public $constructParams;
+
+    public function __construct()
+    {
+        // save params for direct access in tests
+        $this->constructParams = func_get_args();
+    }
+}