Merge branch 'master' into 3.1-merge

Author: limingxinleo

publish/redis.php

@@ -42,5 +42,8 @@
             'heartbeat' => -1,
             'max_idle_time' => (float) env('REDIS_MAX_IDLE_TIME', 60),
         ],
+        'options' => [
+            'prefix' => env('REDIS_PREFIX', ''),
+        ],
     ],
 ];

src/RedisConnection.php

@@ -120,7 +120,20 @@ public function reconnect(): bool
         $options = $this->config['options'] ?? [];
 
         foreach ($options as $name => $value) {
-            // The name is int, value is string.
+            if (is_string($name)) {
+                $name = match (strtolower($name)) {
+                    'serializer' => Redis::OPT_SERIALIZER, // 1
+                    'prefix' => Redis::OPT_PREFIX, // 2
+                    'read_timeout' => Redis::OPT_READ_TIMEOUT, // 3
+                    'scan' => Redis::OPT_SCAN, // 4
+                    'failover' => defined(Redis::class . '::OPT_SLAVE_FAILOVER') ? Redis::OPT_SLAVE_FAILOVER : 5, // 5
+                    'keepalive' => Redis::OPT_TCP_KEEPALIVE, // 6
+                    'compression' => Redis::OPT_COMPRESSION, // 7
+                    'reply_literal' => Redis::OPT_REPLY_LITERAL, // 8
+                    'compression_level' => Redis::OPT_COMPRESSION_LEVEL, // 9
+                    default => $name,
+                };
+            }
             $redis->setOption($name, $value);
         }