minor #54637 [Messenger] Fix reading pending messages with Redis (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 373525d9e72b · 2024-04-17T17:47:46.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Messenger] Fix reading pending messages with Redis | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT As seen sometimes on appveyor, `Redis::xpending()` can return false. Commits ------- 8b3bf65 [Messenger] Fix reading pending messages with Redis
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -304,7 +304,7 @@ private function claimOldPendingMessages()
         try {
             // This could soon be optimized with https://github.com/antirez/redis/issues/5212 or
             // https://github.com/antirez/redis/issues/6256
-            $pendingMessages = $this->connection->xpending($this->stream, $this->group, '-', '+', 1);
+            $pendingMessages = $this->connection->xpending($this->stream, $this->group, '-', '+', 1) ?: [];
         } catch (\RedisException $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ private function claimOldPendingMessages()`
`304`	`304`	`try {`
`305`	`305`	`// This could soon be optimized with https://github.com/antirez/redis/issues/5212 or`
`306`	`306`	`// https://github.com/antirez/redis/issues/6256`
`307`		`- $pendingMessages = $this->connection->xpending($this->stream, $this->group, '-', '+', 1);`
	`307`	`+ $pendingMessages = $this->connection->xpending($this->stream, $this->group, '-', '+', 1) ?: [];`
`308`	`308`	`} catch (\RedisException $e) {`
`309`	`309`	`throw new TransportException($e->getMessage(), 0, $e);`
`310`	`310`	`}`