bug #31544 [Messenger] Fix undefined index on read timeout (chalasr)

fabpot · fabpot · commit abefb53d7c54 · 2019-05-19T21:00:29.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] Fix undefined index on read timeout | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- fd8d6b8 [Messenger] Fix undefined index on read timeout
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -115,7 +115,8 @@ public function testUnexpectedRedisError()
 
     public function testGetAfterReject()
     {
-        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget');
+        $redis = new \Redis();
+        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', [], $redis);
         try {
             $connection->setup();
         } catch (TransportException $e) {
@@ -129,5 +130,20 @@ public function testGetAfterReject()
 
         $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget');
         $this->assertNotNull($connection->get());
+
+        $redis->del('messenger-rejectthenget');
+    }
+
+    public function testBlockingTimeout()
+    {
+        $redis = new \Redis();
+        $connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis);
+        try {
+            $connection->setup();
+        } catch (TransportException $e) {
+        }
+
+        $this->assertNull($connection->get());
+        $redis->del('messenger-blockingtimeout');
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -102,7 +102,7 @@ public function get(): ?array
             return $this->get();
         }
 
-        foreach ($messages[$this->stream] as $key => $message) {
+        foreach ($messages[$this->stream] ?? [] as $key => $message) {
             $redisEnvelope = \json_decode($message['message'], true);
 
             return [

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function get(): ?array`
`102`	`102`	`return $this->get();`
`103`	`103`	`}`
`104`	`104`
`105`		`- foreach ($messages[$this->stream] as $key => $message) {`
	`105`	`+ foreach ($messages[$this->stream] ?? [] as $key => $message) {`
`106`	`106`	`$redisEnvelope = \json_decode($message['message'], true);`
`107`	`107`
`108`	`108`	`return [`