From 244df0764fe6475bf416a919ccc58baecb7475f6 Mon Sep 17 00:00:00 2001
From: Kamisama <kami@kamisama.me>
Date: Tue, 27 Aug 2013 14:22:45 -0400
Subject: [PATCH] Coding standard and readability

---
 lib/Cake/Cache/Engine/MemcachedEngine.php     | 50 +++++++++++--------
 .../Case/Cache/Engine/MemcachedEngineTest.php |  4 +-
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/Cake/Cache/Engine/MemcachedEngine.php b/lib/Cake/Cache/Engine/MemcachedEngine.php
index 6b5dd738f40..3538becb32f 100755
--- a/lib/Cake/Cache/Engine/MemcachedEngine.php
+++ b/lib/Cake/Cache/Engine/MemcachedEngine.php
@@ -59,6 +59,7 @@ class MemcachedEngine extends CacheEngine {
  *
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
+ * @throws CacheException when you try use authentication without Memcached compiled with SASL support
  */
 	public function init($settings = array()) {
 		if (!class_exists('Memcached')) {
@@ -81,29 +82,34 @@ public function init($settings = array()) {
 		if (!is_array($this->settings['servers'])) {
 			$this->settings['servers'] = array($this->settings['servers']);
 		}
-		if (!isset($this->_Memcached)) {
-			$this->_Memcached = new Memcached($this->settings['persistent'] ? $this->settings['persistent_id'] : null);
-			$this->_setOptions();
-
-			if (!count($this->_Memcached->getServerList())) {
-				$servers = array();
-				foreach ($this->settings['servers'] as $server) {
-					$servers[] = $this->_parseServerString($server);
-				}
 
-				if (!$this->_Memcached->addServers($servers)) {
-					return false;
-				}
+		if (isset($this->_Memcached)) {
+			return true;
+		}
 
-				if ($this->settings['login'] !== null && $this->settings['password'] !== null) {
-					if (!method_exists($this->_Memcached, 'setSaslAuthData')) {
-						throw new CacheException(
-							__d('cake_dev', 'Memcached extension is not build with SASL support')
-						);
-					}
-					$this->_Memcached->setSaslAuthData($this->settings['login'], $this->settings['password']);
-				}
+		$this->_Memcached = new Memcached($this->settings['persistent'] ? $this->settings['persistent_id'] : null);
+		$this->_setOptions();
+
+		if (count($this->_Memcached->getServerList())) {
+			return true;
+		}
+
+		$servers = array();
+		foreach ($this->settings['servers'] as $server) {
+			$servers[] = $this->_parseServerString($server);
+		}
+
+		if (!$this->_Memcached->addServers($servers)) {
+			return false;
+		}
+
+		if ($this->settings['login'] !== null && $this->settings['password'] !== null) {
+			if (!method_exists($this->_Memcached, 'setSaslAuthData')) {
+				throw new CacheException(
+					__d('cake_dev', 'Memcached extension is not build with SASL support')
+				);
 			}
+			$this->_Memcached->setSaslAuthData($this->settings['login'], $this->settings['password']);
 		}
 
 		return true;
@@ -136,10 +142,10 @@ protected function _setOptions() {
  * @return array Array containing host, port
  */
 	protected function _parseServerString($server) {
-		if ($server[0] == 'u') {
+		if ($server[0] === 'u') {
 			return array($server, 0);
 		}
-		if (substr($server, 0, 1) == '[') {
+		if (substr($server, 0, 1) === '[') {
 			$position = strpos($server, ']:');
 			if ($position !== false) {
 				$position++;
diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
index 73741dabc97..cc8b614958d 100755
--- a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
+++ b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
@@ -155,8 +155,8 @@ public function testSaslAuthException() {
 		);
 
 		$this->setExpectedException(
-        	'CacheException', 'Memcached extension is not build with SASL support'
-        );
+			'CacheException', 'Memcached extension is not build with SASL support'
+		);
 		$Memcached->init($settings);
 	}