Merge branch 'master' into 2.1-merge

# Conflicts:
#	README.md
#	src/amqp/src/Message/ConsumerMessageInterface.php
#	src/utils/src/Coroutine/Concurrent.php
#	src/websocket-server/src/Server.php

Author: limingxinleo

src/ConfigProvider.php

@@ -25,9 +25,6 @@ public function __invoke(): array
                         __DIR__,
                     ],
                 ],
-                'ignore_annotations' => [
-                    'mixin',
-                ],
             ],
             'publish' => [
                 [

src/RedisConnection.php

@@ -164,14 +164,17 @@ public function setDatabase(?int $database): void
     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, $readTimeout, $persistent, $auth);
+            $paramaters = [];
+            $paramaters[] = $this->config['cluster']['name'] ?? null;
+            $paramaters[] = $this->config['cluster']['seeds'] ?? [];
+            $paramaters[] = $this->config['timeout'] ?? 0.0;
+            $paramaters[] = $this->config['cluster']['read_timeout'] ?? 0.0;
+            $paramaters[] = $this->config['cluster']['persistent'] ?? false;
+            if (isset($this->config['auth'])) {
+                $paramaters[] = $this->config['auth'];
+            }
+
+            $redis = new \RedisCluster(...$paramaters);
         } catch (\Throwable $e) {
             throw new ConnectionException('Connection reconnect failed ' . $e->getMessage());
         }

tests/RedisTest.php

@@ -15,11 +15,13 @@
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Di\Container;
 use Hyperf\Pool\Channel;
+use Hyperf\Pool\Exception\ConnectionException;
 use Hyperf\Pool\PoolOption;
 use Hyperf\Redis\Frequency;
 use Hyperf\Redis\Pool\PoolFactory;
 use Hyperf\Redis\Pool\RedisPool;
 use Hyperf\Redis\Redis;
+use Hyperf\Redis\RedisProxy;
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Context;
 use Hyperf\Utils\Coroutine;
@@ -137,6 +139,39 @@ public function testRedisReuseAfterThrowable()
         $this->assertSame(1, $pool->getCurrentConnections());
     }
 
+    public function testRedisClusterConstructor()
+    {
+        $ref = new \ReflectionClass(\RedisCluster::class);
+        $method = $ref->getMethod('__construct');
+        $names = [
+            'name', 'seeds', 'timeout', 'read_timeout', 'persistent', 'auth',
+        ];
+        foreach ($method->getParameters() as $parameter) {
+            $this->assertSame(array_shift($names), $parameter->getName());
+            if ($parameter->getName() === 'seeds') {
+                $this->assertSame('array', $parameter->getType()->getName());
+            } else {
+                $this->assertNull($parameter->getType());
+            }
+        }
+    }
+
+    public function testNewRedisCluster()
+    {
+        try {
+            $container = $this->getContainer();
+            $pool = new RedisPoolStub($container, 'cluster1');
+            $container->shouldReceive('make')->once()->with(RedisPool::class, ['name' => 'cluster1'])->andReturn($pool);
+            $factory = new PoolFactory($container);
+            $redis = new RedisProxy($factory, 'cluster1');
+            $redis->get('test');
+            $this->assertTrue(false);
+        } catch (\Throwable $exception) {
+            $this->assertInstanceOf(ConnectionException::class, $exception);
+            $this->assertStringNotContainsString('RedisCluster::__construct() expects parameter', $exception->getMessage());
+        }
+    }
+
     private function getRedis()
     {
         $container = $this->getContainer();
@@ -168,6 +203,17 @@ private function getContainer()
                         'max_idle_time' => 60,
                     ],
                 ],
+                'cluster1' => [
+                    'timeout' => 1.0,
+                    'auth' => null,
+                    'cluster' => [
+                        'enable' => true,
+                        'name' => 'mycluster',
+                        'seeds' => [],
+                        'read_timeout' => 1.0,
+                        'persistent' => false,
+                    ],
+                ],
             ],
         ]));
         $container->shouldReceive('make')->with(Frequency::class, Mockery::any())->andReturn(new Frequency());

tests/Stub/RedisConnectionStub.php

@@ -50,6 +50,10 @@ public function reconnect(): bool
 
         $this->lastUseTime = microtime(true);
 
+        if ($this->config['cluster']['enable'] ?? false) {
+            $this->createRedisCluster();
+        }
+
         return true;
     }