Merge pull request #22 from cheprasov/dev-with-versions

Removed params checker for optimization

Author: cheprasov

src/RedisClient/Command/Parameter/Parameter.php

@@ -24,12 +24,12 @@ public static function address($param) {
             $param = explode(':', trim($param), 2);
         }
         if (is_array($param)) {
-            if (isset($param[0]) && isset($param[1])) {
+            if (isset($param[0], $param[1])) {
                 return [
                     static::string($param[0]),
                     static::port($param[1]),
                 ];
-            } elseif (isset($param['ip']) && isset($param['port'])) {
+            } elseif (isset($param['ip'], $param['port'])) {
                 return [
                     static::string($param['ip']),
                     static::port($param['port']),
@@ -114,7 +114,7 @@ public static function bit($bit) {
      * @return string[]
      */
     public static function command($command) {
-        return preg_split('/\s+/', $command);
+        return explode(' ', $command);
     }
 
     /**

src/RedisClient/Command/Traits/Version2x6/ConnectionCommandsTrait.php

@@ -10,8 +10,6 @@
  */
 namespace RedisClient\Command\Traits\Version2x6;
 
-use RedisClient\Command\Parameter\Parameter;
-
 /**
  * Connection
  * @link http://redis.io/commands#connection
@@ -27,7 +25,7 @@ trait ConnectionCommandsTrait {
      * @return bool True
      */
     public function auth($password) {
-        return $this->returnCommand(['AUTH'], [Parameter::string($password)]);
+        return $this->returnCommand(['AUTH'], [$password]);
     }
 
     /**
@@ -39,7 +37,7 @@ public function auth($password) {
      * @return string Returns message
      */
     public function echoMessage($message) {
-        return $this->returnCommand(['ECHO'], [Parameter::string($message)]);
+        return $this->returnCommand(['ECHO'], [$message]);
     }
 
     /**
@@ -51,7 +49,7 @@ public function echoMessage($message) {
      * @return string Returns message
      */
     public function ping($message = null) {
-        return $this->returnCommand(['PING'], isset($message) ? [Parameter::string($message)] : null);
+        return $this->returnCommand(['PING'], isset($message) ? [$message] : null);
     }
 
     /**
@@ -74,7 +72,7 @@ public function quit() {
      * @return bool
      */
     public function select($db) {
-        return $this->returnCommand(['SELECT'], [Parameter::integer($db)]);
+        return $this->returnCommand(['SELECT'], [$db]);
     }
 
 }

src/RedisClient/Command/Traits/Version2x6/HashesCommandsTrait.php

@@ -31,10 +31,7 @@ trait HashesCommandsTrait {
      * not including specified but non existing fields.
      */
     public function hdel($key, $fields) {
-        return $this->returnCommand(['HDEL'], [
-            Parameter::key($key),
-            Parameter::keys($fields),
-        ]);
+        return $this->returnCommand(['HDEL'], [$key, (array) $fields]);
     }
 
     /**
@@ -48,10 +45,7 @@ public function hdel($key, $fields) {
      * @return int 1 if the hash contains field. 0 if the hash does not contain field, or key does not exist.
      */
     public function hexists($key, $field) {
-        return $this->returnCommand(['HEXISTS'], [
-            Parameter::key($key),
-            Parameter::key($field),
-        ]);
+        return $this->returnCommand(['HEXISTS'], [$key, $field]);
     }
 
     /**
@@ -66,10 +60,7 @@ public function hexists($key, $field) {
      * or nil when field is not present in the hash or key does not exist.
      */
     public function hget($key, $field) {
-        return $this->returnCommand(['HGET'], [
-            Parameter::key($key),
-            Parameter::key($field),
-        ]);
+        return $this->returnCommand(['HGET'], [$key, $field]);
     }
 
     /**
@@ -83,7 +74,7 @@ public function hget($key, $field) {
      * or an empty list when key does not exist.
      */
     public function hgetall($key) {
-        return $this->returnCommand(['HGETALL'], [Parameter::key($key)], ResponseParser::PARSE_ASSOC_ARRAY);
+        return $this->returnCommand(['HGETALL'], [$key], ResponseParser::PARSE_ASSOC_ARRAY);
     }
 
     /**
@@ -98,11 +89,7 @@ public function hgetall($key) {
      * @return int The value at field after the increment operation.
      */
     public function hincrby($key, $field, $increment) {
-        return $this->returnCommand(['HINCRBY'], [
-            Parameter::key($key),
-            Parameter::key($field),
-            Parameter::integer($increment),
-        ]);
+        return $this->returnCommand(['HINCRBY'], [$key, $field, $increment]);
     }
 
     /**
@@ -117,11 +104,7 @@ public function hincrby($key, $field, $increment) {
      * @return string The value of field after the increment.
      */
     public function hincrbyfloat($key, $field, $increment) {
-        return $this->returnCommand(['HINCRBYFLOAT'], [
-            Parameter::key($key),
-            Parameter::key($field),
-            Parameter::float($increment),
-        ]);
+        return $this->returnCommand(['HINCRBYFLOAT'], [$key, $field, $increment]);
     }
 
     /**
@@ -134,7 +117,7 @@ public function hincrbyfloat($key, $field, $increment) {
      * @return string[] List of fields in the hash, or an empty list when key does not exist.
      */
     public function hkeys($key) {
-        return $this->returnCommand(['HKEYS'], [Parameter::key($key)]);
+        return $this->returnCommand(['HKEYS'], [$key]);
     }
 
     /**
@@ -147,7 +130,7 @@ public function hkeys($key) {
      * @return int Number of fields in the hash, or 0 when key does not exist.
      */
     public function hlen($key) {
-        return $this->returnCommand(['HLEN'], [Parameter::key($key)]);
+        return $this->returnCommand(['HLEN'], [$key]);
     }
 
     /**
@@ -161,10 +144,7 @@ public function hlen($key) {
      * @return array List of values associated with the given fields, in the same order as they are requested.
      */
     public function hmget($key, $fields) {
-        return $this->returnCommand(['HMGET'], [
-            Parameter::key($key),
-            Parameter::keys($fields),
-        ]);
+        return $this->returnCommand(['HMGET'], [$key, (array) $fields]);
     }
 
     /**
@@ -176,10 +156,7 @@ public function hmget($key, $fields) {
      * @return bool True
      */
     public function hmset($key, array $fieldValues) {
-        return $this->returnCommand(['HMSET'], [
-            Parameter::key($key),
-            Parameter::assocArray($fieldValues),
-        ]);
+        return $this->returnCommand(['HMSET'], [$key, Parameter::assocArray($fieldValues)]);
     }
 
     /**
@@ -195,11 +172,7 @@ public function hmset($key, array $fieldValues) {
      * 0 if field already exists in the hash and the value was updated.
      */
     public function hset($key, $field, $value) {
-        return $this->returnCommand(['HSET'], [
-            Parameter::key($key),
-            Parameter::key($field),
-            Parameter::string($value),
-        ]);
+        return $this->returnCommand(['HSET'], [$key, $field, $value]);
     }
 
     /**
@@ -214,11 +187,7 @@ public function hset($key, $field, $value) {
      * 0 if field already exists in the hash and no operation was performed.
      */
     public function hsetnx($key, $field, $value) {
-        return $this->returnCommand(['HSETNX'], [
-            Parameter::key($key),
-            Parameter::key($field),
-            Parameter::string($value),
-        ]);
+        return $this->returnCommand(['HSETNX'], [$key, $field, $value]);
     }
 
     /**
@@ -231,7 +200,7 @@ public function hsetnx($key, $field, $value) {
      * @return string[] List of values in the hash, or an empty list when key does not exist.
      */
     public function hvals($key) {
-        return $this->returnCommand(['HVALS'], [Parameter::key($key)]);
+        return $this->returnCommand(['HVALS'], [$key]);
     }
 
 }