Fix invalid array access on popTailBlocking timeout

amphp · May 16, 2020 · 7ccde09 · 7ccde09
1 parent 6303aeb
commit 7ccde09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/RedisList.php b/src/RedisList.php
@@ -154,14 +154,14 @@ public function popTail(): Promise
     /**
      * @param int $timeout
      *
-     * @return Promise<string>
+     * @return Promise<string|null>
      *
      * @link https://redis.io/commands/brpop
      */
     public function popTailBlocking(int $timeout = 0): Promise
     {
         return $this->queryExecutor->execute(['brpop', $this->key, $timeout], static function ($response) {
-            return $response[1];
+            return $response[1] ?? null;
         });
     }
 
@@ -181,7 +181,7 @@ public function popTailPushHead(string $destination): Promise
      * @param string $destination
      * @param int    $timeout
      *
-     * @return Promise<string>
+     * @return Promise<string|null>
      *
      * @link https://redis.io/commands/brpoplpush
      */

diff --git a/test/RedisListTest.php b/test/RedisListTest.php
@@ -49,5 +49,7 @@ public function test(): \Generator
         $this->assertSame('b', yield $list->popTailBlocking());
 
         $this->assertNull(yield $this->redis->getList('nonexistent')->popHeadBlocking(1));
+        $this->assertNull(yield $this->redis->getList('nonexistent')->popTailBlocking(1));
+        $this->assertNull(yield $this->redis->getList('nonexistent')->popTailPushHeadBlocking('nonexistent', 1));
     }
 }