[8.x] Redis: allow to pass connection name (#35402)

* Redis: allow to pass connection name * Fix style Co-authored-by: Kevin Anidjar <kevin.anidjar@total.com>
laravel · Nov 29, 2020 · d12b613 · d12b613
1 parent f33d3e5
commit d12b613
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php
@@ -57,6 +57,7 @@ public function setUpRedis()
                     'port' => $port,
                     'database' => 5,
                     'timeout' => 0.5,
+                    'name' => 'default',
                 ],
             ]);
         }

diff --git a/src/Illuminate/Redis/Connectors/PhpRedisConnector.php b/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
@@ -102,6 +102,10 @@ protected function createClient(array $config)
             if (! empty($config['scan'])) {
                 $client->setOption(Redis::OPT_SCAN, $config['scan']);
             }
+
+            if (! empty($config['name'])) {
+                $client->client('SETNAME', $config['name']);
+            }
         });
     }
 
@@ -176,6 +180,10 @@ protected function createRedisClusterInstance(array $servers, array $options)
             if (! empty($options['failover'])) {
                 $client->setOption(RedisCluster::OPT_SLAVE_FAILOVER, $options['failover']);
             }
+
+            if (! empty($options['name'])) {
+                $client->client('SETNAME', $options['name']);
+            }
         });
     }
 

diff --git a/tests/Redis/RedisConnectorTest.php b/tests/Redis/RedisConnectorTest.php
@@ -41,6 +41,7 @@ public function testDefaultConfiguration()
         $phpRedisClient = $this->redis['phpredis']->connection()->client();
         $this->assertEquals($host, $phpRedisClient->getHost());
         $this->assertEquals($port, $phpRedisClient->getPort());
+        $this->assertEquals('default', $phpRedisClient->client('GETNAME'));
     }
 
     public function testUrl()