Prevent attempting to close an uninitialized Redis instance (issue #13001)

Benjamin Stout · Benjamin Stout · commit 0cc3509b74b5 · 2019-02-19T18:21:44.000-08:00
diff --git a/lib/Cake/Cache/Engine/RedisEngine.php b/lib/Cake/Cache/Engine/RedisEngine.php
@@ -228,7 +228,7 @@ public function clearGroup($group) {
  * Disconnects from the redis server
  */
 	public function __destruct() {
-		if (empty($this->settings['persistent'])) {
+		if (empty($this->settings['persistent']) && !is_null($this->_Redis)) {
 			$this->_Redis->close();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public function clearGroup($group) {`
`228`	`228`	`* Disconnects from the redis server`
`229`	`229`	`*/`
`230`	`230`	`public function __destruct() {`
`231`		`- if (empty($this->settings['persistent'])) {`
	`231`	`+ if (empty($this->settings['persistent']) && !is_null($this->_Redis)) {`
`232`	`232`	`$this->_Redis->close();`
`233`	`233`	`}`
`234`	`234`	`}`