PHPSocialNetwork / phpfastcache

src/phpFastCache/_extensions/predis-1.0/examples/debuggable_connection.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
         parent::connect();
     }
 
+    /**
+     * @param string $direction
+     */
     private function storeDebug(CommandInterface $command, $direction)
     {
         $firtsArg = $command->getArgument(0);

src/phpFastCache/_extensions/predis-1.0/src/Client.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
     /**
      * @param mixed $parameters Connection parameters for one or more servers.
-     * @param mixed $options    Options to configure some behaviours of the client.
+     * @param OptionsInterface $options    Options to configure some behaviours of the client.
      */
     public function __construct($parameters = null, $options = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
      */
     protected function getConnectionInitializerWrapper($callable)
     {
-        return function () use ($callable) {
+        return function() use ($callable) {
             $connection = call_user_func_array($callable, func_get_args());
 
             if (!$connection instanceof ConnectionInterface) {

src/phpFastCache/_extensions/predis-1.0/src/Cluster/ClusterStrategy.php

Doc Comments +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
     /**
      * Returns the list of IDs for the supported commands.
      *
-     * @return array
+     * @return string[]
      */
     public function getSupportedCommands()
     {

src/phpFastCache/_extensions/predis-1.0/src/Command/PubSubPubsub.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     /**
      * Returns the processed response to PUBSUB NUMSUB.
      *
-     * @param array $channels List of channels
+     * @param string $channels List of channels
      *
      * @return array
      */

src/phpFastCache/_extensions/predis-1.0/src/Command/ServerSentinel.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     /**
      * Returns a processed response to SENTINEL MASTERS or SENTINEL SLAVES.
      *
-     * @param array $servers List of Redis servers.
+     * @param string $servers List of Redis servers.
      *
      * @return array
      */

src/phpFastCache/_extensions/predis-1.0/src/PubSub/AbstractConsumer.php

Doc Comments +1 added lines

@@ -59,6 +59,7 @@
      * Subscribes to the specified channels.
      *
      * @param mixed $channel,... One or more channel names.
+     * @param string $channel
      */
     public function subscribe($channel /*, ... */)
     {

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
     const PMESSAGE     = 'pmessage';
     const PONG         = 'pong';
 
-    const STATUS_VALID       = 1;	// 0b0001
-    const STATUS_SUBSCRIBED  = 2;	// 0b0010
-    const STATUS_PSUBSCRIBED = 4;	// 0b0100
+    const STATUS_VALID       = 1; // 0b0001
+    const STATUS_SUBSCRIBED  = 2; // 0b0010
+    const STATUS_PSUBSCRIBED = 4; // 0b0100
 
     private $position = null;
     private $statusFlags = self::STATUS_VALID;
@@ -208,7 +208,7 @@ 
      */
     protected function invalidate()
     {
-        $this->statusFlags = 0;	// 0b0000;
+        $this->statusFlags = 0; // 0b0000;
     }
 
     /**

src/phpFastCache/_extensions/SSDB.php

Doc Comments +7 added lines

@@ -19,6 +19,9 @@ 
  */
 class SimpleSSDB extends SSDB
 {
+	/**
+	 * @param integer $port
+	 */
 	function __construct($host, $port, $timeout_ms=2000){
 		parent::__construct($host, $port, $timeout_ms);
 		$this->easy();
@@ -174,6 +177,10 @@ 
 		$resp = $this->check_easy_resp($cmd, $resp);
 		return $resp;
 	}
+
+	/**
+	 * @param SSDB_Response $resp
+	 */
 	private function check_easy_resp($cmd, $resp){
 		$this->last_resp = $resp;
 		if($this->_easy){

Indentation +541 added lines, -541 removed lines

@@ -19,558 +19,558 @@
  */
 class SimpleSSDB extends SSDB
 {
-	function __construct($host, $port, $timeout_ms=2000){
-		parent::__construct($host, $port, $timeout_ms);
-		$this->easy();
-	}
+    function __construct($host, $port, $timeout_ms=2000){
+        parent::__construct($host, $port, $timeout_ms);
+        $this->easy();
+    }
 }
 class SSDB_Response
 {
-	public $cmd;
-	public $code;
-	public $data = null;
-	public $message;
-	function __construct($code='ok', $data_or_message=null){
-		$this->code = $code;
-		if($code == 'ok'){
-			$this->data = $data_or_message;
-		}else{
-			$this->message = $data_or_message;
-		}
-	}
-	function __toString(){
-		if($this->code == 'ok'){
-			$s = $this->data === null? '' : json_encode($this->data);
-		}else{
-			$s = $this->message;
-		}
-		return sprintf('%-13s %12s %s', $this->cmd, $this->code, $s);
-	}
-	function ok(){
-		return $this->code == 'ok';
-	}
-	function not_found(){
-		return $this->code == 'not_found';
-	}
+    public $cmd;
+    public $code;
+    public $data = null;
+    public $message;
+    function __construct($code='ok', $data_or_message=null){
+        $this->code = $code;
+        if($code == 'ok'){
+            $this->data = $data_or_message;
+        }else{
+            $this->message = $data_or_message;
+        }
+    }
+    function __toString(){
+        if($this->code == 'ok'){
+            $s = $this->data === null? '' : json_encode($this->data);
+        }else{
+            $s = $this->message;
+        }
+        return sprintf('%-13s %12s %s', $this->cmd, $this->code, $s);
+    }
+    function ok(){
+        return $this->code == 'ok';
+    }
+    function not_found(){
+        return $this->code == 'not_found';
+    }
 }
 class SSDB
 {
-	private $debug = false;
-	public $sock = null;
-	private $_closed = false;
-	private $recv_buf = '';
-	private $_easy = false;
-	public $last_resp = null;
-	function __construct($host, $port, $timeout_ms=2000){
-		$timeout_f = (float)$timeout_ms/1000;
-		$this->sock = @stream_socket_client("$host:$port", $errno, $errstr, $timeout_f);
-		if(!$this->sock){
-			throw new SSDBException("$errno: $errstr");
-		}
-		$timeout_sec = intval($timeout_ms/1000);
-		$timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
-		@stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
-		if(function_exists('stream_set_chunk_size')){
-			@stream_set_chunk_size($this->sock, 1024 * 1024);
-		}
-	}
+    private $debug = false;
+    public $sock = null;
+    private $_closed = false;
+    private $recv_buf = '';
+    private $_easy = false;
+    public $last_resp = null;
+    function __construct($host, $port, $timeout_ms=2000){
+        $timeout_f = (float)$timeout_ms/1000;
+        $this->sock = @stream_socket_client("$host:$port", $errno, $errstr, $timeout_f);
+        if(!$this->sock){
+            throw new SSDBException("$errno: $errstr");
+        }
+        $timeout_sec = intval($timeout_ms/1000);
+        $timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
+        @stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
+        if(function_exists('stream_set_chunk_size')){
+            @stream_set_chunk_size($this->sock, 1024 * 1024);
+        }
+    }
 	
-	function set_timeout($timeout_ms){
-		$timeout_sec = intval($timeout_ms/1000);
-		$timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
-		@stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
-	}
+    function set_timeout($timeout_ms){
+        $timeout_sec = intval($timeout_ms/1000);
+        $timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
+        @stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
+    }
 	
-	/**
-	 * After this method invoked with yesno=true, all requesting methods
-	 * will not return a SSDB_Response object.
-	 * And some certain methods like get/zget will return false
-	 * when response is not ok(not_found, etc)
-	 */
-	function easy(){
-		$this->_easy = true;
-	}
-	function close(){
-		if(!$this->_closed){
-			@fclose($this->sock);
-			$this->_closed = true;
-			$this->sock = null;
-		}
-	}
-	function closed(){
-		return $this->_closed;
-	}
-	private $batch_mode = false;
-	private $batch_cmds = array();
-	function batch(){
-		$this->batch_mode = true;
-		$this->batch_cmds = array();
-		return $this;
-	}
-	function multi(){
-		return $this->batch();
-	}
-	function exec(){
-		$ret = array();
-		foreach($this->batch_cmds as $op){
-			list($cmd, $params) = $op;
-			$this->send_req($cmd, $params);
-		}
-		foreach($this->batch_cmds as $op){
-			list($cmd, $params) = $op;
-			$resp = $this->recv_resp($cmd, $params);
-			$resp = $this->check_easy_resp($cmd, $resp);
-			$ret[] = $resp;
-		}
-		$this->batch_mode = false;
-		$this->batch_cmds = array();
-		return $ret;
-	}
+    /**
+     * After this method invoked with yesno=true, all requesting methods
+     * will not return a SSDB_Response object.
+     * And some certain methods like get/zget will return false
+     * when response is not ok(not_found, etc)
+     */
+    function easy(){
+        $this->_easy = true;
+    }
+    function close(){
+        if(!$this->_closed){
+            @fclose($this->sock);
+            $this->_closed = true;
+            $this->sock = null;
+        }
+    }
+    function closed(){
+        return $this->_closed;
+    }
+    private $batch_mode = false;
+    private $batch_cmds = array();
+    function batch(){
+        $this->batch_mode = true;
+        $this->batch_cmds = array();
+        return $this;
+    }
+    function multi(){
+        return $this->batch();
+    }
+    function exec(){
+        $ret = array();
+        foreach($this->batch_cmds as $op){
+            list($cmd, $params) = $op;
+            $this->send_req($cmd, $params);
+        }
+        foreach($this->batch_cmds as $op){
+            list($cmd, $params) = $op;
+            $resp = $this->recv_resp($cmd, $params);
+            $resp = $this->check_easy_resp($cmd, $resp);
+            $ret[] = $resp;
+        }
+        $this->batch_mode = false;
+        $this->batch_cmds = array();
+        return $ret;
+    }
 	
-	function request(){
-		$args = func_get_args();
-		$cmd = array_shift($args);
-		return $this->__call($cmd, $args);
-	}
+    function request(){
+        $args = func_get_args();
+        $cmd = array_shift($args);
+        return $this->__call($cmd, $args);
+    }
 	
-	private $async_auth_password = null;
+    private $async_auth_password = null;
 	
-	function auth($password){
-		$this->async_auth_password = $password;
-		return null;
-	}
-	function __call($cmd, $params=array()){
-		$cmd = strtolower($cmd);
-		if($this->async_auth_password !== null){
-			$pass = $this->async_auth_password;
-			$this->async_auth_password = null;
-			$auth = $this->__call('auth', array($pass));
-			if($auth !== true){
-				throw new Exception("Authentication failed");
-			}
-		}
-		if($this->batch_mode){
-			$this->batch_cmds[] = array($cmd, $params);
-			return $this;
-		}
-		try{
-			if($this->send_req($cmd, $params) === false){
-				$resp = new SSDB_Response('error', 'send error');
-			}else{
-				$resp = $this->recv_resp($cmd, $params);
-			}
-		}catch(SSDBException $e){
-			if($this->_easy){
-				throw $e;
-			}else{
-				$resp = new SSDB_Response('error', $e->getMessage());
-			}
-		}
-		if($resp->code == 'noauth'){
-			$msg = $resp->message;
-			throw new Exception($msg);
-		}
+    function auth($password){
+        $this->async_auth_password = $password;
+        return null;
+    }
+    function __call($cmd, $params=array()){
+        $cmd = strtolower($cmd);
+        if($this->async_auth_password !== null){
+            $pass = $this->async_auth_password;
+            $this->async_auth_password = null;
+            $auth = $this->__call('auth', array($pass));
+            if($auth !== true){
+                throw new Exception("Authentication failed");
+            }
+        }
+        if($this->batch_mode){
+            $this->batch_cmds[] = array($cmd, $params);
+            return $this;
+        }
+        try{
+            if($this->send_req($cmd, $params) === false){
+                $resp = new SSDB_Response('error', 'send error');
+            }else{
+                $resp = $this->recv_resp($cmd, $params);
+            }
+        }catch(SSDBException $e){
+            if($this->_easy){
+                throw $e;
+            }else{
+                $resp = new SSDB_Response('error', $e->getMessage());
+            }
+        }
+        if($resp->code == 'noauth'){
+            $msg = $resp->message;
+            throw new Exception($msg);
+        }
 		
-		$resp = $this->check_easy_resp($cmd, $resp);
-		return $resp;
-	}
-	private function check_easy_resp($cmd, $resp){
-		$this->last_resp = $resp;
-		if($this->_easy){
-			if($resp->not_found()){
-				return NULL;
-			}else if(!$resp->ok() && !is_array($resp->data)){
-				return false;
-			}else{
-				return $resp->data;
-			}
-		}else{
-			$resp->cmd = $cmd;
-			return $resp;
-		}
-	}
-	function multi_set($kvs=array()){
-		$args = array();
-		foreach($kvs as $k=>$v){
-			$args[] = $k;
-			$args[] = $v;
-		}
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function multi_hset($name, $kvs=array()){
-		$args = array($name);
-		foreach($kvs as $k=>$v){
-			$args[] = $k;
-			$args[] = $v;
-		}
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function multi_zset($name, $kvs=array()){
-		$args = array($name);
-		foreach($kvs as $k=>$v){
-			$args[] = $k;
-			$args[] = $v;
-		}
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function incr($key, $val=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function decr($key, $val=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function zincr($name, $key, $score=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function zdecr($name, $key, $score=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function zadd($key, $score, $value){
-		$args = array($key, $value, $score);
-		return $this->__call('zset', $args);
-	}
-	function zRevRank($name, $key){
-		$args = func_get_args();
-		return $this->__call("zrrank", $args);
-	}
-	function zRevRange($name, $offset, $limit){
-		$args = func_get_args();
-		return $this->__call("zrrange", $args);
-	}
-	function hincr($name, $key, $val=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	function hdecr($name, $key, $val=1){
-		$args = func_get_args();
-		return $this->__call(__FUNCTION__, $args);
-	}
-	private function send_req($cmd, $params){
-		$req = array($cmd);
-		foreach($params as $p){
-			if(is_array($p)){
-				$req = array_merge($req, $p);
-			}else{
-				$req[] = $p;
-			}
-		}
-		return $this->send($req);
-	}
-	private function recv_resp($cmd, $params){
-		$resp = $this->recv();
-		if($resp === false){
-			return new SSDB_Response('error', 'Unknown error');
-		}else if(!$resp){
-			return new SSDB_Response('disconnected', 'Connection closed');
-		}
-		if($resp[0] == 'noauth'){
-			$errmsg = isset($resp[1])? $resp[1] : '';
-			return new SSDB_Response($resp[0], $errmsg);
-		}
-		switch($cmd){
-			case 'dbsize':
-			case 'ping':
-			case 'qset':
-			case 'getbit':
-			case 'setbit':
-			case 'countbit':
-			case 'strlen':
-			case 'set':
-			case 'setx':
-			case 'setnx':
-			case 'zset':
-			case 'hset':
-			case 'qpush':
-			case 'qpush_front':
-			case 'qpush_back':
-			case 'qtrim_front':
-			case 'qtrim_back':
-			case 'del':
-			case 'zdel':
-			case 'hdel':
-			case 'hsize':
-			case 'zsize':
-			case 'qsize':
-			case 'hclear':
-			case 'zclear':
-			case 'qclear':
-			case 'multi_set':
-			case 'multi_del':
-			case 'multi_hset':
-			case 'multi_hdel':
-			case 'multi_zset':
-			case 'multi_zdel':
-			case 'incr':
-			case 'decr':
-			case 'zincr':
-			case 'zdecr':
-			case 'hincr':
-			case 'hdecr':
-			case 'zget':
-			case 'zrank':
-			case 'zrrank':
-			case 'zcount':
-			case 'zsum':
-			case 'zremrangebyrank':
-			case 'zremrangebyscore':
-			case 'ttl':
-			case 'expire':
-				if($resp[0] == 'ok'){
-					$val = isset($resp[1])? intval($resp[1]) : 0;
-					return new SSDB_Response($resp[0], $val);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-			case 'zavg':
-				if($resp[0] == 'ok'){
-					$val = isset($resp[1])? floatval($resp[1]) : (float)0;
-					return new SSDB_Response($resp[0], $val);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-			case 'get':
-			case 'substr':
-			case 'getset':
-			case 'hget':
-			case 'qget':
-			case 'qfront':
-			case 'qback':
-				if($resp[0] == 'ok'){
-					if(count($resp) == 2){
-						return new SSDB_Response('ok', $resp[1]);
-					}else{
-						return new SSDB_Response('server_error', 'Invalid response');
-					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-				break;
-			case 'qpop':
-			case 'qpop_front':
-			case 'qpop_back':
-				if($resp[0] == 'ok'){
-					$size = 1;
-					if(isset($params[1])){
-						$size = intval($params[1]);
-					}
-					if($size <= 1){
-						if(count($resp) == 2){
-							return new SSDB_Response('ok', $resp[1]);
-						}else{
-							return new SSDB_Response('server_error', 'Invalid response');
-						}
-					}else{
-						$data = array_slice($resp, 1);
-						return new SSDB_Response('ok', $data);
-					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-				break;
-			case 'keys':
-			case 'zkeys':
-			case 'hkeys':
-			case 'hlist':
-			case 'zlist':
-			case 'qslice':
-				if($resp[0] == 'ok'){
-					$data = array();
-					if($resp[0] == 'ok'){
-						$data = array_slice($resp, 1);
-					}
-					return new SSDB_Response($resp[0], $data);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-			case 'auth':
-			case 'exists':
-			case 'hexists':
-			case 'zexists':
-				if($resp[0] == 'ok'){
-					if(count($resp) == 2){
-						return new SSDB_Response('ok', (bool)$resp[1]);
-					}else{
-						return new SSDB_Response('server_error', 'Invalid response');
-					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-				break;
-			case 'multi_exists':
-			case 'multi_hexists':
-			case 'multi_zexists':
-				if($resp[0] == 'ok'){
-					if(count($resp) % 2 == 1){
-						$data = array();
-						for($i=1; $i<count($resp); $i+=2){
-							$data[$resp[$i]] = (bool)$resp[$i + 1];
-						}
-						return new SSDB_Response('ok', $data);
-					}else{
-						return new SSDB_Response('server_error', 'Invalid response');
-					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-				break;
-			case 'scan':
-			case 'rscan':
-			case 'zscan':
-			case 'zrscan':
-			case 'zrange':
-			case 'zrrange':
-			case 'hscan':
-			case 'hrscan':
-			case 'hgetall':
-			case 'multi_hsize':
-			case 'multi_zsize':
-			case 'multi_get':
-			case 'multi_hget':
-			case 'multi_zget':
-			case 'zpop_front':
-			case 'zpop_back':
-				if($resp[0] == 'ok'){
-					if(count($resp) % 2 == 1){
-						$data = array();
-						for($i=1; $i<count($resp); $i+=2){
-							if($cmd[0] == 'z'){
-								$data[$resp[$i]] = intval($resp[$i + 1]);
-							}else{
-								$data[$resp[$i]] = $resp[$i + 1];
-							}
-						}
-						return new SSDB_Response('ok', $data);
-					}else{
-						return new SSDB_Response('server_error', 'Invalid response');
-					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
-					return new SSDB_Response($resp[0], $errmsg);
-				}
-				break;
-			default:
-				return new SSDB_Response($resp[0], array_slice($resp, 1));
-		}
-		return new SSDB_Response('error', 'Unknown command: $cmd');
-	}
-	private function send($data){
-		$ps = array();
-		foreach($data as $p){
-			$ps[] = strlen($p);
-			$ps[] = $p;
-		}
-		$s = join("\n", $ps) . "\n\n";
-		if($this->debug){
-			echo '> ' . str_replace(array("\r", "\n"), array('\r', '\n'), $s) . "\n";
-		}
-		try{
-			while(true){
-				$ret = @fwrite($this->sock, $s);
-				if($ret === false || $ret === 0){
-					$this->close();
-					throw new SSDBException('Connection lost');
-				}
-				$s = substr($s, $ret);
-				if(strlen($s) == 0){
-					break;
-				}
-				@fflush($this->sock);
-			}
-		}catch(Exception $e){
-			$this->close();
-			throw new SSDBException($e->getMessage());
-		}
-		return $ret;
-	}
-	private function recv(){
-		$this->step = self::STEP_SIZE;
-		while(true){
-			$ret = $this->parse();
-			if($ret === null){
-				try{
-					$data = @fread($this->sock, 1024 * 1024);
-					if($this->debug){
-						echo '< ' . str_replace(array("\r", "\n"), array('\r', '\n'), $data) . "\n";
-					}
-				}catch(Exception $e){
-					$data = '';
-				}
-				if($data === false || $data === ''){
-					if(feof($this->sock)){
-						$this->close();
-						throw new SSDBException('Connection lost');
-					}else{
-						throw new SSDBTimeoutException('Connection timeout');
-					}
-				}
-				$this->recv_buf .= $data;
+        $resp = $this->check_easy_resp($cmd, $resp);
+        return $resp;
+    }
+    private function check_easy_resp($cmd, $resp){
+        $this->last_resp = $resp;
+        if($this->_easy){
+            if($resp->not_found()){
+                return NULL;
+            }else if(!$resp->ok() && !is_array($resp->data)){
+                return false;
+            }else{
+                return $resp->data;
+            }
+        }else{
+            $resp->cmd = $cmd;
+            return $resp;
+        }
+    }
+    function multi_set($kvs=array()){
+        $args = array();
+        foreach($kvs as $k=>$v){
+            $args[] = $k;
+            $args[] = $v;
+        }
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function multi_hset($name, $kvs=array()){
+        $args = array($name);
+        foreach($kvs as $k=>$v){
+            $args[] = $k;
+            $args[] = $v;
+        }
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function multi_zset($name, $kvs=array()){
+        $args = array($name);
+        foreach($kvs as $k=>$v){
+            $args[] = $k;
+            $args[] = $v;
+        }
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function incr($key, $val=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function decr($key, $val=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function zincr($name, $key, $score=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function zdecr($name, $key, $score=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function zadd($key, $score, $value){
+        $args = array($key, $value, $score);
+        return $this->__call('zset', $args);
+    }
+    function zRevRank($name, $key){
+        $args = func_get_args();
+        return $this->__call("zrrank", $args);
+    }
+    function zRevRange($name, $offset, $limit){
+        $args = func_get_args();
+        return $this->__call("zrrange", $args);
+    }
+    function hincr($name, $key, $val=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    function hdecr($name, $key, $val=1){
+        $args = func_get_args();
+        return $this->__call(__FUNCTION__, $args);
+    }
+    private function send_req($cmd, $params){
+        $req = array($cmd);
+        foreach($params as $p){
+            if(is_array($p)){
+                $req = array_merge($req, $p);
+            }else{
+                $req[] = $p;
+            }
+        }
+        return $this->send($req);
+    }
+    private function recv_resp($cmd, $params){
+        $resp = $this->recv();
+        if($resp === false){
+            return new SSDB_Response('error', 'Unknown error');
+        }else if(!$resp){
+            return new SSDB_Response('disconnected', 'Connection closed');
+        }
+        if($resp[0] == 'noauth'){
+            $errmsg = isset($resp[1])? $resp[1] : '';
+            return new SSDB_Response($resp[0], $errmsg);
+        }
+        switch($cmd){
+            case 'dbsize':
+            case 'ping':
+            case 'qset':
+            case 'getbit':
+            case 'setbit':
+            case 'countbit':
+            case 'strlen':
+            case 'set':
+            case 'setx':
+            case 'setnx':
+            case 'zset':
+            case 'hset':
+            case 'qpush':
+            case 'qpush_front':
+            case 'qpush_back':
+            case 'qtrim_front':
+            case 'qtrim_back':
+            case 'del':
+            case 'zdel':
+            case 'hdel':
+            case 'hsize':
+            case 'zsize':
+            case 'qsize':
+            case 'hclear':
+            case 'zclear':
+            case 'qclear':
+            case 'multi_set':
+            case 'multi_del':
+            case 'multi_hset':
+            case 'multi_hdel':
+            case 'multi_zset':
+            case 'multi_zdel':
+            case 'incr':
+            case 'decr':
+            case 'zincr':
+            case 'zdecr':
+            case 'hincr':
+            case 'hdecr':
+            case 'zget':
+            case 'zrank':
+            case 'zrrank':
+            case 'zcount':
+            case 'zsum':
+            case 'zremrangebyrank':
+            case 'zremrangebyscore':
+            case 'ttl':
+            case 'expire':
+                if($resp[0] == 'ok'){
+                    $val = isset($resp[1])? intval($resp[1]) : 0;
+                    return new SSDB_Response($resp[0], $val);
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+            case 'zavg':
+                if($resp[0] == 'ok'){
+                    $val = isset($resp[1])? floatval($resp[1]) : (float)0;
+                    return new SSDB_Response($resp[0], $val);
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+            case 'get':
+            case 'substr':
+            case 'getset':
+            case 'hget':
+            case 'qget':
+            case 'qfront':
+            case 'qback':
+                if($resp[0] == 'ok'){
+                    if(count($resp) == 2){
+                        return new SSDB_Response('ok', $resp[1]);
+                    }else{
+                        return new SSDB_Response('server_error', 'Invalid response');
+                    }
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+                break;
+            case 'qpop':
+            case 'qpop_front':
+            case 'qpop_back':
+                if($resp[0] == 'ok'){
+                    $size = 1;
+                    if(isset($params[1])){
+                        $size = intval($params[1]);
+                    }
+                    if($size <= 1){
+                        if(count($resp) == 2){
+                            return new SSDB_Response('ok', $resp[1]);
+                        }else{
+                            return new SSDB_Response('server_error', 'Invalid response');
+                        }
+                    }else{
+                        $data = array_slice($resp, 1);
+                        return new SSDB_Response('ok', $data);
+                    }
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+                break;
+            case 'keys':
+            case 'zkeys':
+            case 'hkeys':
+            case 'hlist':
+            case 'zlist':
+            case 'qslice':
+                if($resp[0] == 'ok'){
+                    $data = array();
+                    if($resp[0] == 'ok'){
+                        $data = array_slice($resp, 1);
+                    }
+                    return new SSDB_Response($resp[0], $data);
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+            case 'auth':
+            case 'exists':
+            case 'hexists':
+            case 'zexists':
+                if($resp[0] == 'ok'){
+                    if(count($resp) == 2){
+                        return new SSDB_Response('ok', (bool)$resp[1]);
+                    }else{
+                        return new SSDB_Response('server_error', 'Invalid response');
+                    }
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+                break;
+            case 'multi_exists':
+            case 'multi_hexists':
+            case 'multi_zexists':
+                if($resp[0] == 'ok'){
+                    if(count($resp) % 2 == 1){
+                        $data = array();
+                        for($i=1; $i<count($resp); $i+=2){
+                            $data[$resp[$i]] = (bool)$resp[$i + 1];
+                        }
+                        return new SSDB_Response('ok', $data);
+                    }else{
+                        return new SSDB_Response('server_error', 'Invalid response');
+                    }
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+                break;
+            case 'scan':
+            case 'rscan':
+            case 'zscan':
+            case 'zrscan':
+            case 'zrange':
+            case 'zrrange':
+            case 'hscan':
+            case 'hrscan':
+            case 'hgetall':
+            case 'multi_hsize':
+            case 'multi_zsize':
+            case 'multi_get':
+            case 'multi_hget':
+            case 'multi_zget':
+            case 'zpop_front':
+            case 'zpop_back':
+                if($resp[0] == 'ok'){
+                    if(count($resp) % 2 == 1){
+                        $data = array();
+                        for($i=1; $i<count($resp); $i+=2){
+                            if($cmd[0] == 'z'){
+                                $data[$resp[$i]] = intval($resp[$i + 1]);
+                            }else{
+                                $data[$resp[$i]] = $resp[$i + 1];
+                            }
+                        }
+                        return new SSDB_Response('ok', $data);
+                    }else{
+                        return new SSDB_Response('server_error', 'Invalid response');
+                    }
+                }else{
+                    $errmsg = isset($resp[1])? $resp[1] : '';
+                    return new SSDB_Response($resp[0], $errmsg);
+                }
+                break;
+            default:
+                return new SSDB_Response($resp[0], array_slice($resp, 1));
+        }
+        return new SSDB_Response('error', 'Unknown command: $cmd');
+    }
+    private function send($data){
+        $ps = array();
+        foreach($data as $p){
+            $ps[] = strlen($p);
+            $ps[] = $p;
+        }
+        $s = join("\n", $ps) . "\n\n";
+        if($this->debug){
+            echo '> ' . str_replace(array("\r", "\n"), array('\r', '\n'), $s) . "\n";
+        }
+        try{
+            while(true){
+                $ret = @fwrite($this->sock, $s);
+                if($ret === false || $ret === 0){
+                    $this->close();
+                    throw new SSDBException('Connection lost');
+                }
+                $s = substr($s, $ret);
+                if(strlen($s) == 0){
+                    break;
+                }
+                @fflush($this->sock);
+            }
+        }catch(Exception $e){
+            $this->close();
+            throw new SSDBException($e->getMessage());
+        }
+        return $ret;
+    }
+    private function recv(){
+        $this->step = self::STEP_SIZE;
+        while(true){
+            $ret = $this->parse();
+            if($ret === null){
+                try{
+                    $data = @fread($this->sock, 1024 * 1024);
+                    if($this->debug){
+                        echo '< ' . str_replace(array("\r", "\n"), array('\r', '\n'), $data) . "\n";
+                    }
+                }catch(Exception $e){
+                    $data = '';
+                }
+                if($data === false || $data === ''){
+                    if(feof($this->sock)){
+                        $this->close();
+                        throw new SSDBException('Connection lost');
+                    }else{
+                        throw new SSDBTimeoutException('Connection timeout');
+                    }
+                }
+                $this->recv_buf .= $data;
 #				echo "read " . strlen($data) . " total: " . strlen($this->recv_buf) . "\n";
-			}else{
-				return $ret;
-			}
-		}
-	}
-	const STEP_SIZE = 0;
-	const STEP_DATA = 1;
-	public $resp = array();
-	public $step;
-	public $block_size;
-	private function parse(){
-		$spos = 0;
-		$epos = 0;
-		$buf_size = strlen($this->recv_buf);
-		// performance issue for large reponse
-		//$this->recv_buf = ltrim($this->recv_buf);
-		while(true){
-			$spos = $epos;
-			if($this->step === self::STEP_SIZE){
-				$epos = strpos($this->recv_buf, "\n", $spos);
-				if($epos === false){
-					break;
-				}
-				$epos += 1;
-				$line = substr($this->recv_buf, $spos, $epos - $spos);
-				$spos = $epos;
-				$line = trim($line);
-				if(strlen($line) == 0){ // head end
-					$this->recv_buf = substr($this->recv_buf, $spos);
-					$ret = $this->resp;
-					$this->resp = array();
-					return $ret;
-				}
-				$this->block_size = intval($line);
-				$this->step = self::STEP_DATA;
-			}
-			if($this->step === self::STEP_DATA){
-				$epos = $spos + $this->block_size;
-				if($epos <= $buf_size){
-					$n = strpos($this->recv_buf, "\n", $epos);
-					if($n !== false){
-						$data = substr($this->recv_buf, $spos, $epos - $spos);
-						$this->resp[] = $data;
-						$epos = $n + 1;
-						$this->step = self::STEP_SIZE;
-						continue;
-					}
-				}
-				break;
-			}
-		}
-		// packet not ready
-		if($spos > 0){
-			$this->recv_buf = substr($this->recv_buf, $spos);
-		}
-		return null;
-	}
+            }else{
+                return $ret;
+            }
+        }
+    }
+    const STEP_SIZE = 0;
+    const STEP_DATA = 1;
+    public $resp = array();
+    public $step;
+    public $block_size;
+    private function parse(){
+        $spos = 0;
+        $epos = 0;
+        $buf_size = strlen($this->recv_buf);
+        // performance issue for large reponse
+        //$this->recv_buf = ltrim($this->recv_buf);
+        while(true){
+            $spos = $epos;
+            if($this->step === self::STEP_SIZE){
+                $epos = strpos($this->recv_buf, "\n", $spos);
+                if($epos === false){
+                    break;
+                }
+                $epos += 1;
+                $line = substr($this->recv_buf, $spos, $epos - $spos);
+                $spos = $epos;
+                $line = trim($line);
+                if(strlen($line) == 0){ // head end
+                    $this->recv_buf = substr($this->recv_buf, $spos);
+                    $ret = $this->resp;
+                    $this->resp = array();
+                    return $ret;
+                }
+                $this->block_size = intval($line);
+                $this->step = self::STEP_DATA;
+            }
+            if($this->step === self::STEP_DATA){
+                $epos = $spos + $this->block_size;
+                if($epos <= $buf_size){
+                    $n = strpos($this->recv_buf, "\n", $epos);
+                    if($n !== false){
+                        $data = substr($this->recv_buf, $spos, $epos - $spos);
+                        $this->resp[] = $data;
+                        $epos = $n + 1;
+                        $this->step = self::STEP_SIZE;
+                        continue;
+                    }
+                }
+                break;
+            }
+        }
+        // packet not ready
+        if($spos > 0){
+            $this->recv_buf = substr($this->recv_buf, $spos);
+        }
+        return null;
+    }
 }
\ No newline at end of file

Spacing +143 added lines, -143 removed lines

@@ -19,7 +19,7 @@ 
  */
 class SimpleSSDB extends SSDB
 {
-	function __construct($host, $port, $timeout_ms=2000){
+	function __construct($host, $port, $timeout_ms = 2000) {
 		parent::__construct($host, $port, $timeout_ms);
 		$this->easy();
 	}
@@ -30,26 +30,26 @@ 
 	public $code;
 	public $data = null;
 	public $message;
-	function __construct($code='ok', $data_or_message=null){
+	function __construct($code = 'ok', $data_or_message = null) {
 		$this->code = $code;
-		if($code == 'ok'){
+		if ($code == 'ok') {
 			$this->data = $data_or_message;
-		}else{
+		} else {
 			$this->message = $data_or_message;
 		}
 	}
-	function __toString(){
-		if($this->code == 'ok'){
-			$s = $this->data === null? '' : json_encode($this->data);
-		}else{
+	function __toString() {
+		if ($this->code == 'ok') {
+			$s = $this->data === null ? '' : json_encode($this->data);
+		} else {
 			$s = $this->message;
 		}
 		return sprintf('%-13s %12s %s', $this->cmd, $this->code, $s);
 	}
-	function ok(){
+	function ok() {
 		return $this->code == 'ok';
 	}
-	function not_found(){
+	function not_found() {
 		return $this->code == 'not_found';
 	}
 }
@@ -61,22 +61,22 @@ 
 	private $recv_buf = '';
 	private $_easy = false;
 	public $last_resp = null;
-	function __construct($host, $port, $timeout_ms=2000){
-		$timeout_f = (float)$timeout_ms/1000;
+	function __construct($host, $port, $timeout_ms = 2000) {
+		$timeout_f = (float) $timeout_ms / 1000;
 		$this->sock = @stream_socket_client("$host:$port", $errno, $errstr, $timeout_f);
-		if(!$this->sock){
+		if (!$this->sock) {
 			throw new SSDBException("$errno: $errstr");
 		}
-		$timeout_sec = intval($timeout_ms/1000);
+		$timeout_sec = intval($timeout_ms / 1000);
 		$timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
 		@stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
-		if(function_exists('stream_set_chunk_size')){
+		if (function_exists('stream_set_chunk_size')) {
 			@stream_set_chunk_size($this->sock, 1024 * 1024);
 		}
 	}
 	
-	function set_timeout($timeout_ms){
-		$timeout_sec = intval($timeout_ms/1000);
+	function set_timeout($timeout_ms) {
+		$timeout_sec = intval($timeout_ms / 1000);
 		$timeout_usec = ($timeout_ms - $timeout_sec * 1000) * 1000;
 		@stream_set_timeout($this->sock, $timeout_sec, $timeout_usec);
 	}
@@ -87,36 +87,36 @@ 
 	 * And some certain methods like get/zget will return false
 	 * when response is not ok(not_found, etc)
 	 */
-	function easy(){
+	function easy() {
 		$this->_easy = true;
 	}
-	function close(){
-		if(!$this->_closed){
+	function close() {
+		if (!$this->_closed) {
 			@fclose($this->sock);
 			$this->_closed = true;
 			$this->sock = null;
 		}
 	}
-	function closed(){
+	function closed() {
 		return $this->_closed;
 	}
 	private $batch_mode = false;
 	private $batch_cmds = array();
-	function batch(){
+	function batch() {
 		$this->batch_mode = true;
 		$this->batch_cmds = array();
 		return $this;
 	}
-	function multi(){
+	function multi() {
 		return $this->batch();
 	}
-	function exec(){
+	function exec() {
 		$ret = array();
-		foreach($this->batch_cmds as $op){
+		foreach ($this->batch_cmds as $op) {
 			list($cmd, $params) = $op;
 			$this->send_req($cmd, $params);
 		}
-		foreach($this->batch_cmds as $op){
+		foreach ($this->batch_cmds as $op) {
 			list($cmd, $params) = $op;
 			$resp = $this->recv_resp($cmd, $params);
 			$resp = $this->check_easy_resp($cmd, $resp);
@@ -127,7 +127,7 @@ 
 		return $ret;
 	}
 	
-	function request(){
+	function request() {
 		$args = func_get_args();
 		$cmd = array_shift($args);
 		return $this->__call($cmd, $args);
@@ -135,38 +135,38 @@ 
 	
 	private $async_auth_password = null;
 	
-	function auth($password){
+	function auth($password) {
 		$this->async_auth_password = $password;
 		return null;
 	}
-	function __call($cmd, $params=array()){
+	function __call($cmd, $params = array()) {
 		$cmd = strtolower($cmd);
-		if($this->async_auth_password !== null){
+		if ($this->async_auth_password !== null) {
 			$pass = $this->async_auth_password;
 			$this->async_auth_password = null;
 			$auth = $this->__call('auth', array($pass));
-			if($auth !== true){
+			if ($auth !== true) {
 				throw new Exception("Authentication failed");
 			}
 		}
-		if($this->batch_mode){
+		if ($this->batch_mode) {
 			$this->batch_cmds[] = array($cmd, $params);
 			return $this;
 		}
-		try{
-			if($this->send_req($cmd, $params) === false){
+		try {
+			if ($this->send_req($cmd, $params) === false) {
 				$resp = new SSDB_Response('error', 'send error');
-			}else{
+			} else {
 				$resp = $this->recv_resp($cmd, $params);
 			}
-		}catch(SSDBException $e){
-			if($this->_easy){
+		} catch (SSDBException $e) {
+			if ($this->_easy) {
 				throw $e;
-			}else{
+			} else {
 				$resp = new SSDB_Response('error', $e->getMessage());
 			}
 		}
-		if($resp->code == 'noauth'){
+		if ($resp->code == 'noauth') {
 			$msg = $resp->message;
 			throw new Exception($msg);
 		}
@@ -174,104 +174,104 @@ 
 		$resp = $this->check_easy_resp($cmd, $resp);
 		return $resp;
 	}
-	private function check_easy_resp($cmd, $resp){
+	private function check_easy_resp($cmd, $resp) {
 		$this->last_resp = $resp;
-		if($this->_easy){
-			if($resp->not_found()){
+		if ($this->_easy) {
+			if ($resp->not_found()) {
 				return NULL;
-			}else if(!$resp->ok() && !is_array($resp->data)){
+			} else if (!$resp->ok() && !is_array($resp->data)) {
 				return false;
-			}else{
+			} else {
 				return $resp->data;
 			}
-		}else{
+		} else {
 			$resp->cmd = $cmd;
 			return $resp;
 		}
 	}
-	function multi_set($kvs=array()){
+	function multi_set($kvs = array()) {
 		$args = array();
-		foreach($kvs as $k=>$v){
+		foreach ($kvs as $k=>$v) {
 			$args[] = $k;
 			$args[] = $v;
 		}
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function multi_hset($name, $kvs=array()){
+	function multi_hset($name, $kvs = array()) {
 		$args = array($name);
-		foreach($kvs as $k=>$v){
+		foreach ($kvs as $k=>$v) {
 			$args[] = $k;
 			$args[] = $v;
 		}
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function multi_zset($name, $kvs=array()){
+	function multi_zset($name, $kvs = array()) {
 		$args = array($name);
-		foreach($kvs as $k=>$v){
+		foreach ($kvs as $k=>$v) {
 			$args[] = $k;
 			$args[] = $v;
 		}
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function incr($key, $val=1){
+	function incr($key, $val = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function decr($key, $val=1){
+	function decr($key, $val = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function zincr($name, $key, $score=1){
+	function zincr($name, $key, $score = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function zdecr($name, $key, $score=1){
+	function zdecr($name, $key, $score = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function zadd($key, $score, $value){
+	function zadd($key, $score, $value) {
 		$args = array($key, $value, $score);
 		return $this->__call('zset', $args);
 	}
-	function zRevRank($name, $key){
+	function zRevRank($name, $key) {
 		$args = func_get_args();
 		return $this->__call("zrrank", $args);
 	}
-	function zRevRange($name, $offset, $limit){
+	function zRevRange($name, $offset, $limit) {
 		$args = func_get_args();
 		return $this->__call("zrrange", $args);
 	}
-	function hincr($name, $key, $val=1){
+	function hincr($name, $key, $val = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	function hdecr($name, $key, $val=1){
+	function hdecr($name, $key, $val = 1) {
 		$args = func_get_args();
 		return $this->__call(__FUNCTION__, $args);
 	}
-	private function send_req($cmd, $params){
+	private function send_req($cmd, $params) {
 		$req = array($cmd);
-		foreach($params as $p){
-			if(is_array($p)){
+		foreach ($params as $p) {
+			if (is_array($p)) {
 				$req = array_merge($req, $p);
-			}else{
+			} else {
 				$req[] = $p;
 			}
 		}
 		return $this->send($req);
 	}
-	private function recv_resp($cmd, $params){
+	private function recv_resp($cmd, $params) {
 		$resp = $this->recv();
-		if($resp === false){
+		if ($resp === false) {
 			return new SSDB_Response('error', 'Unknown error');
-		}else if(!$resp){
+		} else if (!$resp) {
 			return new SSDB_Response('disconnected', 'Connection closed');
 		}
-		if($resp[0] == 'noauth'){
-			$errmsg = isset($resp[1])? $resp[1] : '';
+		if ($resp[0] == 'noauth') {
+			$errmsg = isset($resp[1]) ? $resp[1] : '';
 			return new SSDB_Response($resp[0], $errmsg);
 		}
-		switch($cmd){
+		switch ($cmd) {
 			case 'dbsize':
 			case 'ping':
 			case 'qset':
@@ -319,19 +319,19 @@ 
 			case 'zremrangebyscore':
 			case 'ttl':
 			case 'expire':
-				if($resp[0] == 'ok'){
-					$val = isset($resp[1])? intval($resp[1]) : 0;
+				if ($resp[0] == 'ok') {
+					$val = isset($resp[1]) ? intval($resp[1]) : 0;
 					return new SSDB_Response($resp[0], $val);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 			case 'zavg':
-				if($resp[0] == 'ok'){
-					$val = isset($resp[1])? floatval($resp[1]) : (float)0;
+				if ($resp[0] == 'ok') {
+					$val = isset($resp[1]) ? floatval($resp[1]) : (float) 0;
 					return new SSDB_Response($resp[0], $val);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 			case 'get':
@@ -341,37 +341,37 @@ 
 			case 'qget':
 			case 'qfront':
 			case 'qback':
-				if($resp[0] == 'ok'){
-					if(count($resp) == 2){
+				if ($resp[0] == 'ok') {
+					if (count($resp) == 2) {
 						return new SSDB_Response('ok', $resp[1]);
-					}else{
+					} else {
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 				break;
 			case 'qpop':
 			case 'qpop_front':
 			case 'qpop_back':
-				if($resp[0] == 'ok'){
+				if ($resp[0] == 'ok') {
 					$size = 1;
-					if(isset($params[1])){
+					if (isset($params[1])) {
 						$size = intval($params[1]);
 					}
-					if($size <= 1){
-						if(count($resp) == 2){
+					if ($size <= 1) {
+						if (count($resp) == 2) {
 							return new SSDB_Response('ok', $resp[1]);
-						}else{
+						} else {
 							return new SSDB_Response('server_error', 'Invalid response');
 						}
-					}else{
+					} else {
 						$data = array_slice($resp, 1);
 						return new SSDB_Response('ok', $data);
 					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 				break;
@@ -381,46 +381,46 @@ 
 			case 'hlist':
 			case 'zlist':
 			case 'qslice':
-				if($resp[0] == 'ok'){
+				if ($resp[0] == 'ok') {
 					$data = array();
-					if($resp[0] == 'ok'){
+					if ($resp[0] == 'ok') {
 						$data = array_slice($resp, 1);
 					}
 					return new SSDB_Response($resp[0], $data);
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 			case 'auth':
 			case 'exists':
 			case 'hexists':
 			case 'zexists':
-				if($resp[0] == 'ok'){
-					if(count($resp) == 2){
-						return new SSDB_Response('ok', (bool)$resp[1]);
-					}else{
+				if ($resp[0] == 'ok') {
+					if (count($resp) == 2) {
+						return new SSDB_Response('ok', (bool) $resp[1]);
+					} else {
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 				break;
 			case 'multi_exists':
 			case 'multi_hexists':
 			case 'multi_zexists':
-				if($resp[0] == 'ok'){
-					if(count($resp) % 2 == 1){
+				if ($resp[0] == 'ok') {
+					if (count($resp) % 2 == 1) {
 						$data = array();
-						for($i=1; $i<count($resp); $i+=2){
-							$data[$resp[$i]] = (bool)$resp[$i + 1];
+						for ($i = 1; $i < count($resp); $i += 2) {
+							$data[$resp[$i]] = (bool) $resp[$i + 1];
 						}
 						return new SSDB_Response('ok', $data);
-					}else{
+					} else {
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 				break;
@@ -440,22 +440,22 @@ 
 			case 'multi_zget':
 			case 'zpop_front':
 			case 'zpop_back':
-				if($resp[0] == 'ok'){
-					if(count($resp) % 2 == 1){
+				if ($resp[0] == 'ok') {
+					if (count($resp) % 2 == 1) {
 						$data = array();
-						for($i=1; $i<count($resp); $i+=2){
-							if($cmd[0] == 'z'){
+						for ($i = 1; $i < count($resp); $i += 2) {
+							if ($cmd[0] == 'z') {
 								$data[$resp[$i]] = intval($resp[$i + 1]);
-							}else{
+							} else {
 								$data[$resp[$i]] = $resp[$i + 1];
 							}
 						}
 						return new SSDB_Response('ok', $data);
-					}else{
+					} else {
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
-					$errmsg = isset($resp[1])? $resp[1] : '';
+				} else {
+					$errmsg = isset($resp[1]) ? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
 				break;
@@ -464,59 +464,59 @@ 
 		}
 		return new SSDB_Response('error', 'Unknown command: $cmd');
 	}
-	private function send($data){
+	private function send($data) {
 		$ps = array();
-		foreach($data as $p){
+		foreach ($data as $p) {
 			$ps[] = strlen($p);
 			$ps[] = $p;
 		}
 		$s = join("\n", $ps) . "\n\n";
-		if($this->debug){
+		if ($this->debug) {
 			echo '> ' . str_replace(array("\r", "\n"), array('\r', '\n'), $s) . "\n";
 		}
-		try{
-			while(true){
+		try {
+			while (true) {
 				$ret = @fwrite($this->sock, $s);
-				if($ret === false || $ret === 0){
+				if ($ret === false || $ret === 0) {
 					$this->close();
 					throw new SSDBException('Connection lost');
 				}
 				$s = substr($s, $ret);
-				if(strlen($s) == 0){
+				if (strlen($s) == 0) {
 					break;
 				}
 				@fflush($this->sock);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$this->close();
 			throw new SSDBException($e->getMessage());
 		}
 		return $ret;
 	}
-	private function recv(){
+	private function recv() {
 		$this->step = self::STEP_SIZE;
-		while(true){
+		while (true) {
 			$ret = $this->parse();
-			if($ret === null){
-				try{
+			if ($ret === null) {
+				try {
 					$data = @fread($this->sock, 1024 * 1024);
-					if($this->debug){
+					if ($this->debug) {
 						echo '< ' . str_replace(array("\r", "\n"), array('\r', '\n'), $data) . "\n";
 					}
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					$data = '';
 				}
-				if($data === false || $data === ''){
-					if(feof($this->sock)){
+				if ($data === false || $data === '') {
+					if (feof($this->sock)) {
 						$this->close();
 						throw new SSDBException('Connection lost');
-					}else{
+					} else {
 						throw new SSDBTimeoutException('Connection timeout');
 					}
 				}
 				$this->recv_buf .= $data;
 #				echo "read " . strlen($data) . " total: " . strlen($this->recv_buf) . "\n";
-			}else{
+			} else {
 				return $ret;
 			}
 		}
@@ -526,24 +526,24 @@ 
 	public $resp = array();
 	public $step;
 	public $block_size;
-	private function parse(){
+	private function parse() {
 		$spos = 0;
 		$epos = 0;
 		$buf_size = strlen($this->recv_buf);
 		// performance issue for large reponse
 		//$this->recv_buf = ltrim($this->recv_buf);
-		while(true){
+		while (true) {
 			$spos = $epos;
-			if($this->step === self::STEP_SIZE){
+			if ($this->step === self::STEP_SIZE) {
 				$epos = strpos($this->recv_buf, "\n", $spos);
-				if($epos === false){
+				if ($epos === false) {
 					break;
 				}
 				$epos += 1;
 				$line = substr($this->recv_buf, $spos, $epos - $spos);
 				$spos = $epos;
 				$line = trim($line);
-				if(strlen($line) == 0){ // head end
+				if (strlen($line) == 0) { // head end
 					$this->recv_buf = substr($this->recv_buf, $spos);
 					$ret = $this->resp;
 					$this->resp = array();
@@ -552,11 +552,11 @@ 
 				$this->block_size = intval($line);
 				$this->step = self::STEP_DATA;
 			}
-			if($this->step === self::STEP_DATA){
+			if ($this->step === self::STEP_DATA) {
 				$epos = $spos + $this->block_size;
-				if($epos <= $buf_size){
+				if ($epos <= $buf_size) {
 					$n = strpos($this->recv_buf, "\n", $epos);
-					if($n !== false){
+					if ($n !== false) {
 						$data = substr($this->recv_buf, $spos, $epos - $spos);
 						$this->resp[] = $data;
 						$epos = $n + 1;
@@ -568,7 +568,7 @@ 
 			}
 		}
 		// packet not ready
-		if($spos > 0){
+		if ($spos > 0) {
 			$this->recv_buf = substr($this->recv_buf, $spos);
 		}
 		return null;

Braces +29 added lines, -29 removed lines

@@ -34,14 +34,14 @@ 
 		$this->code = $code;
 		if($code == 'ok'){
 			$this->data = $data_or_message;
-		}else{
+		} else{
 			$this->message = $data_or_message;
 		}
 	}
 	function __toString(){
 		if($this->code == 'ok'){
 			$s = $this->data === null? '' : json_encode($this->data);
-		}else{
+		} else{
 			$s = $this->message;
 		}
 		return sprintf('%-13s %12s %s', $this->cmd, $this->code, $s);
@@ -156,13 +156,13 @@ 
 		try{
 			if($this->send_req($cmd, $params) === false){
 				$resp = new SSDB_Response('error', 'send error');
-			}else{
+			} else{
 				$resp = $this->recv_resp($cmd, $params);
 			}
-		}catch(SSDBException $e){
+		} catch(SSDBException $e){
 			if($this->_easy){
 				throw $e;
-			}else{
+			} else{
 				$resp = new SSDB_Response('error', $e->getMessage());
 			}
 		}
@@ -179,12 +179,12 @@ 
 		if($this->_easy){
 			if($resp->not_found()){
 				return NULL;
-			}else if(!$resp->ok() && !is_array($resp->data)){
+			} else if(!$resp->ok() && !is_array($resp->data)){
 				return false;
-			}else{
+			} else{
 				return $resp->data;
 			}
-		}else{
+		} else{
 			$resp->cmd = $cmd;
 			return $resp;
 		}
@@ -254,7 +254,7 @@ 
 		foreach($params as $p){
 			if(is_array($p)){
 				$req = array_merge($req, $p);
-			}else{
+			} else{
 				$req[] = $p;
 			}
 		}
@@ -264,7 +264,7 @@ 
 		$resp = $this->recv();
 		if($resp === false){
 			return new SSDB_Response('error', 'Unknown error');
-		}else if(!$resp){
+		} else if(!$resp){
 			return new SSDB_Response('disconnected', 'Connection closed');
 		}
 		if($resp[0] == 'noauth'){
@@ -322,7 +322,7 @@ 
 				if($resp[0] == 'ok'){
 					$val = isset($resp[1])? intval($resp[1]) : 0;
 					return new SSDB_Response($resp[0], $val);
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -330,7 +330,7 @@ 
 				if($resp[0] == 'ok'){
 					$val = isset($resp[1])? floatval($resp[1]) : (float)0;
 					return new SSDB_Response($resp[0], $val);
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -344,10 +344,10 @@ 
 				if($resp[0] == 'ok'){
 					if(count($resp) == 2){
 						return new SSDB_Response('ok', $resp[1]);
-					}else{
+					} else{
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -363,14 +363,14 @@ 
 					if($size <= 1){
 						if(count($resp) == 2){
 							return new SSDB_Response('ok', $resp[1]);
-						}else{
+						} else{
 							return new SSDB_Response('server_error', 'Invalid response');
 						}
-					}else{
+					} else{
 						$data = array_slice($resp, 1);
 						return new SSDB_Response('ok', $data);
 					}
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -387,7 +387,7 @@ 
 						$data = array_slice($resp, 1);
 					}
 					return new SSDB_Response($resp[0], $data);
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -398,10 +398,10 @@ 
 				if($resp[0] == 'ok'){
 					if(count($resp) == 2){
 						return new SSDB_Response('ok', (bool)$resp[1]);
-					}else{
+					} else{
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -416,10 +416,10 @@ 
 							$data[$resp[$i]] = (bool)$resp[$i + 1];
 						}
 						return new SSDB_Response('ok', $data);
-					}else{
+					} else{
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -446,15 +446,15 @@ 
 						for($i=1; $i<count($resp); $i+=2){
 							if($cmd[0] == 'z'){
 								$data[$resp[$i]] = intval($resp[$i + 1]);
-							}else{
+							} else{
 								$data[$resp[$i]] = $resp[$i + 1];
 							}
 						}
 						return new SSDB_Response('ok', $data);
-					}else{
+					} else{
 						return new SSDB_Response('server_error', 'Invalid response');
 					}
-				}else{
+				} else{
 					$errmsg = isset($resp[1])? $resp[1] : '';
 					return new SSDB_Response($resp[0], $errmsg);
 				}
@@ -487,7 +487,7 @@ 
 				}
 				@fflush($this->sock);
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->close();
 			throw new SSDBException($e->getMessage());
 		}
@@ -503,20 +503,20 @@ 
 					if($this->debug){
 						echo '< ' . str_replace(array("\r", "\n"), array('\r', '\n'), $data) . "\n";
 					}
-				}catch(Exception $e){
+				} catch(Exception $e){
 					$data = '';
 				}
 				if($data === false || $data === ''){
 					if(feof($this->sock)){
 						$this->close();
 						throw new SSDBException('Connection lost');
-					}else{
+					} else{
 						throw new SSDBTimeoutException('Connection timeout');
 					}
 				}
 				$this->recv_buf .= $data;
 #				echo "read " . strlen($data) . " total: " . strlen($this->recv_buf) . "\n";
-			}else{
+			} else{
 				return $ret;
 			}
 		}

src/phpFastCache/Core/DriverAbstract.php

Doc Comments +15 added lines, -9 removed lines

@@ -541,7 +541,7 @@ 
 
 
     /**
-     * @return mixed
+     * @return DriverAbstract
      */
     protected function backup()
     {
@@ -549,7 +549,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return void
      */
     protected function required_extension($name)
@@ -559,7 +559,7 @@ 
 
 
     /**
-     * @param $file
+     * @param string $file
      * @return string
      * @throws \Exception
      */
@@ -599,7 +599,7 @@ 
 
     /**
      *  Object for Files & SQLite
-     * @param $data
+     * @param string $data
      * @return string
      */
     protected function encode($data)
@@ -678,7 +678,7 @@ 
      * @param integer $time
      * @param array $tags
      * @param array $option | $option = array("tags" => array("a","b","c")
-     * @return mixed
+     * @return boolean|null
      */
     public function setTags($keyword, $value = '', $time = 0, $tags = array(), $option = array())
     {
@@ -689,6 +689,9 @@ 
         return $this->set($keyword, $value, $time, $option);
     }
 
+    /**
+     * @param integer $time
+     */
     protected function _handleTags($keyword, $time, $tags)
     {
         foreach ($tags as $tag) {
@@ -747,7 +750,7 @@ 
      * @param array $tags | array("a","b","c")
      * @param int $time
      * @param array $options
-     * @return mixed
+     * @return boolean
      * @internal param array $option | $option = array("tags" => array("a","b","c")
      */
     public function touchTags($tags = array(), $time = 300, $options = array())
@@ -767,7 +770,7 @@ 
     /**
      * @param array $tags | array("a","b","c")
      * @param array $option | $option = array("tags" => array("a","b","c")
-     * @return mixed
+     * @return boolean
      */
     public function deleteTags($tags = array(), $option = array())
     {
@@ -788,7 +791,7 @@ 
      * @param array $tags | array("a","b","c")
      * @param integer
      * @param array $option | $option = array("tags" => array("a","b","c")
-     * @return mixed
+     * @return boolean
      */
     public function incrementTags($tags = array(), $step = 1, $option = array())
     {
@@ -808,7 +811,7 @@ 
      * @param array $tags | array("a","b","c")
      * @param integer
      * @param array $option | $option = array("tags" => array("a","b","c")
-     * @return mixed
+     * @return boolean
      */
     public function decrementTags($tags = array(), $step = 1, $option = array())
     {
@@ -836,6 +839,9 @@ 
         */
     }
 
+    /**
+     * @param string $index
+     */
     public function _hit($index, $step = 1)
     {
         $instance = $this->config[ 'instance' ];

Indentation +14 added lines, -14 removed lines

@@ -99,11 +99,11 @@ 
             return false;
         }
         $object = array(
-          "value" => $value,
-          "write_time" => time(),
-          "expired_in" => $time,
-          "expired_time" => time() + (int)$time,
-          "size" => (is_array($value) || is_object($value)) ? strlen(serialize($value)) : strlen((String)$value),
+            "value" => $value,
+            "write_time" => time(),
+            "expired_in" => $time,
+            "expired_time" => time() + (int)$time,
+            "size" => (is_array($value) || is_object($value)) ? strlen(serialize($value)) : strlen((String)$value),
         );
 
         // handle search
@@ -376,7 +376,7 @@ 
     {
         foreach ($list as $array) {
             $this->set($array[ 0 ], isset($array[ 1 ]) ? $array[ 1 ] : 0,
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+                isset($array[ 2 ]) ? $array[ 2 ] : array());
         }
     }
 
@@ -390,7 +390,7 @@ 
         foreach ($list as $array) {
             $name = $array[ 0 ];
             $res[ $name ] = $this->get($name,
-              isset($array[ 1 ]) ? $array[ 1 ] : array());
+                isset($array[ 1 ]) ? $array[ 1 ] : array());
         }
         return $res;
     }
@@ -405,7 +405,7 @@ 
         foreach ($list as $array) {
             $name = $array[ 0 ];
             $res[ $name ] = $this->getInfo($name,
-              isset($array[ 1 ]) ? $array[ 1 ] : array());
+                isset($array[ 1 ]) ? $array[ 1 ] : array());
         }
         return $res;
     }
@@ -447,7 +447,7 @@ 
         foreach ($list as $array) {
             $name = $array[ 0 ];
             $res[ $name ] = $this->increment($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+                isset($array[ 2 ]) ? $array[ 2 ] : array());
         }
         return $res;
     }
@@ -462,7 +462,7 @@ 
         foreach ($list as $array) {
             $name = $array[ 0 ];
             $res[ $name ] = $this->decrement($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+                isset($array[ 2 ]) ? $array[ 2 ] : array());
         }
         return $res;
     }
@@ -477,7 +477,7 @@ 
         foreach ($list as $array) {
             $name = $array[ 0 ];
             $res[ $name ] = $this->touch($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+                isset($array[ 2 ]) ? $array[ 2 ] : array());
         }
         return $res;
     }
@@ -528,7 +528,7 @@ 
     {
         if (isset($v[ 1 ]) && is_scalar($v[ 1 ])) {
             return $this->set($name, $v[ 0 ], $v[ 1 ],
-              isset($v[ 2 ]) ? $v[ 2 ] : array());
+                isset($v[ 2 ]) ? $v[ 2 ] : array());
         } else {
             throw new phpFastCacheDriverException("Example ->$name = array('VALUE', 300);", 98);
         }
@@ -665,10 +665,10 @@ 
     protected function _tagCaching()
     {
         return CacheManager::Sqlite(
-          array(
+            array(
             "path" => $this->config[ 'path' ],
             "cache_method" => 3,
-          )
+            )
         );
     }
 

Spacing +73 added lines, -73 removed lines

@@ -53,8 +53,8 @@ 
     public function __destruct()
     {
         // clean up the memory and don't want for PHP clean for caching method "phpfastcache"
-        if (isset($this->config[ 'instance' ]) && (int)$this->config[ 'cache_method' ] === 3) {
-            CacheManager::cleanCachingMethod($this->config[ 'instance' ]);
+        if (isset($this->config['instance']) && (int) $this->config['cache_method'] === 3) {
+            CacheManager::cleanCachingMethod($this->config['instance']);
         }
     }
 
@@ -83,7 +83,7 @@ 
          * Infinity Time
          * Khoa. B
          */
-        if ((int)$time <= 0) {
+        if ((int) $time <= 0) {
             /**
              * 5 years, however memcached or memory cached will gone when u restart it
              * just recommended for sqlite. files
@@ -102,24 +102,24 @@ 
           "value" => $value,
           "write_time" => time(),
           "expired_in" => $time,
-          "expired_time" => time() + (int)$time,
-          "size" => (is_array($value) || is_object($value)) ? strlen(serialize($value)) : strlen((String)$value),
+          "expired_time" => time() + (int) $time,
+          "size" => (is_array($value) || is_object($value)) ? strlen(serialize($value)) : strlen((String) $value),
         );
 
         // handle search
-        if (isset($this->config[ 'allow_search' ]) && $this->config[ 'allow_search' ] == true) {
-            $option[ 'tags' ][] = "search";
+        if (isset($this->config['allow_search']) && $this->config['allow_search'] == true) {
+            $option['tags'][] = "search";
         }
 
         // handle tags
-        if (isset($option[ 'tags' ])) {
-            $this->_handleTags($keyword, $time, $option[ 'tags' ]);
+        if (isset($option['tags'])) {
+            $this->_handleTags($keyword, $time, $option['tags']);
         }
 
         // handle method
-        if ((int)$this->config[ 'cache_method' ] > 1 && isset($object[ 'size' ]) && (int)$object[ 'size' ] <= (int)$this->config[ 'limited_memory_each_object' ]) {
-            CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ] = $object;
-            if (in_array((int)$this->config[ 'cache_method' ], array(3, 4))) {
+        if ((int) $this->config['cache_method'] > 1 && isset($object['size']) && (int) $object['size'] <= (int) $this->config['limited_memory_each_object']) {
+            CacheManager::$memory[$this->config['instance']][$keyword] = $object;
+            if (in_array((int) $this->config['cache_method'], array(3, 4))) {
                 return true;
             }
         }
@@ -145,9 +145,9 @@ 
         }
 
         // handle method
-        if ((int)$this->config[ 'cache_method' ] > 1) {
-            if (isset(CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ])) {
-                $object = CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ];
+        if ((int) $this->config['cache_method'] > 1) {
+            if (isset(CacheManager::$memory[$this->config['instance']][$keyword])) {
+                $object = CacheManager::$memory[$this->config['instance']][$keyword];
             }
         }
 
@@ -156,8 +156,8 @@ 
             $object = $this->driver_get($keyword, $option);
 
             // handle method
-            if ((int)$this->config[ 'cache_method' ] > 1 && isset($object[ 'size' ]) && (int)$object[ 'size' ] <= (int)$this->config[ 'limited_memory_each_object' ]) {
-                CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ] = $object;
+            if ((int) $this->config['cache_method'] > 1 && isset($object['size']) && (int) $object['size'] <= (int) $this->config['limited_memory_each_object']) {
+                CacheManager::$memory[$this->config['instance']][$keyword] = $object;
             }
             // end handle method
         }
@@ -166,8 +166,8 @@ 
             return null;
         }
 
-        $value = isset($object[ 'value' ]) ? $object[ 'value' ] : null;
-        return isset($option[ 'all_keys' ]) && $option[ 'all_keys' ] ? $object : $value;
+        $value = isset($object['value']) ? $object['value'] : null;
+        return isset($option['all_keys']) && $option['all_keys'] ? $object : $value;
     }
 
     /**
@@ -177,9 +177,9 @@ 
      */
     public function getInfo($keyword, $option = array())
     {
-        if ((int)$this->config[ 'cache_method' ] > 1) {
-            if (isset(CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ])) {
-                $object = CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ];
+        if ((int) $this->config['cache_method'] > 1) {
+            if (isset(CacheManager::$memory[$this->config['instance']][$keyword])) {
+                $object = CacheManager::$memory[$this->config['instance']][$keyword];
             }
         }
         if (!isset($object)) {
@@ -199,9 +199,9 @@ 
     public function delete($keyword, array $option = array())
     {
         // handle method
-        if ((int)$this->config[ 'cache_method' ] > 1) {
+        if ((int) $this->config['cache_method'] > 1) {
             // use memory
-            unset(CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ]);
+            unset(CacheManager::$memory[$this->config['instance']][$keyword]);
         }
         // end handle method
         return $this->driver_delete($keyword, $option);
@@ -223,9 +223,9 @@ 
     public function clean(array $option = array())
     {
         // handle method
-        if ((int)$this->config[ 'cache_method' ] > 1) {
+        if ((int) $this->config['cache_method'] > 1) {
             // use memory
-            CacheManager::$memory[ $this->config[ 'instance' ] ] = array();
+            CacheManager::$memory[$this->config['instance']] = array();
         }
         // end handle method
         return $this->driver_clean($option);
@@ -259,12 +259,12 @@ 
      */
     public function search($query_as_regex_or_string, $search_in_value = false)
     {
-        if ($this->config[ 'allow_search' ] != true) {
+        if ($this->config['allow_search'] != true) {
             throw new phpFastCacheDriverException('Please setup allow_search = true');
         } else {
             $list = $this->getTags("search", $search_in_value);
             $tmp = explode("/", $query_as_regex_or_string, 2);
-            $regex = isset($tmp[ 1 ]) ? true : false;
+            $regex = isset($tmp[1]) ? true : false;
             $return_list = array();
             foreach ($list as $tag) {
                 foreach ($tag as $keyword => $value) {
@@ -275,13 +275,13 @@ 
 
                     if ($regex == true && $gotcha == false) {     // look in keyword
                         if (preg_match($query_as_regex_or_string, $keyword)) {
-                            $return_list[ $keyword ] = $value;
+                            $return_list[$keyword] = $value;
                             $gotcha = true;
                         }
                     }
                     if ($gotcha == false) {
                         if (strpos($keyword, $query_as_regex_or_string) !== false) {
-                            $return_list[ $keyword ] = $value;
+                            $return_list[$keyword] = $value;
                             $gotcha = true;
                         }
                     }
@@ -289,13 +289,13 @@ 
                     if ($search_in_value == true && $gotcha == false) { // value search
                         if ($regex == true && $gotcha == false) {
                             if (preg_match($query_as_regex_or_string, $value)) {
-                                $return_list[ $keyword ] = $value;
+                                $return_list[$keyword] = $value;
                                 $gotcha = true;
                             }
                         }
                         if ($gotcha == false) {
                             if (strpos($value, $query_as_regex_or_string) !== false) {
-                                $return_list[ $keyword ] = $value;
+                                $return_list[$keyword] = $value;
                                 $gotcha = true;
                             }
                         }
@@ -318,8 +318,8 @@ 
         if ($object == null) {
             return false;
         } else {
-            $value = (int)$object[ 'value' ] + (int)$step;
-            $time = $object[ 'expired_time' ] - time();
+            $value = (int) $object['value'] + (int) $step;
+            $time = $object['expired_time'] - time();
             $this->set($keyword, $value, $time, $option);
             return true;
         }
@@ -337,8 +337,8 @@ 
         if ($object == null) {
             return false;
         } else {
-            $value = (int)$object[ 'value' ] - (int)$step;
-            $time = $object[ 'expired_time' ] - time();
+            $value = (int) $object['value'] - (int) $step;
+            $time = $object['expired_time'] - time();
             $this->set($keyword, $value, $time, $option);
             return true;
         }
@@ -357,8 +357,8 @@ 
         if ($object == null) {
             return false;
         } else {
-            $value = $object[ 'value' ];
-            $time = $object[ 'expired_time' ] - time() + $time;
+            $value = $object['value'];
+            $time = $object['expired_time'] - time() + $time;
             $this->set($keyword, $value, $time, $option);
             return true;
         }
@@ -375,8 +375,8 @@ 
     public function setMulti(array $list = array())
     {
         foreach ($list as $array) {
-            $this->set($array[ 0 ], isset($array[ 1 ]) ? $array[ 1 ] : 0,
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+            $this->set($array[0], isset($array[1]) ? $array[1] : 0,
+              isset($array[2]) ? $array[2] : array());
         }
     }
 
@@ -388,9 +388,9 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->get($name,
-              isset($array[ 1 ]) ? $array[ 1 ] : array());
+            $name = $array[0];
+            $res[$name] = $this->get($name,
+              isset($array[1]) ? $array[1] : array());
         }
         return $res;
     }
@@ -403,9 +403,9 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->getInfo($name,
-              isset($array[ 1 ]) ? $array[ 1 ] : array());
+            $name = $array[0];
+            $res[$name] = $this->getInfo($name,
+              isset($array[1]) ? $array[1] : array());
         }
         return $res;
     }
@@ -418,7 +418,7 @@ 
     {
         foreach ($list as $item) {
             if (is_array($item) && count($item) === 2) {
-                $this->delete($item[ 0 ], $item[ 1 ]);
+                $this->delete($item[0], $item[1]);
             }
         }
     }
@@ -431,8 +431,8 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->isExisting($name);
+            $name = $array[0];
+            $res[$name] = $this->isExisting($name);
         }
         return $res;
     }
@@ -445,9 +445,9 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->increment($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+            $name = $array[0];
+            $res[$name] = $this->increment($name, $array[1],
+              isset($array[2]) ? $array[2] : array());
         }
         return $res;
     }
@@ -460,9 +460,9 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->decrement($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+            $name = $array[0];
+            $res[$name] = $this->decrement($name, $array[1],
+              isset($array[2]) ? $array[2] : array());
         }
         return $res;
     }
@@ -475,9 +475,9 @@ 
     {
         $res = array();
         foreach ($list as $array) {
-            $name = $array[ 0 ];
-            $res[ $name ] = $this->touch($name, $array[ 1 ],
-              isset($array[ 2 ]) ? $array[ 2 ] : array());
+            $name = $array[0];
+            $res[$name] = $this->touch($name, $array[1],
+              isset($array[2]) ? $array[2] : array());
         }
         return $res;
     }
@@ -494,7 +494,7 @@ 
         if (is_array($config_name)) {
             $this->config = array_merge($this->config, $config_name);
         } else {
-            $this->config[ $config_name ] = $value;
+            $this->config[$config_name] = $value;
         }
     }
 
@@ -526,9 +526,9 @@ 
      */
     public function __set($name, $v)
     {
-        if (isset($v[ 1 ]) && is_scalar($v[ 1 ])) {
-            return $this->set($name, $v[ 0 ], $v[ 1 ],
-              isset($v[ 2 ]) ? $v[ 2 ] : array());
+        if (isset($v[1]) && is_scalar($v[1])) {
+            return $this->set($name, $v[0], $v[1],
+              isset($v[2]) ? $v[2] : array());
         } else {
             throw new phpFastCacheDriverException("Example ->$name = array('VALUE', 300);", 98);
         }
@@ -545,7 +545,7 @@ 
      */
     protected function backup()
     {
-        return phpFastCache(phpFastCache::$config[ 'fallback' ]);
+        return phpFastCache(phpFastCache::$config['fallback']);
     }
 
     /**
@@ -666,7 +666,7 @@ 
     {
         return CacheManager::Sqlite(
           array(
-            "path" => $this->config[ 'path' ],
+            "path" => $this->config['path'],
             "cache_method" => 3,
           )
         );
@@ -685,7 +685,7 @@ 
         if (!is_array($tags)) {
             $tags = array($tags);
         }
-        $option[ 'tags' ] = $tags;
+        $option['tags'] = $tags;
         return $this->set($keyword, $value, $time, $option);
     }
 
@@ -696,7 +696,7 @@ 
             if (is_null($list)) {
                 $list = array();
             }
-            $list[ $keyword ] = time() + $time;
+            $list[$keyword] = time() + $time;
             $this->_tagCaching()->set($this->_getTagName($tag), $list, 3600 * 24 * 30);
         }
     }
@@ -724,21 +724,21 @@ 
             }
             foreach ($list as $keyword => $time) {
                 if ($time <= time()) {
-                    unset($list[ $keyword ]);
+                    unset($list[$keyword]);
                 } else {
                     if ($tmp < $time) {
                         $tmp = $time;
                     }
                     if ($return_content == true) {
-                        $list_return[ $keyword ] = $this->get($keyword);
+                        $list_return[$keyword] = $this->get($keyword);
                     } else {
-                        $list_return[ $keyword ] = $time;
+                        $list_return[$keyword] = $time;
                     }
                 }
             }
 
             $this->_tagCaching()->set($this->_getTagName($tag), $list, $tmp);
-            $keywords[ $tag ] = $list_return;
+            $keywords[$tag] = $list_return;
         }
         return $keywords;
     }
@@ -838,9 +838,9 @@ 
 
     public function _hit($index, $step = 1)
     {
-        $instance = $this->config[ 'instance' ];
-        $current = isset(CacheManager::$hit[ $instance ][ 'data' ][ $index ]) ? CacheManager::$hit[ $instance ][ 'data' ][ $index ] : 0;
-        CacheManager::$hit[ $instance ][ 'data' ][ $index ] = $current + ($step);
+        $instance = $this->config['instance'];
+        $current = isset(CacheManager::$hit[$instance]['data'][$index]) ? CacheManager::$hit[$instance]['data'][$index] : 0;
+        CacheManager::$hit[$instance]['data'][$index] = $current + ($step);
     }
 
 }
\ No newline at end of file

src/phpFastCache/Core/phpFastCache.php

Doc Comments +2 added lines, -2 removed lines

@@ -229,7 +229,7 @@ 
 
     /**
      * @param $filename
-     * @return mixed
+     * @return string
      */
     public static function cleanFileName($filename)
     {
@@ -285,7 +285,7 @@ 
     }
 
     /**
-     * @param $path
+     * @param string $path
      * @param bool $create
      * @throws \Exception
      */

Indentation +29 added lines, -29 removed lines

@@ -47,42 +47,42 @@ 
      * @var array
      */
     public static $config = array(
-      'storage' => '', // blank for auto
-      'default_chmod' => 0777, // 0777 , 0666, 0644
+        'storage' => '', // blank for auto
+        'default_chmod' => 0777, // 0777 , 0666, 0644
 
-      'overwrite'  =>  "", // files, sqlite, etc it will overwrite ur storage and all other caching for waiting u fix ur server
-      'allow_search'   =>  false, // turn to true will allow $method search("/regex/")
+        'overwrite'  =>  "", // files, sqlite, etc it will overwrite ur storage and all other caching for waiting u fix ur server
+        'allow_search'   =>  false, // turn to true will allow $method search("/regex/")
 
-      'fallback' => 'files', //Fall back when old driver is not support
+        'fallback' => 'files', //Fall back when old driver is not support
 
-      'securityKey' => 'auto',
-      'htaccess' => true,
-      'path' => '',
+        'securityKey' => 'auto',
+        'htaccess' => true,
+        'path' => '',
 
-      'memcache' => array(
+        'memcache' => array(
         array('127.0.0.1', 11211, 1),
-          //  array("new.host.ip",11211,1),
-      ),
+            //  array("new.host.ip",11211,1),
+        ),
 
-      'redis' => array(
+        'redis' => array(
         'host' => '127.0.0.1',
         'port' => '',
         'password' => '',
         'database' => '',
         'timeout' => '',
-      ),
+        ),
 
-      'ssdb' => array(
+        'ssdb' => array(
         'host' => '127.0.0.1',
         'port' => 8888,
         'password' => '',
         'timeout' => '',
-      ),
+        ),
 
-      'extensions' => array(),
-      "cache_method"    =>  1, // 1 = normal, 2 = phpfastcache, 3 = memory
-      "limited_memory_each_object"  =>  4000, // maximum size (bytes) of object store in memory
-      "compress_data" => false // compress stored data, if the backend supports it
+        'extensions' => array(),
+        "cache_method"    =>  1, // 1 = normal, 2 = phpfastcache, 3 = memory
+        "limited_memory_each_object"  =>  4000, // maximum size (bytes) of object store in memory
+        "compress_data" => false // compress stored data, if the backend supports it
     );
 
     /**
@@ -177,12 +177,12 @@ 
         }
 
         $securityKey = array_key_exists('securityKey',
-          $config) ? $config[ 'securityKey' ] : '';
+            $config) ? $config[ 'securityKey' ] : '';
         if ($securityKey == "" || $securityKey == 'auto') {
             $securityKey = self::$config[ 'securityKey' ];
             if ($securityKey == 'auto' || $securityKey == '') {
                 $securityKey = isset($_SERVER[ 'HTTP_HOST' ]) ? preg_replace('/^www./',
-                  '', strtolower($_SERVER[ 'HTTP_HOST' ])) : "default";
+                    '', strtolower($_SERVER[ 'HTTP_HOST' ])) : "default";
             }
         }
         if ($securityKey != '') {
@@ -234,9 +234,9 @@ 
     public static function cleanFileName($filename)
     {
         $regex = array(
-          '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
-          '/\.$/',
-          '/^\./',
+            '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
+            '/\.$/',
+            '/^\./',
         );
         $replace = array('-', '', '');
         return trim(preg_replace($regex, $replace, trim($filename)),'-');
@@ -261,10 +261,10 @@ 
     protected static function getOS()
     {
         $os = array(
-          'os' => PHP_OS,
-          'php' => PHP_SAPI,
-          'system' => php_uname(),
-          'unique' => md5(php_uname() . PHP_OS . PHP_SAPI),
+            'os' => PHP_OS,
+            'php' => PHP_SAPI,
+            'system' => php_uname(),
+            'unique' => md5(php_uname() . PHP_OS . PHP_SAPI),
         );
         return $os;
     }
@@ -298,7 +298,7 @@ 
                     chmod($path, 0777);
                 } catch (phpFastCacheDriverException $e) {
                     throw new phpFastCacheDriverException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!',
-                      92);
+                        92);
                 }
             }
 

Spacing +23 added lines, -23 removed lines

@@ -105,7 +105,7 @@ 
         if (empty($config)) {
             $config = phpFastCache::$config;
         }
-        $config[ 'storage' ] = $storage;
+        $config['storage'] = $storage;
 
         $storage = strtolower($storage);
         if ($storage == '' || $storage == 'auto') {
@@ -158,31 +158,31 @@ 
     {
         $tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
 
-        if (!isset($config[ 'path' ]) || $config[ 'path' ] == '') {
+        if (!isset($config['path']) || $config['path'] == '') {
             if (self::isPHPModule()) {
                 $path = $tmp_dir;
             } else {
-                $document_root_path = rtrim($_SERVER[ 'DOCUMENT_ROOT' ], '/') . '/../';
-                $path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) && is_writable($document_root_path)
+                $document_root_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . '/../';
+                $path = isset($_SERVER['DOCUMENT_ROOT']) && is_writable($document_root_path)
                     ? $document_root_path
                     : rtrim(__DIR__, '/') . '/';
             }
 
-            if (self::$config[ 'path' ] != '') {
-                $path = $config[ 'path' ];
+            if (self::$config['path'] != '') {
+                $path = $config['path'];
             }
 
         } else {
-            $path = $config[ 'path' ];
+            $path = $config['path'];
         }
 
         $securityKey = array_key_exists('securityKey',
-          $config) ? $config[ 'securityKey' ] : '';
+          $config) ? $config['securityKey'] : '';
         if ($securityKey == "" || $securityKey == 'auto') {
-            $securityKey = self::$config[ 'securityKey' ];
+            $securityKey = self::$config['securityKey'];
             if ($securityKey == 'auto' || $securityKey == '') {
-                $securityKey = isset($_SERVER[ 'HTTP_HOST' ]) ? preg_replace('/^www./',
-                  '', strtolower($_SERVER[ 'HTTP_HOST' ])) : "default";
+                $securityKey = isset($_SERVER['HTTP_HOST']) ? preg_replace('/^www./',
+                  '', strtolower($_SERVER['HTTP_HOST'])) : "default";
             }
         }
         if ($securityKey != '') {
@@ -191,11 +191,11 @@ 
 
         $securityKey = self::cleanFileName($securityKey);
 
-        $full_path = rtrim($path,'/') . '/' . $securityKey;
+        $full_path = rtrim($path, '/') . '/' . $securityKey;
         $full_pathx = md5($full_path);
 
 
-        if ($skip_create_path == false && !isset(self::$tmp[ $full_pathx ])) {
+        if ($skip_create_path == false && !isset(self::$tmp[$full_pathx])) {
 
             if (!@file_exists($full_path) || !@is_writable($full_path)) {
                 if (!@file_exists($full_path)) {
@@ -204,9 +204,9 @@ 
                 if (!@is_writable($full_path)) {
                     @chmod($full_path, self::__setChmodAuto($config));
                 }
-                if(!@is_writable($full_path)) {
+                if (!@is_writable($full_path)) {
                     // switch back to tmp dir again if the path is not writeable
-                    $full_path = rtrim($tmp_dir,'/') . '/' . $securityKey;
+                    $full_path = rtrim($tmp_dir, '/') . '/' . $securityKey;
                     if (!@file_exists($full_path)) {
                         @mkdir($full_path, self::__setChmodAuto($config));
                     }
@@ -219,8 +219,8 @@ 
                 }
             }
 
-            self::$tmp[ $full_pathx ] = true;
-            self::htaccessGen($full_path, array_key_exists('htaccess', $config) ? $config[ 'htaccess' ] : false);
+            self::$tmp[$full_pathx] = true;
+            self::htaccessGen($full_path, array_key_exists('htaccess', $config) ? $config['htaccess'] : false);
         }
 
         return realpath($full_path);
@@ -239,7 +239,7 @@ 
           '/^\./',
         );
         $replace = array('-', '', '');
-        return trim(preg_replace($regex, $replace, trim($filename)),'-');
+        return trim(preg_replace($regex, $replace, trim($filename)), '-');
     }
 
     /**
@@ -248,10 +248,10 @@ 
      */
     public static function __setChmodAuto($config)
     {
-        if (!isset($config[ 'default_chmod' ]) || $config[ 'default_chmod' ] == '' || is_null($config[ 'default_chmod' ])) {
+        if (!isset($config['default_chmod']) || $config['default_chmod'] == '' || is_null($config['default_chmod'])) {
             return 0777;
         } else {
-            return $config[ 'default_chmod' ];
+            return $config['default_chmod'];
         }
     }
 
@@ -302,7 +302,7 @@ 
                 }
             }
 
-            if(!file_exists($path."/.htaccess")) {
+            if (!file_exists($path . "/.htaccess")) {
                 //   echo "write me";
                 $html = "order deny, allow \r\n
 deny from all \r\n
@@ -328,9 +328,9 @@ 
     public static function setup($name, $value = '')
     {
         if (is_array($name)) {
-            self::$config = array_merge(self::$config,$name);
+            self::$config = array_merge(self::$config, $name);
         } else {
-            self::$config[ $name ] = $value;
+            self::$config[$name] = $value;
         }
     }