[Messenger] Fix PHP 8.5 deprecation for pgsqlGetNotify() in PostgreSQL transport

Shine-neko · nicolas-grekas · commit 60efbba74e97 · 2025-12-04T21:27:01.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -74,6 +74,13 @@ public function pgsqlGetNotify()
                 return false;
             }
 
+            public function getNotify()
+            {
+                ++$this->notifyCalls;
+
+                return false;
+            }
+
             public function countNotifyCalls()
             {
                 return $this->notifyCalls;
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -26,7 +26,7 @@ final class PostgreSqlConnection extends Connection
 {
     /**
      * * check_delayed_interval: The interval to check for delayed messages, in milliseconds. Set to 0 to disable checks. Default: 60000 (1 minute)
-     * * get_notify_timeout: The length of time to wait for a response when calling PDO::pgsqlGetNotify, in milliseconds. Default: 0.
+     * * get_notify_timeout: The length of time to wait for a response when calling PDO::pgsqlGetNotify (or Pdo\Pgsql::getNotify on PHP 8.4+), in milliseconds. Default: 0.
      */
     protected const DEFAULT_OPTIONS = parent::DEFAULT_OPTIONS + [
         'check_delayed_interval' => 60000,
@@ -74,7 +74,9 @@ public function get(): ?array
             }
         }
 
-        $notification = $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);
+        $notification = \PHP_VERSION_ID >= 80500
+            ? $wrappedConnection->getNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout'])
+            : $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);
         if (
             // no notifications, or for another table or queue
             (false === $notification || $notification['message'] !== $this->configuration['table_name'] || $notification['payload'] !== $this->configuration['queue_name'])

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,13 @@ public function pgsqlGetNotify()`
`74`	`74`	`return false;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ public function getNotify()`
	`78`	`+ {`
	`79`	`+ ++$this->notifyCalls;`
	`80`	`+`
	`81`	`+ return false;`
	`82`	`+ }`
	`83`	`+`
`77`	`84`	`public function countNotifyCalls()`
`78`	`85`	`{`
`79`	`86`	`return $this->notifyCalls;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class PostgreSqlConnection extends Connection`
`26`	`26`	`{`
`27`	`27`	`/**`
`28`	`28`	`* * check_delayed_interval: The interval to check for delayed messages, in milliseconds. Set to 0 to disable checks. Default: 60000 (1 minute)`
`29`		`- * * get_notify_timeout: The length of time to wait for a response when calling PDO::pgsqlGetNotify, in milliseconds. Default: 0.`
	`29`	`+ * * get_notify_timeout: The length of time to wait for a response when calling PDO::pgsqlGetNotify (or Pdo\Pgsql::getNotify on PHP 8.4+), in milliseconds. Default: 0.`
`30`	`30`	`*/`
`31`	`31`	`protected const DEFAULT_OPTIONS = parent::DEFAULT_OPTIONS + [`
`32`	`32`	`'check_delayed_interval' => 60000,`
`@@ -74,7 +74,9 @@ public function get(): ?array`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- $notification = $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);`
	`77`	`+ $notification = \PHP_VERSION_ID >= 80500`
	`78`	`+ ? $wrappedConnection->getNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout'])`
	`79`	`+ : $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);`
`78`	`80`	`if (`
`79`	`81`	`// no notifications, or for another table or queue`
`80`	`82`	`(false === $notification \|\| $notification['message'] !== $this->configuration['table_name'] \|\| $notification['payload'] !== $this->configuration['queue_name'])`