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

v1.1.0

Author: cheprasov

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cheprasov/php-redis-client",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Php client for Redis",
   "homepage": "http://github.com/cheprasov/php-redis-client",
   "minimum-stability": "stable",

src/RedisClient/Client/AbstractRedisClient.php

@@ -18,10 +18,9 @@
 use RedisClient\Protocol\ProtocolInterface;
 use RedisClient\Protocol\RedisProtocol;
 
-
 abstract class AbstractRedisClient {
 
-    const VERSION = '1.0.0';
+    const VERSION = '1.1.0';
 
     const CONFIG_SERVER = 'server';
     const CONFIG_TIMEOUT = 'timeout';

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

@@ -21,7 +21,7 @@ trait ServerCommandsTrait {
      * Time complexity: O(1)
      *
      * @param int $timeout
-     * @return true The command returns True or an error if the timeout is invalid.
+     * @return bool The command returns True or an error if the timeout is invalid.
      */
     public function clientPause($timeout) {
         return $this->returnCommand(['CLIENT', 'PAUSE'], [$timeout]);

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

@@ -18,8 +18,6 @@
 use RedisClient\Command\Traits\Version2x8\HyperLogLogCommandsTrait;
 use RedisClient\Command\Traits\Version3x0\KeysCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\ListsCommandsTrait;
-use RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait;
-use RedisClient\Command\Traits\Version2x9\ServerCommandsTrait;
 use RedisClient\Command\Traits\Version3x0\SortedSetsCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\StringsCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\TransactionsCommandsTrait;

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

@@ -0,0 +1,36 @@
+<?php
+/**
+ * This file is part of RedisClient.
+ * git: https://github.com/cheprasov/php-redis-client
+ *
+ * (C) Alexander Cheprasov <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace RedisClient\Command\Traits\Version3x2;
+
+use RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait as ScriptingCommandsTraitVersion2x6;
+
+/**
+ * trait ScriptingCommandsTrait
+ * @link http://redis.io/commands#hash
+ */
+trait ScriptingCommandsTrait {
+
+    use ScriptingCommandsTraitVersion2x6;
+
+    /**
+     * SCRIPT DEBUG YES|SYNC|NO
+     * Available since 3.2.0.
+     * Time complexity: O(1)
+     * @link http://redis.io/commands/script-debug
+     *
+     * @param string $param YES|SYNC|NO
+     * @return
+     */
+    public function scriptDebug($param) {
+        return $this->returnCommand(['SCRIPT', 'DEBUG'], [$param]);
+    }
+
+}

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

@@ -0,0 +1,30 @@
+<?php
+/**
+ * This file is part of RedisClient.
+ * git: https://github.com/cheprasov/php-redis-client
+ *
+ * (C) Alexander Cheprasov <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace RedisClient\Command\Traits\Version3x2;
+
+use RedisClient\Command\Traits\Version2x9\ServerCommandsTrait as ServerCommandsTraitVersion2x9;
+trait ServerCommandsTrait {
+
+    use ServerCommandsTraitVersion2x9;
+
+    /**
+     * CLIENT REPLY ON|OFF|SKIP
+     * Available since 3.2.
+     * Time complexity: O(1)
+     *
+     * @param string $param
+     * @return bool|null
+     */
+    public function clientReply($param) {
+        return $this->returnCommand(['CLIENT', 'REPLY'], [$param]);
+    }
+
+}

src/RedisClient/Pipeline/Version/Pipeline3x2.php

@@ -282,6 +282,12 @@
  * Hashes
  * @method Pipeline3x2 hstrlen($key, $field)
  *
+ * Scripting
+ * @method Pipeline3x2 scriptDebug($param)
+ *
+ * Server
+ * @method Pipeline3x2 clientReply($param)
+ *
  * Sets
  * @method Pipeline3x2 spop($key, $count = null)
  * 

tests/Build/VersionTest.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * This file is part of RedisClient.
+ * git: https://github.com/cheprasov/php-redis-client
+ *
+ * (C) Alexander Cheprasov <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Test\Build;
+
+use RedisClient\Client\AbstractRedisClient;
+
+class VersionTest extends \PHPUnit_Framework_TestCase {
+
+    public function test_version() {
+        chdir(__DIR__.'/../../');
+        $composer = json_decode(file_get_contents('./composer.json'), true);
+
+        $this->assertSame(true, isset($composer['version']));
+        $this->assertSame(AbstractRedisClient::VERSION, $composer['version']);
+    }
+
+}

tests/Integration/Version3x2/ScriptingCommandsTest.php

@@ -22,6 +22,11 @@ class ScriptingCommandsTest extends ScriptingCommandsTestVersion3x0 {
 
     const TEST_REDIS_SERVER_1 = TEST_REDIS_SERVER_3x2_1;
 
+    /**
+     * @var RedisClient3x2;
+     */
+    protected static $Redis;
+
     /**
      * @inheritdoc
      */
@@ -31,4 +36,14 @@ public static function setUpBeforeClass() {
             'timeout' => 2,
         ]);
     }
+
+    /**
+     * @see ScriptingCommandsTrait::scriptDebug
+     */
+    public function test_scriptDebug() {
+        $Redis = static::$Redis;
+        $this->assertSame(true, $Redis->scriptDebug('SYNC'));
+        $this->assertSame(true, $Redis->scriptDebug('YES'));
+        $this->assertSame(true, $Redis->scriptDebug('NO'));
+    }
 }