Merge branch 'master' into 3.1

# Conflicts:
#	src/redis/tests/RedisTest.php

Author: limingxinleo

src/RedisConnection.php

@@ -23,7 +23,6 @@
 use Redis;
 use RedisCluster;
 use RedisException;
-use RedisSentinel;
 use Throwable;
 
 /**
@@ -231,36 +230,28 @@ protected function createRedisSentinel(): Redis
             $readTimeout = $this->config['sentinel']['read_timeout'] ?? 0;
             $masterName = $this->config['sentinel']['master_name'] ?? '';
             $auth = $this->config['sentinel']['auth'] ?? null;
-            // fixes bug for phpredis
-            // https://github.com/phpredis/phpredis/issues/2098
-            $extendConfig = [];
-            if (! empty($auth)) {
-                $extendConfig[] = $auth;
-            }
 
             shuffle($nodes);
 
             $host = null;
             $port = null;
             foreach ($nodes as $node) {
                 try {
-                    $nodeUrlArray = parse_url($node);
-                    $sentinelHost = $nodeUrlArray['host'] ?? null;
-                    $sentinelPort = $nodeUrlArray['port'] ?? null;
-                    if (! $sentinelHost || ! $sentinelPort) {
+                    $resolved = parse_url($node);
+                    if (! isset($resolved['host'], $resolved['port'])) {
                         $this->log(sprintf('The redis sentinel node [%s] is invalid.', $node), LogLevel::ERROR);
                         continue;
                     }
-
-                    $sentinel = new RedisSentinel(
-                        $sentinelHost,
-                        intval($sentinelPort),
-                        $timeout,
-                        $persistent,
-                        $retryInterval,
-                        $readTimeout,
-                        ...$extendConfig
-                    );
+                    $options = [
+                        'host' => $resolved['host'],
+                        'port' => (int) $resolved['port'],
+                        'connectTimeout' => $timeout,
+                        'persistent' => $persistent,
+                        'retryInterval' => $retryInterval,
+                        'readTimeout' => $readTimeout,
+                        ...($auth ? ['auth' => $auth] : []),
+                    ];
+                    $sentinel = $this->container->get(RedisSentinelFactory::class)->create($options);
                     $masterInfo = $sentinel->getMasterAddrByName($masterName);
                     if (is_array($masterInfo) && count($masterInfo) >= 2) {
                         [$host, $port] = $masterInfo;

src/RedisSentinelFactory.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Redis;
+
+use RedisSentinel;
+
+class RedisSentinelFactory
+{
+    protected bool $isOlderThan6 = false;
+
+    public function __construct()
+    {
+        $this->isOlderThan6 = version_compare(phpversion('redis'), '6.0.0', '<');
+    }
+
+    public function create(array $options = []): RedisSentinel
+    {
+        if ($this->isOlderThan6) {
+            return new RedisSentinel(
+                $options['host'],
+                (int) $options['port'],
+                (float) $options['connectTimeout'],
+                $options['persistent'],
+                (int) $options['retryInterval'],
+                (float) $options['readTimeout'],
+                ...(isset($options['auth']) ? [$options['auth']] : []),
+            );
+        }
+
+        // https://github.com/phpredis/phpredis/blob/develop/sentinel.md#examples-for-version-60-or-later
+        return new RedisSentinel($options); /* @phpstan-ignore-line */
+    }
+}

tests/RedisTest.php

@@ -51,6 +51,13 @@
  */
 class RedisTest extends TestCase
 {
+    protected bool $isOlderThan6 = false;
+
+    protected function setUp(): void
+    {
+        $this->isOlderThan6 = version_compare(phpversion('redis'), '6.0.0', '<');
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();
@@ -66,10 +73,10 @@ public function testRedisConnect()
         $this->assertSame('host', $host->getName());
         $this->assertSame('port', $port->getName());
         $this->assertSame('timeout', $timeout->getName());
-        if (version_compare(phpversion('redis'), '6.0', '>=')) {
-            $this->assertSame('persistent_id', $retryInterval->getName());
-        } else {
+        if ($this->isOlderThan6) {
             $this->assertSame('retry_interval', $retryInterval->getName());
+        } else {
+            $this->assertSame('persistent_id', $retryInterval->getName());
         }
 
         $this->assertTrue($redis->connect('127.0.0.1', 6379, 0.0, null, 0, 0));
@@ -177,7 +184,7 @@ public function testRedisClusterConstructor()
             if ($parameter->getName() === 'seeds') {
                 $this->assertSame('array', $parameter->getType()->getName());
             } else {
-                if (version_compare(phpversion('redis'), '6.0', '>=')) {
+                if (! $this->isOlderThan6) {
                     if (is_array($type)) {
                         foreach ($parameter->getType()->getTypes() as $namedType) {
                             $this->assertTrue(in_array($namedType->getName(), $type));
@@ -224,7 +231,7 @@ public function testRedisSentinelParams()
         $method = $rel->getMethod('__construct');
         $count = count($method->getParameters());
 
-        if (version_compare(phpversion('redis'), '6.0', '>=')) {
+        if (! $this->isOlderThan6) {
             $this->assertSame(1, $count);
             $this->assertSame('options', $method->getParameters()[0]->getName());
         } else {