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

Added Server Commands Test

Author: cheprasov

src/RedisClient/Command/Response/ResponseParser.php

@@ -17,6 +17,7 @@ class ResponseParser {
     const PARSE_TIME        = 3;
     const PARSE_INFO        = 4;
     const PARSE_GEO_ARRAY   = 5;
+    const PARSE_CLIENT_LIST = 6;
 
     /**
      * @param int $type
@@ -35,6 +36,8 @@ public static function parse($type, $response) {
                 return self::parseInfo($response);
             case self::PARSE_GEO_ARRAY:
                 return self::parseGeoArray($response);
+            case self::PARSE_CLIENT_LIST:
+                return self::parseClientList($response);
             default:
                 return $response;
         }
@@ -55,6 +58,30 @@ public static function parseAssocArray($response) {
         return $array;
     }
 
+    /**
+     * @param string[] $response
+     * @return array
+     */
+    public static function parseClientList($response) {
+        if (!is_string($response)) {
+            return $response;
+        }
+        $array = [];
+        foreach (explode("\n", $response) as $client) {
+            $c = [];
+            foreach (explode(' ', $client) as $param) {
+                $args = explode('=', $param, 2);
+                if (isset($args[0], $args[1]) && ($key = trim($args[0]))) {
+                    $c[$key] = trim($args[1]);
+                }
+            }
+            if ($c) {
+                $array[] = $c;
+            }
+        }
+        return $array;
+    }
+
     /**
      * @param string[] $response
      * @return array

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

@@ -20,6 +20,7 @@ trait CommandsTrait {
     use HashesCommandsTrait;
     use KeysCommandsTrait;
     use ListsCommandsTrait;
+    use PubSubCommandsTrait;
     use ScriptingCommandsTrait;
     use ServerCommandsTrait;
     use SetsCommandsTrait;

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

@@ -95,7 +95,7 @@ public function clientKill($addr = null, $clientId = null, $type = null, $addr2
      * @return string
      */
     public function clientList() {
-        return $this->returnCommand(['CLIENT', 'LIST']);
+        return $this->returnCommand(['CLIENT', 'LIST'], null, ResponseParser::PARSE_CLIENT_LIST);
     }
 
     /**

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

@@ -137,6 +137,20 @@ public function getrange($key, $start, $end) {
         return $this->returnCommand(['GETRANGE'], [$key, $start, $end]);
     }
 
+    /**
+     * SUBSTR key start end
+     * @deprecated
+     * @see StringsCommandsTrait::getrange
+     *
+     * @param string $key
+     * @param int $start
+     * @param int $end
+     * @return string
+     */
+    public function substr($key, $start, $end) {
+        return $this->returnCommand(['SUBSTR'], [$key, $start, $end]);
+    }
+
     /**
      * GETSET key value
      * Available since 1.0.0.

src/RedisClient/Command/Traits/Version2x8/CommandsTrait.php

@@ -26,6 +26,7 @@ trait CommandsTrait {
     use KeysCommandsTrait;
     use LatencyCommandsTrait;
     use ListsCommandsTrait;
+    use PubSubCommandsTrait;
     use ScriptingCommandsTrait;
     use ServerCommandsTrait;
     use SetsCommandsTrait;

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

@@ -10,15 +10,15 @@
  */
 namespace RedisClient\Command\Traits\Version2x8;
 
-use RedisClient\Command\Traits\Version2x6\HashesCommandsTrait as HashesCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\HashesCommandsTrait as HashesCommandsTraitVersion2x6;
 
 /**
  * trait HashesCommandsTrait
  * @link http://redis.io/commands#hash
  */
 trait HashesCommandsTrait {
 
-    use HashesCommandsTraitVersion26;
+    use HashesCommandsTraitVersion2x6;
 
     /**
      * HSCAN key cursor [MATCH pattern] [COUNT count]

src/RedisClient/Command/Traits/Version2x8/HyperLogLogCommandsTrait.php

@@ -58,4 +58,32 @@ public function pfmerge($destkey, $sourcekeys) {
         return $this->returnCommand(['PFMERGE'], [$destkey, (array) $sourcekeys]);
     }
 
+//    /**
+//     * PFDEBUG <subcommand> <key> ... args ...
+//     * Available since 2.8.9.
+//     * @link http://download.redis.io/redis-stable/src/hyperloglog.c
+//     * @debug
+//     * @deprecated only for debug
+//     *
+//     * @param string $subcommand GETREG|DECODE|ENCODING|TODENSE
+//     * @param string $key
+//     * @return mixed
+//     */
+//    public function pfdebug($subcommand, $key) {
+//        return $this->returnCommand(['PFDEBUG'], [$subcommand, $key]);
+//    }
+
+//    /**
+//     * PFSELFTEST
+//     * Available since 2.8.9.
+//     * @link http://download.redis.io/redis-stable/src/hyperloglog.c
+//     * @debug
+//     * @deprecated only for debug
+//     *
+//     * @return mixed
+//     */
+//    public function pfselftest() {
+//        return $this->returnCommand(['PFSELFTEST']);
+//    }
+
 }

src/RedisClient/Command/Traits/Version2x8/KeysCommandsTrait.php

@@ -10,14 +10,14 @@
  */
 namespace RedisClient\Command\Traits\Version2x8;
 
-use RedisClient\Command\Traits\Version2x6\KeysCommandsTrait as KeysCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\KeysCommandsTrait as KeysCommandsTraitVersion2x6;
 
 /**
  * trait KeysCommandsTrait
  */
 trait KeysCommandsTrait {
 
-    use KeysCommandsTraitVersion26;
+    use KeysCommandsTraitVersion2x6;
 
     /**
      * SCAN cursor [MATCH pattern] [COUNT count]

src/RedisClient/Command/Traits/Version2x8/PubSubCommandsTrait.php

@@ -10,15 +10,15 @@
  */
 namespace RedisClient\Command\Traits\Version2x8;
 
-use RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait as PubSubCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait as PubSubCommandsTraitVersion2x6;
 
 /**
  * PubSub
  * @link http://redis.io/commands#pubsub
  */
 trait PubSubCommandsTrait {
 
-    use PubSubCommandsTraitVersion26;
+    use PubSubCommandsTraitVersion2x6;
 
     /**
      * PUBSUB subcommand [argument [argument ...]]

src/RedisClient/Command/Traits/Version2x8/ServerCommandsTrait.php

@@ -11,11 +11,11 @@
 namespace RedisClient\Command\Traits\Version2x8;
 
 use RedisClient\Command\Parameter\Parameter;
-use RedisClient\Command\Traits\Version2x6\ServerCommandsTrait as ServerCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\ServerCommandsTrait as ServerCommandsTraitVersion2x6;
 
 trait ServerCommandsTrait {
 
-    use ServerCommandsTraitVersion26;
+    use ServerCommandsTraitVersion2x6;
 
     /**
      * COMMAND
@@ -50,15 +50,15 @@ public function commandCount() {
      * @return string[] List of keys from your command.
      */
     public function commandGetkeys($command) {
-        return $this->returnCommand(['COMMAND', 'GETKEYS'], [Parameter::command($command)]);
+        return $this->returnCommand(['COMMAND', 'GETKEYS'], Parameter::command($command));
     }
 
     /**
      * COMMAND INFO command-name [command-name ...]
      * Available since 2.8.13.
      * Time complexity: O(N) when N is number of commands to look up
      *
-     * @param string[] $commandNames
+     * @param string|string[] $commandNames
      * @return array Nested list of command details.
      */
     public function commandInfo($commandNames) {

src/RedisClient/Command/Traits/Version2x8/SetsCommandsTrait.php

@@ -10,11 +10,11 @@
  */
 namespace RedisClient\Command\Traits\Version2x8;
 
-use RedisClient\Command\Traits\Version2x6\SetsCommandsTrait as SetsCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\SetsCommandsTrait as SetsCommandsTraitVersion2x6;
 
 trait SetsCommandsTrait {
 
-    use SetsCommandsTraitVersion26;
+    use SetsCommandsTraitVersion2x6;
 
     /**
      * SSCAN key cursor [MATCH pattern] [COUNT count]

src/RedisClient/Command/Traits/Version2x8/SortedSetsCommandsTrait.php

@@ -11,15 +11,15 @@
 namespace RedisClient\Command\Traits\Version2x8;
 
 use RedisClient\Command\Parameter\Parameter;
-use RedisClient\Command\Traits\Version2x6\SortedSetsCommandsTrait as SortedSetsCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\SortedSetsCommandsTrait as SortedSetsCommandsTraitVersion2x6;
 
 /**
  * trait SortedSetsCommandsTrait
  * @link http://redis.io/topics/data-types#sorted-sets
  */
 trait SortedSetsCommandsTrait {
 
-    use SortedSetsCommandsTraitVersion26;
+    use SortedSetsCommandsTraitVersion2x6;
 
     /**
      * ZLEXCOUNT key min max

src/RedisClient/Command/Traits/Version2x8/StringsCommandsTrait.php

@@ -10,11 +10,11 @@
  */
 namespace RedisClient\Command\Traits\Version2x8;
 
-use RedisClient\Command\Traits\Version2x6\StringsCommandsTrait as StringsCommandsTraitVersion26;
+use RedisClient\Command\Traits\Version2x6\StringsCommandsTrait as StringsCommandsTraitVersion2x6;
 
 trait StringsCommandsTrait {
 
-    use StringsCommandsTraitVersion26;
+    use StringsCommandsTraitVersion2x6;
 
     /**
      * BITPOS key bit [start] [end]

src/RedisClient/Command/Traits/Version2x9/ServerCommandsTrait.php

@@ -10,10 +10,10 @@
  */
 namespace RedisClient\Command\Traits\Version2x9;
 
-use RedisClient\Command\Traits\Version2x8\ServerCommandsTrait as ServerCommandsTraitVersion28;
+use RedisClient\Command\Traits\Version2x8\ServerCommandsTrait as ServerCommandsTraitVersion2x8;
 trait ServerCommandsTrait {
 
-    use ServerCommandsTraitVersion28;
+    use ServerCommandsTraitVersion2x8;
 
     /**
      * CLIENT PAUSE timeout

src/RedisClient/Command/Traits/Version3x0/CommandsTrait.php

@@ -16,6 +16,7 @@
 use RedisClient\Command\Traits\Version2x6\ListsCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\LatencyCommandsTrait;
+use RedisClient\Command\Traits\Version2x8\PubSubCommandsTrait;
 use RedisClient\Command\Traits\Version2x9\ServerCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\SetsCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\StringsCommandsTrait;
@@ -33,6 +34,7 @@ trait CommandsTrait {
     use KeysCommandsTrait;
     use LatencyCommandsTrait;
     use ListsCommandsTrait;
+    use PubSubCommandsTrait;
     use ScriptingCommandsTrait;
     use ServerCommandsTrait;
     use SetsCommandsTrait;

src/RedisClient/Command/Traits/Version3x0/KeysCommandsTrait.php

@@ -10,14 +10,14 @@
  */
 namespace RedisClient\Command\Traits\Version3x0;
 
-use RedisClient\Command\Traits\Version2x8\KeysCommandsTrait as KeysCommandsTraitVersion28;
+use RedisClient\Command\Traits\Version2x8\KeysCommandsTrait as KeysCommandsTraitVersion2x8;
 
 /**
  * trait KeysCommandsTrait
  */
 trait KeysCommandsTrait {
 
-    use KeysCommandsTraitVersion28;
+    use KeysCommandsTraitVersion2x8;
 
     /**
      * EXISTS key [key ...]

src/RedisClient/Command/Traits/Version3x2/CommandsTrait.php

@@ -12,6 +12,7 @@
 
 use RedisClient\Command\Traits\AbstractCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\LatencyCommandsTrait;
+use RedisClient\Command\Traits\Version2x8\PubSubCommandsTrait;
 use RedisClient\Command\Traits\Version3x0\ClusterCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\ConnectionCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\HyperLogLogCommandsTrait;
@@ -35,6 +36,7 @@ trait CommandsTrait {
     use KeysCommandsTrait;
     use LatencyCommandsTrait;
     use ListsCommandsTrait;
+    use PubSubCommandsTrait;
     use ScriptingCommandsTrait;
     use ServerCommandsTrait;
     use SetsCommandsTrait;

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

@@ -10,15 +10,15 @@
  */
 namespace RedisClient\Command\Traits\Version3x2;
 
-use RedisClient\Command\Traits\Version2x8\HashesCommandsTrait as HashesCommandsTraitVersion28;
+use RedisClient\Command\Traits\Version2x8\HashesCommandsTrait as HashesCommandsTraitVersion2x8;
 
 /**
  * trait HashesCommandsTrait
  * @link http://redis.io/commands#hash
  */
 trait HashesCommandsTrait {
 
-    use HashesCommandsTraitVersion28;
+    use HashesCommandsTraitVersion2x8;
 
     /**
      * HSTRLEN key field

src/RedisClient/Command/Traits/Version3x2/SetsCommandsTrait.php

@@ -10,11 +10,11 @@
  */
 namespace RedisClient\Command\Traits\Version3x2;
 
-use RedisClient\Command\Traits\Version2x8\SetsCommandsTrait as SetsCommandsTraitVersion28;
+use RedisClient\Command\Traits\Version2x8\SetsCommandsTrait as SetsCommandsTraitVersion2x8;
 
 trait SetsCommandsTrait {
 
-    use SetsCommandsTraitVersion28;
+    use SetsCommandsTraitVersion2x8;
 
     /**
      * SPOP key [count]