From fe7cfe6c86e654f62a551763f3c7878a2babbafc Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Fri, 24 Jan 2020 03:19:51 +0800
Subject: [PATCH] Refactor RedisClientProvider #299

---
 src/Service/RedisClientProvider.php | 43 +++++++++++++++++------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/Service/RedisClientProvider.php b/src/Service/RedisClientProvider.php
index 04ac1f80..2572370e 100644
--- a/src/Service/RedisClientProvider.php
+++ b/src/Service/RedisClientProvider.php
@@ -11,34 +11,41 @@ class RedisClientProvider
     protected $host;
     protected $port;
     protected $password;
-    protected $env_flag;
 
-    public function __construct($scheme, $host, $port, $password, $env_flag)
+    public function __construct($scheme, $host, $port, $password)
     {
         $this->scheme = $scheme;
         $this->host = $host;
         $this->port = $port;
         $this->password = $password;
-        $this->env_flag = $env_flag;
+
+        $this->connect();
+    }
+
+    protected function connect()
+    {
+        // if password is specified attempt connection
+        if (strlen($this->password) > 0)
+        {
+            $this->redis = new PredisClient([
+                "scheme" => $this->scheme,
+                "host" => $this->host,
+                "port" => $this->port,
+                "password" => $this->password]);
+
+            return $this->redis;
+        }
+
+        $this->redis = new PredisClient([
+            "scheme" => $this->scheme,
+            "host" => $this->host, 
+            "port" => $this->port]);
+
+        return $this->redis;
     }
 
     public function getRedisClient()
     {
-        if ($this->env_flag == 'dev')
-        {
-            $this->redis = new PredisClient([
-                                "scheme"=>$this->scheme,
-                                "host"=>$this->host, 
-                                "port"=>$this->port]);
-        }
-        else
-        {
-            $this->redis = new PredisClient([
-                                "scheme"=>$this->scheme,
-                                "host"=>$this->host,
-                                "port"=>$this->port,
-                                "password"=>$this->password]);
-        }
         return $this->redis;
     }
 }