Merge branch 'master' into master

Geolim4 · web-flow · commit 06dc84376917 · 2020-04-24T22:17:44.000Z
diff --git a/lib/Phpfastcache/Drivers/Redis/Driver.php b/lib/Phpfastcache/Drivers/Redis/Driver.php
@@ -107,10 +107,8 @@ protected function driverConnect(): bool
             $this->instance->setOption(RedisClient::OPT_PREFIX, $this->getConfig()->getOptPrefix());
         }
 
-        if (!$this->getConfig()->getPath()) {
-            if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {
-                return false;
-            }
+        if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {
+            return false;
         }
 
         if ($this->getConfig()->getDatabase() !== null) {

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,8 @@ protected function driverConnect(): bool`
`107`	`107`	`$this->instance->setOption(RedisClient::OPT_PREFIX, $this->getConfig()->getOptPrefix());`
`108`	`108`	`}`
`109`	`109`
`110`		`- if (!$this->getConfig()->getPath()) {`
`111`		`- if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {`
`112`		`- return false;`
`113`		`- }`
	`110`	`+ if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {`
	`111`	`+ return false;`
`114`	`112`	`}`
`115`	`113`
`116`	`114`	`if ($this->getConfig()->getDatabase() !== null) {`