Fix zrange issues with Redis

driesvints · driesvints · commit 192ee403f9a3 · 2019-08-16T16:15:18.000+02:00
diff --git a/tests/Redis/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php
@@ -291,25 +291,33 @@ public function test_it_calculates_union_of_sorted_sets_and_stores()
 
     public function test_it_returns_range_in_sorted_set()
     {
-        foreach ($this->connections() as $redis) {
+        foreach ($this->connections() as $connector => $redis) {
             $redis->zadd('set', ['jeffrey' => 1, 'matt' => 5, 'taylor' => 10]);
             $this->assertEquals(['jeffrey', 'matt'], $redis->zrange('set', 0, 1));
             $this->assertEquals(['jeffrey', 'matt', 'taylor'], $redis->zrange('set', 0, -1));
 
-            $this->assertEquals(['jeffrey' => 1, 'matt' => 5], $redis->zrange('set', 0, 1, 'withscores'));
+            if ($connector === 'predis') {
+                $this->assertEquals(['jeffrey' => 1, 'matt' => 5], $redis->zrange('set', 0, 1, 'withscores'));
+            } else {
+                $this->assertEquals(['jeffrey' => 1, 'matt' => 5], $redis->zrange('set', 0, 1, true));
+            }
 
             $redis->flushall();
         }
     }
 
     public function test_it_returns_rev_range_in_sorted_set()
     {
-        foreach ($this->connections() as $redis) {
+        foreach ($this->connections() as $connector => $redis) {
             $redis->zadd('set', ['jeffrey' => 1, 'matt' => 5, 'taylor' => 10]);
             $this->assertEquals(['taylor', 'matt'], $redis->ZREVRANGE('set', 0, 1));
             $this->assertEquals(['taylor', 'matt', 'jeffrey'], $redis->ZREVRANGE('set', 0, -1));
 
-            $this->assertEquals(['matt' => 5, 'taylor' => 10], $redis->ZREVRANGE('set', 0, 1, 'withscores'));
+            if ($connector === 'predis') {
+                $this->assertEquals(['matt' => 5, 'taylor' => 10], $redis->ZREVRANGE('set', 0, 1, 'withscores'));
+            } else {
+                $this->assertEquals(['matt' => 5, 'taylor' => 10], $redis->ZREVRANGE('set', 0, 1, true));
+            }
 
             $redis->flushall();
         }
@@ -550,8 +558,8 @@ public function test_it_persists_connection()
     public function connections()
     {
         $connections = [
-            $this->redis['predis']->connection(),
-            $this->redis['phpredis']->connection(),
+            'predis' => $this->redis['predis']->connection(),
+            'phpredis' => $this->redis['phpredis']->connection(),
         ];
 
         if (extension_loaded('redis')) {
