Merge pull request #414 from ramunasd/dbal_ping_only_connected

[bundle] Don't ping DBAL connection if it wasn't opened

Author: makasim

Diff for: pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

@@ -32,6 +32,10 @@ public function onPreReceived(Context $context)
     {
         /** @var Connection $connection */
         foreach ($this->registry->getConnections() as $connection) {
+            if (!$connection->isConnected()) {
+                continue;
+            }
+
             if ($connection->ping()) {
                 return;
             }

Diff for: pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php

@@ -22,6 +22,11 @@ public function testCouldBeConstructedWithRequiredAttributes()
     public function testShouldNotReconnectIfConnectionIsOK()
     {
         $connection = $this->createConnectionMock();
+        $connection
+            ->expects($this->once())
+            ->method('isConnected')
+            ->will($this->returnValue(true))
+        ;
         $connection
             ->expects($this->once())
             ->method('ping')
@@ -56,6 +61,11 @@ public function testShouldNotReconnectIfConnectionIsOK()
     public function testShouldDoesReconnectIfConnectionFailed()
     {
         $connection = $this->createConnectionMock();
+        $connection
+            ->expects($this->once())
+            ->method('isConnected')
+            ->will($this->returnValue(true))
+        ;
         $connection
             ->expects($this->once())
             ->method('ping')
@@ -93,6 +103,49 @@ public function testShouldDoesReconnectIfConnectionFailed()
         $extension->onPreReceived($context);
     }
 
+    public function testShouldSkipIfConnectionWasNotOpened()
+    {
+        $connection1 = $this->createConnectionMock();
+        $connection1
+            ->expects($this->once())
+            ->method('isConnected')
+            ->will($this->returnValue(false))
+        ;
+        $connection1
+            ->expects($this->never())
+            ->method('ping')
+        ;
+
+        // 2nd connection was opened in the past
+        $connection2 = $this->createConnectionMock();
+        $connection2
+            ->expects($this->once())
+            ->method('isConnected')
+            ->will($this->returnValue(true))
+        ;
+        $connection2
+            ->expects($this->once())
+            ->method('ping')
+            ->will($this->returnValue(true))
+        ;
+
+        $context = $this->createPsrContext();
+        $context->getLogger()
+            ->expects($this->never())
+            ->method('debug')
+        ;
+
+        $registry = $this->createRegistryMock();
+        $registry
+            ->expects($this->once())
+            ->method('getConnections')
+            ->will($this->returnValue([$connection1, $connection2]))
+        ;
+
+        $extension = new DoctrinePingConnectionExtension($registry);
+        $extension->onPreReceived($context);
+    }
+
     /**
      * @return Context
      */