Merge pull request #55 from cheprasov/v170

Added support for Redis-4.0.0

Author: cheprasov

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGELOG
 
+### v1.7.0 (2017-07-22)
+- The client was checked with Redis-4.0.0
+- The client uses last stable redis version (Redis-4.0.0) by default.
+- Deprecated client's methods: **executeRawString**, **parseRawString**
+
 ### v1.6.1 (2017-02-04)
 - Added check for empty data on reading response.
 - Fixed some tests.

README.md

@@ -1,7 +1,7 @@
 [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
 [![Latest Stable Version](https://poser.pugx.org/cheprasov/php-redis-client/v/stable)](https://packagist.org/packages/cheprasov/php-redis-client)
 [![Total Downloads](https://poser.pugx.org/cheprasov/php-redis-client/downloads)](https://packagist.org/packages/cheprasov/php-redis-client)
-# RedisClient v1.6.1 for PHP >= 5.5
+# RedisClient v1.7.0 for PHP >= 5.5
 
 ## About
 RedisClient is a fast, fully-functional and user-friendly client for Redis, optimized for performance. RedisClient supports the latest versions of Redis starting from __2.6__ to __4.0__
@@ -16,8 +16,8 @@ RedisClient is a fast, fully-functional and user-friendly client for Redis, opti
 - 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.
 - By default, the client works with the latest stable version of Redis (3.2).
-- Client was tested on the next versions of Redis: 2.6.17, 2.8.24, 3.0.7, 3.2.8, 4.0 RC2 (and other).
-- Also, Client was tested on PHP 5.5, 5.6, 7.0, 7.1, HHVM.
+- The client was tested on the next latest versions of Redis: 2.6.17, 2.8.24, 3.0.7, 3.2.8, 4.0.0.
+- Also, the client was tested on PHP 5.5, 5.6, 7.0, 7.1, HHVM.
 
 ## Usage
 

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cheprasov/php-redis-client",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Php client for Redis. It is a fast, fully-functional and user-friendly client for Redis, optimized for performance. RedisClient supports the latest versions of Redis starting from 2.6 to 4.0",
   "homepage": "http://github.com/cheprasov/php-redis-client",
   "minimum-stability": "stable",

examples/raw_commands.php

@@ -29,7 +29,7 @@
 $Redis->executeRaw(['SET', 'foo', 'bar']);
 echo 'result: '. $Redis->executeRaw(['GET', 'foo']) .PHP_EOL; // bar
 
-// Example 2. As string by <executeRawString>
+// DEPRECATED Example 2. As string by <executeRawString>
 // It is better to use executeRaw from example 1.
 $Redis->executeRawString('SET foo bar');
 echo 'result: '. $Redis->executeRawString('GET foo') .PHP_EOL; // bar

src/RedisClient/Client/AbstractRedisClient.php

@@ -26,7 +26,7 @@
 
 abstract class AbstractRedisClient {
 
-    const VERSION = '1.6.1';
+    const VERSION = '1.7.0';
 
     const CONFIG_SERVER   = 'server';
     const CONFIG_TIMEOUT  = 'timeout';

src/RedisClient/ClientFactory.php

@@ -25,7 +25,7 @@ class ClientFactory {
     const REDIS_VERSION_3x0 = '3.0';
     const REDIS_VERSION_3x2 = '3.2';
     const REDIS_VERSION_4x0 = '4.0';
-    const REDIS_VERSION_DEFAULT = self::REDIS_VERSION_3x2;
+    const REDIS_VERSION_DEFAULT = self::REDIS_VERSION_4x0;
 
     /**
      * @var string|null

tests/Integration/RedisVersionTest.php

@@ -27,9 +27,8 @@ class RedisVersionTest extends \PHPUnit_Framework_TestCase {
         [TEST_REDIS_SERVER_3x0_2, '3.0', '3.0.x'],
         [TEST_REDIS_SERVER_3x2_1, '3.2', '3.2.x'],
         [TEST_REDIS_SERVER_3x2_2, '3.2', '3.2.x'],
-        // only for stable versions
-        //[TEST_REDIS_SERVER_4x0_1, '4.0', '4.0.x'],
-        //[TEST_REDIS_SERVER_4x0_2, '4.0', '4.0.x'],
+        [TEST_REDIS_SERVER_4x0_1, '4.0', '4.0.x'],
+        [TEST_REDIS_SERVER_4x0_2, '4.0', '4.0.x'],
     ];
 
     /**

tests/Integration/Version4x0/GeoCommandsTest.php

@@ -10,8 +10,40 @@
  */
 namespace Test\Integration\Version4x0;
 
+use RedisClient\Exception\ErrorResponseException;
+
 include_once(__DIR__ . '/../Version3x2/GeoCommandsTest.php');
 
 class GeoCommandsTest extends \Test\Integration\Version3x2\GeoCommandsTest {
 
+    /**
+     * @see \RedisClient\Command\Traits\Version3x2\GeoCommandsTrait::geohash
+     */
+    public function test_geohash() {
+        $Redis = static::$Redis;
+
+        $this->assertSame(2, $Redis->geoadd('Sicily', [
+            'Palermo' => ['13.361389', '38.115556'],
+            'Catania' => ['15.087269', '37.502669']
+        ]));
+
+        $this->assertSame(['sqc8b49rny0'], $Redis->geohash('Sicily', ['Palermo']));
+        $this->assertSame(['sqc8b49rny0', 'sqdtr74hyu0'], $Redis->geohash('Sicily', ['Palermo', 'Catania']));
+        $this->assertSame(['sqdtr74hyu0'], $Redis->geohash('Sicily', ['Catania']));
+        $this->assertSame([null], $Redis->geohash('Sicily', ['foo']));
+        $this->assertSame([null, 'sqc8b49rny0'], $Redis->geohash('Sicily', ['foo', 'Palermo']));
+        $this->assertSame([null, 'sqc8b49rny0', null], $Redis->geohash('Sicily', ['foo', 'Palermo', 'bar']));
+        $this->assertSame(['sqc8b49rny0', 'sqc8b49rny0'], $Redis->geohash('Sicily', ['Palermo', 'Palermo']));
+
+        $this->assertSame([null], $Redis->geohash('foo', ['a']));
+        $this->assertSame([null, null, null], $Redis->geohash('foo', ['a', 'b', 'c']));
+
+        $this->assertSame(null, $Redis->geodist('Sicily', 'Catania', 'foo', 'ft'));
+        $this->assertSame(null, $Redis->geodist('Sicily', 'bar', 'foo'));
+
+        $Redis->set('foo', 'bar');
+        $this->setExpectedException(ErrorResponseException::class);
+        $Redis->geodist('foo', 'bar', 'foo');
+    }
+
 }

tests/Integration/Version4x0/ServerCommandsTest.php

@@ -41,7 +41,7 @@ public function test_flushdb() {
     public function test_commandCount() {
         $Redis = static::$Redis;
 
-        $this->assertSame(178, $Redis->commandCount());
+        $this->assertSame(180, $Redis->commandCount());
     }
 
     /**
@@ -68,6 +68,8 @@ public function test_command() {
             'debug',
             'echo',
             'eval',
+            'georadius_ro',
+            'georadiusbymember_ro',
             'host:',
             'latency',
             'memory',