Merge pull request #35 from cheprasov/fix-cluster-bugs

fix some cluster bugs

Author: cheprasov

README.md

@@ -1,15 +1,15 @@
 [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
 
-# RedisClient v1.2.0 for PHP >= 5.5
+# RedisClient v1.2.1 for PHP >= 5.5
 
 ## About
-RedisClient is a fast, fully-functional and user-friendly client for Redis, optimized for performance. RedisClient supports latests versions of Redis starting from 2.6
+RedisClient is a fast, fully-functional and user-friendly client for Redis, optimized for performance. RedisClient supports latest versions of Redis starting from __2.6__
 
 ## Main features
 - Support Redis versions from __2.6__ to __3.2.0-RC3__.
 - Support TCP/IP and UNIX sockets.
-- Support __PubSub__ and __monitor__ functionallity.
-- Support __pipeline__.
+- Support __PubSub__ and __Monitor__ functionallity.
+- Support __Pipeline__ and __Transactions__.
 - Support RAW commands as strings `"SET foo bar"` or as arrays `['SET', 'foo', 'bar']`.
 - Connections to Redis are established lazily by the client upon the first command.
 - Easy to use with IDE, client has PHPDocs for all supported versions.
@@ -26,7 +26,7 @@ require (dirname(__DIR__).'/vendor/autoload.php');
 use RedisClient\RedisClient;
 use RedisClient\Client\Version\RedisClient2x6;
 
-// Create new Instance for Redis version 2.8.x with config via factory
+// Example 1. Create new Instance for Redis version 2.8.x with config via factory
 
 $Redis = ClientFactory::create([
     'server' => 'tcp://127.0.0.1:6379', // or 'unix:///tmp/redis.sock'
@@ -37,7 +37,19 @@ $Redis = ClientFactory::create([
 echo 'RedisClient: '. $Redis->getSupportedVersion() . PHP_EOL;
 // RedisClient: 2.8
 
-// Create new instance of client without factory
+
+// Example 2. Create new Instance for Redis version 2.6.x with config
+
+$Redis = new RedisClient2x6([
+    'server' => 'tcp://127.0.0.1:6379', // or 'unix:///tmp/redis.sock'
+    'timeout' => 2
+]);
+
+echo 'RedisClient: '. $Redis->getSupportedVersion() . PHP_EOL;
+// RedisClient: 2.6
+
+
+// Example 3. Create new instance of client without factory
 
 $Redis = new RedisClient([
     'server' => 'tcp://127.0.0.1:6379', // or 'unix:///tmp/redis.sock'

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cheprasov/php-redis-client",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Php client for Redis",
   "homepage": "http://github.com/cheprasov/php-redis-client",
   "minimum-stability": "stable",
@@ -20,7 +20,6 @@
     "php": ">=5.5"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.1.*",
-    "cheprasov/php-simple-profiler": "master-dev"
+    "phpunit/phpunit": "5.1.*"
   }
 }

src/RedisClient/Client/AbstractRedisClient.php

@@ -20,7 +20,7 @@
 
 abstract class AbstractRedisClient {
 
-    const VERSION = '1.2.0';
+    const VERSION = '1.2.1';
 
     const CONFIG_SERVER = 'server';
     const CONFIG_TIMEOUT = 'timeout';

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

@@ -39,7 +39,7 @@ public function clusterAddslots($slots) {
      * @return int The number of active failure reports for the node.
      */
     public function clusterCountFailureReports($nodeId) {
-        return $this->returnCommand(['PUBLISH'], [$nodeId]);
+        return $this->returnCommand(['CLUSTER', 'COUNT-FAILURE-REPORTS'], [$nodeId]);
     }
 
     /**
@@ -197,7 +197,7 @@ public function clusterReset($option = null) {
      * @return bool
      */
     public function clusterSaveconfig() {
-        return $this->returnCommand(['CLUSTER SAVECONFIG']);
+        return $this->returnCommand(['CLUSTER', 'SAVECONFIG']);
     }
 
     /**
@@ -226,7 +226,7 @@ public function clusterSetConfigEpoch($config) {
      */
     public function clusterSetslot($slot, $subcommand, $nodeId = null) {
         $params = [$slot, $subcommand];
-        if ($nodeId) {
+        if (isset($nodeId)) {
             $params[] = $nodeId;
         }
         return $this->returnCommand(['CLUSTER', 'SETSLOT'], $params);

src/RedisClient/Protocol/RedisProtocol.php

@@ -138,12 +138,10 @@ protected function read() {
         throw new UnknownTypeException('Unknown protocol type '. $type);
     }
 
-
     /**
      * @inheritdoc
      */
     public function send(array $structures) {
-        //echo str_replace(['\n','\r'], '-', json_encode($structures))." => ";
         $this->write($this->packProtocolArray($structures));
         return $response = $this->read();
     }