Fixed bug that RedisSentinel can't support empty password. (#5199)

Co-authored-by: 李铭昕 <[email protected]>

Author: xuanyanwow

publish/redis.php

@@ -30,7 +30,7 @@
             'nodes' => explode(';', env('REDIS_SENTINEL_NODE', '')),
             'persistent' => '',
             'read_timeout' => 0,
-            'auth' => null,
+            'auth' => env('REDIS_SENTINEL_PASSWORD', ''),
         ],
         'pool' => [
             'min_connections' => 1,

src/RedisConnection.php

@@ -212,6 +212,13 @@ 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;
@@ -226,7 +233,7 @@ protected function createRedisSentinel(): Redis
                         $persistent,
                         $retryInterval,
                         $readTimeout,
-                        $auth
+                        ...$extendConfig
                     );
                     $masterInfo = $sentinel->getMasterAddrByName($masterName);
                     if (is_array($masterInfo) && count($masterInfo) >= 2) {
@@ -266,7 +273,7 @@ protected function createRedis(array $config): Redis
     {
         $parameters = [
             $config['host'] ?? '',
-            $config['port'] ?? 6379,
+            (int) ($config['port'] ?? 6379),
             $config['timeout'] ?? 0.0,
             $config['reserved'] ?? null,
             $config['retry_interval'] ?? 0,