Do not create channel for lazy socket connection on construct

Author: munkie

RabbitMq/BaseAmqp.php

@@ -64,7 +64,7 @@ public function __construct(AbstractConnection $conn, AMQPChannel $ch = null, $c
         $this->conn = $conn;
         $this->ch = $ch;
 
-        if (!($conn instanceof AMQPLazyConnection)) {
+        if ($conn->connectOnConstruct()) {
             $this->getChannel();
         }
 

Tests/RabbitMq/BaseAmqpTest.php

@@ -5,19 +5,40 @@
 use OldSound\RabbitMqBundle\Event\AMQPEvent;
 use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
-use PhpAmqpLib\Connection\AMQPLazyConnection;
 
 class BaseAmqpTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @expectedException \ErrorException
-     */
+
     public function testLazyConnection()
     {
-        $amqpLazyConnection = new AMQPLazyConnection('localhost', 123, 'lazy_user', 'lazy_password');
+        $connection = $this->getMockBuilder('PhpAmqpLib\Connection\AbstractConnection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connection
+            ->method('connectOnConstruct')
+            ->willReturn(false);
+        $connection
+            ->expects(static::never())
+            ->method('channel');
+
+        new Consumer($connection, null);
+    }
+
+    public function testNotLazyConnection()
+    {
+        $connection = $this->getMockBuilder('PhpAmqpLib\Connection\AbstractConnection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connection
+            ->method('connectOnConstruct')
+            ->willReturn(true);
+        $connection
+            ->expects(static::once())
+            ->method('channel');
 
-        $consumer = new Consumer($amqpLazyConnection, null);
-        $consumer->getChannel();
+        new Consumer($connection, null);
     }
 
     public function testDispatchEvent()
@@ -26,7 +47,7 @@ public function testDispatchEvent()
         $baseAmqpConsumer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\BaseAmqp')
             ->disableOriginalConstructor()
             ->getMock();
-        $eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
+        $eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $baseAmqpConsumer->expects($this->atLeastOnce())