Upgrade the minimum php version to 8.0 for connection pool. (#4219)

Author: limingxinleo

src/Pool/RedisPool.php

@@ -21,19 +21,10 @@
 
 class RedisPool extends Pool
 {
-    /**
-     * @var string
-     */
-    protected $name;
+    protected array $config;
 
-    /**
-     * @var array
-     */
-    protected $config;
-
-    public function __construct(ContainerInterface $container, string $name)
+    public function __construct(ContainerInterface $container, protected string $name)
     {
-        $this->name = $name;
         $config = $container->get(ConfigInterface::class);
         $key = sprintf('redis.%s', $this->name);
         if (! $config->has($key)) {

src/RedisConnection.php

@@ -12,10 +12,10 @@
 namespace Hyperf\Redis;
 
 use Hyperf\Contract\ConnectionInterface;
+use Hyperf\Contract\PoolInterface;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Pool\Connection as BaseConnection;
 use Hyperf\Pool\Exception\ConnectionException;
-use Hyperf\Pool\Pool;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -25,15 +25,9 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
 {
     use ScanCaller;
 
-    /**
-     * @var \Redis
-     */
-    protected $connection;
+    protected \Redis|\RedisCluster|null $connection = null;
 
-    /**
-     * @var array
-     */
-    protected $config = [
+    protected array $config = [
         'host' => 'localhost',
         'port' => 6379,
         'auth' => null,
@@ -58,11 +52,10 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
 
     /**
      * Current redis database.
-     * @var null|int
      */
-    protected $database;
+    protected ?int $database = null;
 
-    public function __construct(ContainerInterface $container, Pool $pool, array $config)
+    public function __construct(ContainerInterface $container, PoolInterface $pool, array $config)
     {
         parent::__construct($container, $pool);
         $this->config = array_replace_recursive($this->config, $config);
@@ -104,18 +97,11 @@ public function reconnect(): bool
         $cluster = $this->config['cluster']['enable'] ?? false;
         $sentinel = $this->config['sentinel']['enable'] ?? false;
 
-        $redis = null;
-        switch (true) {
-            case $cluster:
-                $redis = $this->createRedisCluster();
-                break;
-            case $sentinel:
-                $redis = $this->createRedisSentinel();
-                break;
-            default:
-                $redis = $this->createRedis($host, $port, $timeout);
-                break;
-        }
+        $redis = match (true) {
+            $cluster => $this->createRedisCluster(),
+            $sentinel => $this->createRedisSentinel(),
+            default => $this->createRedis($host, $port, $timeout),
+        };
 
         $options = $this->config['options'] ?? [];
 
@@ -161,20 +147,20 @@ public function setDatabase(?int $database): void
         $this->database = $database;
     }
 
-    protected function createRedisCluster()
+    protected function createRedisCluster(): \RedisCluster
     {
         try {
-            $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;
+            $parameters = [];
+            $parameters[] = $this->config['cluster']['name'] ?? null;
+            $parameters[] = $this->config['cluster']['seeds'] ?? [];
+            $parameters[] = $this->config['timeout'] ?? 0.0;
+            $parameters[] = $this->config['cluster']['read_timeout'] ?? 0.0;
+            $parameters[] = $this->config['cluster']['persistent'] ?? false;
             if (isset($this->config['auth'])) {
-                $paramaters[] = $this->config['auth'];
+                $parameters[] = $this->config['auth'];
             }
 
-            $redis = new \RedisCluster(...$paramaters);
+            $redis = new \RedisCluster(...$parameters);
         } catch (\Throwable $e) {
             throw new ConnectionException('Connection reconnect failed ' . $e->getMessage());
         }
@@ -185,7 +171,7 @@ protected function createRedisCluster()
     protected function retry($name, $arguments, \Throwable $exception)
     {
         $logger = $this->container->get(StdoutLoggerInterface::class);
-        $logger->warning(sprintf('Redis::__call failed, because ' . $exception->getMessage()));
+        $logger->warning('Redis::__call failed, because ' . $exception->getMessage());
 
         try {
             $this->reconnect();
@@ -198,7 +184,7 @@ protected function retry($name, $arguments, \Throwable $exception)
         return $result;
     }
 
-    protected function createRedisSentinel()
+    protected function createRedisSentinel(): \Redis
     {
         try {
             $nodes = $this->config['sentinel']['nodes'] ?? [];
@@ -238,9 +224,8 @@ protected function createRedisSentinel()
      * @param string $host
      * @param int $port
      * @param float $timeout
-     * @return \Redis
      */
-    protected function createRedis($host, $port, $timeout)
+    protected function createRedis($host, $port, $timeout): \Redis
     {
         $redis = new \Redis();
         if (! $redis->connect((string) $host, (int) $port, $timeout)) {