bug #44309 [Messenger] Leverage DBAL's getNativeConnection() method (derrabus)

fabpot · fabpot · commit af596bf20276 · 2021-11-29T16:26:05.000+01:00
This PR was merged into the 5.3 branch. Discussion ---------- [Messenger] Leverage DBAL's getNativeConnection() method | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Doctrine DBAL 3 introduced a new driver middleware system that makes it difficult to unwrap the native PDO connection which we need for Messenger's Postgres transport. If an application would actually make use of the middleware system, accessing the PDO connection would become impossible for us. Because of that, I have added a method `getNativeConnection()` to DBAL with doctrine/dbal#5037. This PR leverages this new method. Commits ------- cde5ec7 Leverage DBAL's getNativeConnection() method
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -73,9 +73,13 @@ public function get(): ?array
             $this->listening = true;
         }
 
-        $wrappedConnection = $this->driverConnection->getWrappedConnection();
-        if (!$wrappedConnection instanceof \PDO && $wrappedConnection instanceof DoctrinePdoConnection) {
-            $wrappedConnection = $wrappedConnection->getWrappedConnection();
+        if (method_exists($this->driverConnection, 'getNativeConnection')) {
+            $wrappedConnection = $this->driverConnection->getNativeConnection();
+        } else {
+            $wrappedConnection = $this->driverConnection->getWrappedConnection();
+            if (!$wrappedConnection instanceof \PDO && $wrappedConnection instanceof DoctrinePdoConnection) {
+                $wrappedConnection = $wrappedConnection->getWrappedConnection();
+            }
         }
 
         $notification = $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);
