[Messenger] widen retry catch to \AMQPException, rename helper

gustaf-ag47 · gustaf-ag47 · commit 8c77699b4d74 · 2026-04-10T14:13:29.000+02:00
Production logs show bare \AMQPException (not \AMQPConnectionException)
thrown from ext-amqp C code during declareExchange() on fresh
connections. The C extension doesn't always promote SSL errors to
AMQPConnectionException — unmapped library_error codes fall to the
default branch in php_amqp_zend_throw_exception().

Widen the catch from \AMQPConnectionException to \AMQPException so the
retry wrapper catches all ext-amqp failures during publish. Rename the
helper from withConnectionExceptionRetry to withAmqpExceptionRetry to
match the new behavior.

Safe: clear() drops all cached state between retries, and max 3 retries
bounds the cost. Worst case is 3 extra reconnection attempts.
diff --git a/Transport/AmqpExt/Connection.php b/Transport/AmqpExt/Connection.php
@@ -187,7 +187,7 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, A
     {
         $this->clearWhenDisconnected();
 
-        $this->withConnectionExceptionRetry(function () use ($body, $headers, $delayInMs, $amqpStamp) {
+        $this->withAmqpExceptionRetry(function () use ($body, $headers, $delayInMs, $amqpStamp) {
             if (0 !== $delayInMs) {
                 $this->publishWithDelay($body, $headers, $delayInMs, $amqpStamp);
 
@@ -456,15 +456,15 @@ private function clear(): void
         $this->amqpDelayExchange = null;
     }
 
-    private function withConnectionExceptionRetry(callable $callable): void
+    private function withAmqpExceptionRetry(callable $callable): void
     {
         $maxRetries = 3;
         $retries = 0;
 
         retry:
         try {
             $callable();
-        } catch (\AMQPConnectionException $e) {
+        } catch (\AMQPException $e) {
             if (++$retries <= $maxRetries) {
                 $this->clear();
 
