From 918db609866061fe421c1d124ab98cec535ea278 Mon Sep 17 00:00:00 2001
From: SPie <d.schobert@ixolit.com>
Date: Wed, 17 Feb 2021 17:24:09 +0100
Subject: [PATCH] Removed filter on username for redis configuration parameter.
 (#36299)

---
 src/Illuminate/Redis/RedisManager.php |  2 +-
 tests/Redis/RedisConnectorTest.php    | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Redis/RedisManager.php b/src/Illuminate/Redis/RedisManager.php
index 3dd4ec73e34f..3d01818da2ae 100644
--- a/src/Illuminate/Redis/RedisManager.php
+++ b/src/Illuminate/Redis/RedisManager.php
@@ -192,7 +192,7 @@ protected function parseConnectionConfiguration($config)
         }
 
         return array_filter($parsed, function ($key) {
-            return ! in_array($key, ['driver', 'username'], true);
+            return ! in_array($key, ['driver'], true);
         }, ARRAY_FILTER_USE_KEY);
     }
 
diff --git a/tests/Redis/RedisConnectorTest.php b/tests/Redis/RedisConnectorTest.php
index ff5f93470e8d..965ef46eb69a 100644
--- a/tests/Redis/RedisConnectorTest.php
+++ b/tests/Redis/RedisConnectorTest.php
@@ -161,4 +161,27 @@ public function testScheme()
         $this->assertSame("tcp://{$host}", $phpRedisClient->getHost());
         $this->assertEquals($port, $phpRedisClient->getPort());
     }
+
+    public function testPredisConfigurationWithUsername()
+    {
+        $host = env('REDIS_HOST', '127.0.0.1');
+        $port = env('REDIS_PORT', 6379);
+        $username = 'testuser';
+        $password = 'testpw';
+
+        $predis = new RedisManager(new Application, 'predis', [
+            'default' => [
+                'host' => $host,
+                'port' => $port,
+                'username' => $username,
+                'password' => $password,
+                'database' => 5,
+                'timeout' => 0.5,
+            ],
+        ]);
+        $predisClient = $predis->connection()->client();
+        $parameters = $predisClient->getConnection()->getParameters();
+        $this->assertEquals($username, $parameters->username);
+        $this->assertEquals($password, $parameters->password);
+    }
 }