Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Coding standard and readability
  • Loading branch information
wa0x6e committed Aug 27, 2013
1 parent bdd00c2 commit 244df07
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 24 deletions.
50 changes: 28 additions & 22 deletions lib/Cake/Cache/Engine/MemcachedEngine.php
Expand Up @@ -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')) {
Expand All @@ -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;
Expand Down Expand Up @@ -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++;
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
Expand Up @@ -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);
}

Expand Down

0 comments on commit 244df07

Please sign in to comment.