Merge branch 'master' into 3.0-merge

# Conflicts:
#	.github/workflows/test.yml
#	phpstan.neon
#	src/kafka/src/Producer.php
#	src/load-balancer/src/Node.php
#	src/retry/tests/RetryAnnotationAspectTest.php
#	src/session/src/Handler/FileHandler.php

Author: limingxinleo

publish/redis.php

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

src/RedisConnection.php

@@ -194,6 +194,7 @@ protected function createRedisSentinel(): \Redis
             $retryInterval = $this->config['retry_interval'] ?? 0;
             $readTimeout = $this->config['sentinel']['read_timeout'] ?? 0;
             $masterName = $this->config['sentinel']['master_name'] ?? '';
+            $auth = $this->config['sentinel']['auth'] ?? null;
             shuffle($nodes);
 
             $host = null;
@@ -207,7 +208,8 @@ protected function createRedisSentinel(): \Redis
                         $timeout,
                         $persistent,
                         $retryInterval,
-                        $readTimeout
+                        $readTimeout,
+                        $auth
                     );
                     $masterInfo = $sentinel->getMasterAddrByName($masterName);
                     if (is_array($masterInfo) && count($masterInfo) >= 2) {

tests/RedisTest.php

@@ -182,6 +182,18 @@ public function testShuffleNodes()
         $this->assertSame(3, count($nodes));
     }
 
+    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);
+    }
+
     private function getRedis()
     {
         $container = $this->getContainer();