Added test cases for redis extension 5.3.7 and 6.0.0 (#6148)

Author: limingxinleo

composer.json

@@ -17,7 +17,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "ext-redis": "<6.0",
+        "ext-redis": "^5.0|^6.0",
         "hyperf/contract": "~3.1.0",
         "hyperf/pool": "~3.1.0",
         "hyperf/support": "~3.1.0",

tests/RedisProxyTest.php

@@ -186,7 +186,7 @@ public function testRedisPipeline()
             usleep(1000);
             $redis->lRange('pipeline:list', 0, 1);
             $redis->lTrim('pipeline:list', 2, -1);
-            usleep(10000);
+            usleep(20000);
             $chan2->push($redis->exec());
         });
 

tests/RedisTest.php

@@ -66,7 +66,11 @@ public function testRedisConnect()
         $this->assertSame('host', $host->getName());
         $this->assertSame('port', $port->getName());
         $this->assertSame('timeout', $timeout->getName());
-        $this->assertSame('retry_interval', $retryInterval->getName());
+        if (version_compare(phpversion('redis'), '6.0', '>=')) {
+            $this->assertSame('persistent_id', $retryInterval->getName());
+        } else {
+            $this->assertSame('retry_interval', $retryInterval->getName());
+        }
 
         $this->assertTrue($redis->connect('127.0.0.1', 6379, 0.0, null, 0, 0));
     }
@@ -159,14 +163,31 @@ public function testRedisClusterConstructor()
         $ref = new ReflectionClass(RedisCluster::class);
         $method = $ref->getMethod('__construct');
         $names = [
-            'name', 'seeds', 'timeout', 'read_timeout', 'persistent', 'auth',
+            ['name', 'string'],
+            ['seeds', 'array'],
+            ['timeout', ['int', 'float']],
+            ['read_timeout', ['int', 'float']],
+            ['persistent', 'bool'],
+            ['auth', 'mixed'],
+            ['context', 'array'],
         ];
         foreach ($method->getParameters() as $parameter) {
-            $this->assertSame(array_shift($names), $parameter->getName());
+            [$name, $type] = array_shift($names);
+            $this->assertSame($name, $parameter->getName());
             if ($parameter->getName() === 'seeds') {
                 $this->assertSame('array', $parameter->getType()->getName());
             } else {
-                $this->assertNull($parameter->getType());
+                if (version_compare(phpversion('redis'), '6.0', '>=')) {
+                    if (is_array($type)) {
+                        foreach ($parameter->getType()->getTypes() as $namedType) {
+                            $this->assertTrue(in_array($namedType->getName(), $type));
+                        }
+                    } else {
+                        $this->assertSame($type, $parameter->getType()->getName());
+                    }
+                } else {
+                    $this->assertNull($parameter->getType());
+                }
             }
         }
     }
@@ -202,11 +223,16 @@ public function testRedisSentinelParams()
         $rel = new ReflectionClass(RedisSentinel::class);
         $method = $rel->getMethod('__construct');
         $count = count($method->getParameters());
-        if ($count === 6) {
-            $this->markTestIncomplete('RedisSentinel don\'t support auth.');
-        }
 
-        $this->assertSame(7, $count);
+        if (version_compare(phpversion('redis'), '6.0', '>=')) {
+            $this->assertSame(1, $count);
+            $this->assertSame('options', $method->getParameters()[0]->getName());
+        } else {
+            if ($count === 6) {
+                $this->markTestIncomplete('RedisSentinel don\'t support auth.');
+            }
+            $this->assertSame(7, $count);
+        }
     }
 
     private function getRedis()