Upgrade the minimum php version to 8.0 for load-balancer and redis. (#4359)

Author: limingxinleo

composer.json

@@ -16,7 +16,7 @@
         "source": "https://github.com/hyperf/hyperf"
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=8.0",
         "ext-redis": "*",
         "hyperf/contract": "~3.0.0",
         "hyperf/pool": "~3.0.0",

src/Lua/Hash/HIncrByFloatIfExists.php

@@ -27,12 +27,11 @@ public function getScript(): string
 
     /**
      * @param null|float $data
-     * @return null|float
      */
-    public function format($data)
+    public function format($data): ?float
     {
         if (is_numeric($data)) {
-            return $data;
+            return (float) $data;
         }
         return null;
     }

src/Lua/Script.php

@@ -13,38 +13,34 @@
 
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Redis\Exception\RedisNotFoundException;
+use Hyperf\Redis\Redis;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 abstract class Script implements ScriptInterface
 {
     /**
      * PHPRedis client or proxy client.
      * @var mixed|\Redis
      */
-    protected $redis;
+    protected mixed $redis;
 
-    /**
-     * @var null|string
-     */
-    protected $sha;
+    protected ?string $sha = null;
 
-    /**
-     * @var StdoutLoggerInterface
-     */
-    protected $logger;
+    protected ?LoggerInterface $logger = null;
 
     public function __construct(ContainerInterface $container)
     {
-        if ($container->has(\Redis::class)) {
-            $this->redis = $container->get(\Redis::class);
+        if ($container->has(Redis::class)) {
+            $this->redis = $container->get(Redis::class);
         }
 
         if ($container->has(StdoutLoggerInterface::class)) {
             $this->logger = $container->get(StdoutLoggerInterface::class);
         }
     }
 
-    public function eval(array $arguments = [], $sha = true)
+    public function eval(array $arguments = [], $sha = true): mixed
     {
         if ($this->redis === null) {
             throw new RedisNotFoundException('Redis client is not found.');

src/Lua/ScriptInterface.php

@@ -15,7 +15,7 @@ interface ScriptInterface
 {
     public function getScript(): string;
 
-    public function format($data);
+    public function format($data): mixed;
 
-    public function eval(array $arguments = [], $sha = true);
+    public function eval(array $arguments = [], $sha = true): mixed;
 }

src/Pool/PoolFactory.php

@@ -16,19 +16,13 @@
 
 class PoolFactory
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
     /**
      * @var RedisPool[]
      */
-    protected $pools = [];
+    protected array $pools = [];
 
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
     public function getPool(string $name): RedisPool

src/Redis.php

@@ -22,19 +22,10 @@ class Redis
 {
     use ScanCaller;
 
-    /**
-     * @var PoolFactory
-     */
-    protected $factory;
-
-    /**
-     * @var string
-     */
-    protected $poolName = 'default';
+    protected string $poolName = 'default';
 
-    public function __construct(PoolFactory $factory)
+    public function __construct(protected PoolFactory $factory)
     {
-        $this->factory = $factory;
     }
 
     public function __call($name, $arguments)
@@ -71,7 +62,7 @@ public function __call($name, $arguments)
     }
 
     /**
-     * Define the commands that needs same connection to execute.
+     * Define the commands that need same connection to execute.
      * When these commands executed, the connection will storage to coroutine context.
      */
     private function shouldUseSameConnection(string $methodName): bool

src/RedisFactory.php

@@ -19,7 +19,7 @@ class RedisFactory
     /**
      * @var RedisProxy[]
      */
-    protected $proxies;
+    protected array $proxies = [];
 
     public function __construct(ConfigInterface $config)
     {
@@ -30,10 +30,7 @@ public function __construct(ConfigInterface $config)
         }
     }
 
-    /**
-     * @return RedisProxy
-     */
-    public function get(string $poolName)
+    public function get(string $poolName): RedisProxy
     {
         $proxy = $this->proxies[$poolName] ?? null;
         if (! $proxy instanceof RedisProxy) {

src/RedisProxy.php

@@ -18,8 +18,6 @@
  */
 class RedisProxy extends Redis
 {
-    protected $poolName;
-
     public function __construct(PoolFactory $factory, string $pool)
     {
         parent::__construct($factory);

tests/Stub/ContainerStub.php

@@ -63,6 +63,11 @@ public static function mockContainer()
             $factory = new PoolFactory($container);
             return new Redis($factory);
         });
+        $container->shouldReceive('has')->with(Redis::class)->andReturn(true);
+        $container->shouldReceive('get')->with(Redis::class)->andReturnUsing(function () use ($container) {
+            $factory = new PoolFactory($container);
+            return new Redis($factory);
+        });
         $container->shouldReceive('has')->with(StdoutLoggerInterface::class)->andReturn(true);
         $container->shouldReceive('get')->with(StdoutLoggerInterface::class)->andReturn(value(function () {
             return Mockery::mock(StdoutLoggerInterface::class);

tests/Stub/HGetAllMultipleStub.php

@@ -15,5 +15,5 @@
 
 class HGetAllMultipleStub extends HGetAllMultiple
 {
-    protected $sha = 'xxxx';
+    protected ?string $sha = 'xxxx';
 }