Merge branch 'master' into 2.1-merge

Author: limingxinleo

src/RedisConnection.php

@@ -43,6 +43,8 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
             'enable' => false,
             'name' => null,
             'seeds' => [],
+            'read_timeout' => 0.0,
+            'persistent' => false,
         ],
         'sentinel' => [
             'enable' => false,
@@ -63,7 +65,7 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
     public function __construct(ContainerInterface $container, Pool $pool, array $config)
     {
         parent::__construct($container, $pool);
-        $this->config = array_replace($this->config, $config);
+        $this->config = array_replace_recursive($this->config, $config);
 
         $this->reconnect();
     }
@@ -122,7 +124,7 @@ public function reconnect(): bool
             $redis->setOption($name, $value);
         }
 
-        if (isset($auth) && $auth !== '') {
+        if ($redis instanceof \Redis && isset($auth) && $auth !== '') {
             $redis->auth($auth);
         }
 
@@ -164,9 +166,12 @@ protected function createRedisCluster()
         try {
             $seeds = $this->config['cluster']['seeds'] ?? [];
             $name = $this->config['cluster']['name'] ?? null;
+            $readTimeout = $this->config['cluster']['read_timeout'] ?? 0.0;
+            $persistent = $this->config['cluster']['persistent'] ?? false;
             $timeout = $this->config['timeout'] ?? null;
+            $auth = $this->config['auth'] ?? null;
 
-            $redis = new \RedisCluster($name, $seeds, $timeout);
+            $redis = new \RedisCluster($name, $seeds, $timeout, $readTimeout, $persistent, $auth);
         } catch (\Throwable $e) {
             throw new ConnectionException('Connection reconnect failed ' . $e->getMessage());
         }

tests/RedisConnectionTest.php

@@ -49,7 +49,11 @@ public function testRedisConnectionConfig()
             'cluster' => [
                 'enable' => false,
                 'name' => null,
-                'seeds' => [],
+                'seeds' => [
+                    '127.0.0.1:6379',
+                ],
+                'read_timeout' => 0.0,
+                'persistent' => false,
             ],
             'sentinel' => [
                 'enable' => false,
@@ -126,6 +130,16 @@ private function getRedisPool()
                         'heartbeat' => -1,
                         'max_idle_time' => 1,
                     ],
+                    'cluster' => [
+                        'enable' => false,
+                        'name' => null,
+                        'seeds' => [
+                            '127.0.0.1:6379',
+                        ],
+                    ],
+                    'sentinel' => [
+                        'enable' => false,
+                    ],
                 ],
             ],
         ]));