ping is deprecated - use DummySelectSQL from platform and execute them!

Author: snapshotpl

pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

@@ -3,9 +3,11 @@
 namespace Enqueue\Bundle\Consumption\Extension;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception\ConnectionLost;
 use Doctrine\Persistence\ManagerRegistry;
 use Enqueue\Consumption\Context\MessageReceived;
 use Enqueue\Consumption\MessageReceivedExtensionInterface;
+use ErrorException;
 
 class DoctrinePingConnectionExtension implements MessageReceivedExtensionInterface
 {
@@ -27,7 +29,7 @@ public function onMessageReceived(MessageReceived $context): void
                 continue;
             }
 
-            if ($connection->ping()) {
+            if ($this->ping($connection)) {
                 continue;
             }
 
@@ -43,4 +45,23 @@ public function onMessageReceived(MessageReceived $context): void
             );
         }
     }
+
+    private function ping(Connection $connection): bool
+    {
+        set_error_handler(static function (int $severity, string $message, string $file, int $line): bool {
+            throw new ErrorException($message, $severity, $severity, $file, $line);
+        });
+
+        try {
+            $dummySelectSQL = $connection->getDatabasePlatform()->getDummySelectSQL();
+
+            $connection->executeQuery($dummySelectSQL);
+
+            return true;
+        } catch (ErrorException | ConnectionLost $exception) {
+            return false;
+        } finally {
+            restore_error_handler();
+        }
+    }
 }

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

@@ -3,6 +3,9 @@
 namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver\DriverException;
+use Doctrine\DBAL\Exception\ConnectionLost;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\Persistence\ManagerRegistry;
 use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension;
 use Enqueue\Consumption\Context\MessageReceived;
@@ -29,10 +32,17 @@ public function testShouldNotReconnectIfConnectionIsOK()
             ->method('isConnected')
             ->willReturn(true)
         ;
+
+        $abstractPlatform = $this->createMock(AbstractPlatform::class);
+        $abstractPlatform->expects($this->once())
+            ->method('getDummySelectSQL')
+            ->willReturn('dummy')
+        ;
+
         $connection
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(true)
+            ->method('getDatabasePlatform')
+            ->willReturn($abstractPlatform)
         ;
         $connection
             ->expects($this->never())
@@ -70,8 +80,8 @@ public function testShouldDoesReconnectIfConnectionFailed()
         ;
         $connection
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(false)
+            ->method('getDatabasePlatform')
+            ->willThrowException(new ConnectionLost('message', $this->createMock(DriverException::class)))
         ;
         $connection
             ->expects($this->once())
@@ -128,10 +138,16 @@ public function testShouldSkipIfConnectionWasNotOpened()
             ->method('isConnected')
             ->willReturn(true)
         ;
+        $abstractPlatform = $this->createMock(AbstractPlatform::class);
+        $abstractPlatform->expects($this->once())
+            ->method('getDummySelectSQL')
+            ->willReturn('dummy')
+        ;
+
         $connection2
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(true)
+            ->method('getDatabasePlatform')
+            ->willReturn($abstractPlatform)
         ;
 
         $context = $this->createContext();

pkg/enqueue-bundle/composer.json

@@ -20,6 +20,12 @@
         "source": "https://github.com/php-enqueue/enqueue-dev",
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git"
+        }
+    ],
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/stomp": "0.10.x-dev",