Merge pull request #32 from cheprasov/v1-2-0

v1.2.0

Author: cheprasov

CHANGELOG.md

@@ -0,0 +1,7 @@
+## CHANGELOG
+
+### v1.2.0 (2016-07-30)
+- Updated command __MIGRATE__ (Redis >= 3.2): many fixes to the variable number of arguments (new) mode using the KEYS option.
+
+### v1.1.0 (2016-01-26)
+Sorry, no any history before.

README.md

@@ -1,12 +1,12 @@
 [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
 
-# RedisClient v1.1.0 for PHP >= 5.5
+# RedisClient v1.2.0 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
 
 ## Main features
-- Support Redis versions from __2.6__ to __3.2-RC1__.
+- Support Redis versions from __2.6__ to __3.2.0-RC3__.
 - Support TCP/IP and UNIX sockets.
 - Support __PubSub__ and __monitor__ functionallity.
 - Support __pipeline__.

composer.json

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

src/RedisClient/Client/AbstractRedisClient.php

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

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

@@ -16,7 +16,6 @@
 use RedisClient\Command\Traits\Version3x0\ClusterCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\ConnectionCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\HyperLogLogCommandsTrait;
-use RedisClient\Command\Traits\Version3x0\KeysCommandsTrait;
 use RedisClient\Command\Traits\Version2x6\ListsCommandsTrait;
 use RedisClient\Command\Traits\Version3x0\SortedSetsCommandsTrait;
 use RedisClient\Command\Traits\Version2x8\StringsCommandsTrait;

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

@@ -0,0 +1,51 @@
+<?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\Version3x0\KeysCommandsTrait as KeysCommandsTraitVersion3x0;
+
+/**
+ * trait KeysCommandsTrait
+ */
+trait KeysCommandsTrait {
+
+    use KeysCommandsTraitVersion3x0;
+
+    /**
+     * MIGRATE host port key|"" destination-db timeout [COPY] [REPLACE] [KEYS key [key ...]]
+     * Available since 2.6.0.
+     * @link http://redis.io/commands/migrate
+     *
+     * @param string $host
+     * @param int $port
+     * @param string|string[] $keys
+     * @param int $destinationDb
+     * @param int $timeout In milliseconds
+     * @param bool $copy Available in 3.0 and are not available in 2.6 or 2.8
+     * @param bool $replace Available in 3.0 and are not available in 2.6 or 2.8
+     * @return bool The command returns True on success.
+     */
+    public function migrate($host, $port, $keys, $destinationDb, $timeout, $copy = false, $replace = false) {
+        $params = [$host, $port, is_string($keys) ? $keys : '', $destinationDb, $timeout];
+        if ($copy) {
+            $params[] = 'COPY';
+        }
+        if ($replace) {
+            $params[] = 'REPLACE';
+        }
+        if (is_array($keys)) {
+            $params[] = 'KEYS';
+            $params[] = $keys;
+        }
+        return $this->returnCommand(['MIGRATE'], $params);
+    }
+
+}

src/RedisClient/Pipeline/Version/Pipeline3x2.php

@@ -261,7 +261,7 @@
  *
  * Keys
  * @method Pipeline3x2 exists($keys)
- * @method Pipeline3x2 migrate($host, $port, $key, $destinationDb, $timeout, $copy = false, $replace = false)
+ * -method Pipeline3x2 migrate($host, $port, $key, $destinationDb, $timeout, $copy = false, $replace = false)
  * @method Pipeline3x2 restore($key, $ttl, $serializedValue, $replace = false)
  * @method Pipeline3x2 wait($numslaves, $timeout)
  *
@@ -282,6 +282,9 @@
  * Hashes
  * @method Pipeline3x2 hstrlen($key, $field)
  *
+ * Keys
+ * @method Pipeline3x2 migrate($host, $port, $keys, $destinationDb, $timeout, $copy = false, $replace = false)
+ *
  * Scripting
  * @method Pipeline3x2 scriptDebug($param)
  *

tests/Integration/Version3x2/KeysCommandsTest.php

@@ -153,4 +153,44 @@ public function test_object() {
         $this->assertSame('raw', $Redis->object('encoding', 'foo'));
     }
 
+    public function test_migrate() {
+        $Redis = static::$Redis;
+        $Redis2 = static::$Redis2;
+        $this->assertSame(true, $Redis2->flushall());
+
+        list(, $host, $port) = explode(':', str_replace('/', '', static::TEST_REDIS_SERVER_2), 3);
+
+        $this->assertSame(true, $Redis->set('one', 1));
+
+        $this->assertSame(null, $Redis2->get('one'));
+        $this->assertSame(true, $Redis->migrate($host, $port, 'one', 0, 100, true));
+        $this->assertSame('1', $Redis2->get('one'));
+        $this->assertSame('1', $Redis->get('one'));
+
+        $this->assertSame(true, $Redis->set('one', 11));
+
+        try {
+            $this->assertSame(true, $Redis->migrate($host, $port, 'one', 0, 100, true));
+            $this->assertFalse('Expect Exception');
+        } catch (\Exception $Ex) {
+            $this->assertInstanceOf(ErrorResponseException::class, $Ex);
+        }
+
+        $this->assertSame(true, $Redis->migrate($host, $port, 'one', 0, 100, false, true));
+        $this->assertSame('11', $Redis2->get('one'));
+        $this->assertSame(null, $Redis->get('one'));
+
+        $this->assertSame(true, $Redis->set('one', 1));
+        $this->assertSame(true, $Redis->set('two', 2));
+        $this->assertSame(true, $Redis->set('three', 3));
+
+        $this->assertSame(true, $Redis->migrate($host, $port, ['one', 'two', 'three'], 0, 100, false, true));
+        $this->assertSame('1', $Redis2->get('one'));
+        $this->assertSame(null, $Redis->get('one'));
+        $this->assertSame('2', $Redis2->get('two'));
+        $this->assertSame(null, $Redis->get('two'));
+        $this->assertSame('3', $Redis2->get('three'));
+        $this->assertSame(null, $Redis->get('three'));
+    }
+
 }