From ab1ec42989ff514488747c64bc625cb2c0fe5035 Mon Sep 17 00:00:00 2001 From: Ryan Brereton-Canham <9389421+ryzr@users.noreply.github.com> Date: Wed, 26 Aug 2020 12:19:04 +0930 Subject: [PATCH] fix: only prepend scheme to host when necessary In cases where $options['scheme'] is set, but $options['host'] already has the scheme prepended, the resulting host will be scheme://scheme://host --- src/Illuminate/Redis/Connectors/PhpRedisConnector.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Redis/Connectors/PhpRedisConnector.php b/src/Illuminate/Redis/Connectors/PhpRedisConnector.php index 5942d7121cb1..b01f114205d8 100644 --- a/src/Illuminate/Redis/Connectors/PhpRedisConnector.php +++ b/src/Illuminate/Redis/Connectors/PhpRedisConnector.php @@ -7,6 +7,7 @@ use Illuminate\Redis\Connections\PhpRedisConnection; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Redis as RedisFacade; +use Illuminate\Support\Str; use LogicException; use Redis; use RedisCluster; @@ -175,7 +176,7 @@ protected function createRedisClusterInstance(array $servers, array $options) protected function formatHost(array $options) { if (isset($options['scheme'])) { - return "{$options['scheme']}://{$options['host']}"; + return Str::start($options['host'], "{$options['scheme']}://"); } return $options['host'];