Added Support Redis v 5

Author: cheprasov

.travis.yml

@@ -7,6 +7,7 @@ php:
   - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
   - hhvm
 
 matrix:
@@ -35,6 +36,8 @@ before_install:
         -p 127.0.0.1:6388:6388 \
         -p 127.0.0.1:6389:6389 \
         -p 127.0.0.1:6390:6390 \
+        -p 127.0.0.1:6391:6391 \
+        -p 127.0.0.1:6392:6392 \
         cheprasov/redis-for-tests
 
    - |

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGELOG
 
+### v1.9.0 (2019-07-16)
+- Support Redis 5
+- Added stream commands: XACK, XADD, XCLAIM, XDEL, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREAD, XREADGROUP, XREVRANGE, XTRIM.
+- Added server commands: LOLWUT, REPLICAOF
+- Added sorted sets commands: BZPOPMAX, BZPOPMIN, ZPOPMAX, ZPOPMIN
+- The client was checked with Redis-5.0.5, Redis-4.0.14 and older versions
+
 ### v1.8.0 (2018-03-08)
 - Added configuration for connection: timeout & flags.
 

COMMANDS.md

@@ -302,4 +302,35 @@
 ### Server
 - [flushall($async = false)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version4x0/ServerCommandsTrait.php)
 - [flushdb($async = false)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version4x0/ServerCommandsTrait.php)
+## Redis version 5.0
+
+### Server
+- [lolwut($param1 = null, $param2 = null, $param3 = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/ServerCommandsTrait.php)
+- [replicaof($host, $port)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/ServerCommandsTrait.php)
+
+### SortedSets
+- [bzpopmax($keys, $timeout = 0)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/SortedSetsCommandsTrait.php)
+- [bzpopmin($keys, $timeout = 0)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/SortedSetsCommandsTrait.php)
+- [zpopmax($key, $count = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/SortedSetsCommandsTrait.php)
+- [zpopmin($key, $count = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/SortedSetsCommandsTrait.php)
+
+### Streams
+- [xack($key, $group, $ids)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xadd($key, $id, $fieldStrings, $maxlen = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xclaim($key, $group, $consumer, $minIdleTime, $ids, $idle = null, $time = null, $retrycount = null, $force = false, $justid = false)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xdel($key, $ids)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xgroupCreate($key, $groupname, $id)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xgroupSetid($key, $groupname, $id)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xgroupDestroy($key, $groupname)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xgroupDelconsumer($key, $groupname, $consumername)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xgroupHelp()](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xinfo($consumersKey = null, $consumersGroup = null, $groupsKey = null, $streamKey = null, $help = false)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xlen($key)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xpending($key, $group, $start = null, $end = null, $count = null, $consumer = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xrange($key, $start, $end, $count = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xread($keys, $ids, $count = null, $block = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xreadgroup($group, $consumer, $keys, $ids, $noack = false, $count = null, $block = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xrevrange($key, $end, $start, $count = null)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xtrim($key, $count, $withTilde = false)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
+- [xsetid($stream, $groupname, $id)](https://github.com/cheprasov/php-redis-client/blob/master/src/RedisClient/Command/Traits/Version5x0/StreamsCommandsTrait.php)
 

README.md

@@ -1,23 +1,23 @@
 [![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.8.0 for PHP >= 5.5
+# RedisClient v1.9.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__
+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 __5.0__
 
 ## Main features
-- Support Redis versions from __2.6.x__ to __4.0.x__.
+- Support Redis versions from __2.6.x__ to __5.0.x__.
 - Support __TCP/IP__ and __UNIX__ sockets.
 - Support __PubSub__ and __Monitor__ functionallity.
 - Support __Pipeline__ and __Transactions__.
 - Support __Redis Cluster__.
 - Support __RAW__ commands 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.
-- By default, the client works with the latest stable version of Redis (4.0).
-- 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.10.
-- Also, the client was tested on PHP 5.5, 5.6, 7.0, 7.1, 7.2, HHVM.
+- By default, the client works with the latest stable version of Redis (5.0).
+- The client was tested on the next latest versions of Redis: `5.0.5`, `4.0.14`, `3.2.8`, `3.0.7`, `2.8.24`, `2.6.17`.
+- Also, the client was tested on PHP `7.3`, `7.2`, `7.1`, `7.0`, `5.6`, `5.5`, `HHVM`.
 
 ## Redis Commands
 

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cheprasov/php-redis-client",
-  "version": "1.8.0",
+  "version": "1.9.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",

phpunit.xml

@@ -43,6 +43,8 @@
         <const name="TEST_REDIS_SERVER_3x2_2" value="localhost:6388" />
         <const name="TEST_REDIS_SERVER_4x0_1" value="127.0.0.1:6389" />
         <const name="TEST_REDIS_SERVER_4x0_2" value="localhost:6390" />
+        <const name="TEST_REDIS_SERVER_5x0_1" value="127.0.0.1:6391" />
+        <const name="TEST_REDIS_SERVER_5x0_2" value="localhost:6392" />
 
         <const name="TEST_REDIS_SERVER_3x2_CLUSTER_A"  value="127.0.0.1:7001" />
         <const name="TEST_REDIS_SERVER_3x2_CLUSTER_A1" value="127.0.0.1:7004" />

src/RedisClient/Client/AbstractRedisClient.php

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

src/RedisClient/Client/Version/RedisClient5x0.php

@@ -0,0 +1,29 @@
+<?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\Client\Version;
+
+use RedisClient\Client\AbstractRedisClient;
+use RedisClient\Command\Traits\Version5x0\CommandsTrait;
+use RedisClient\Pipeline\PipelineInterface;
+use RedisClient\Pipeline\Version\Pipeline5x0;
+
+class RedisClient5x0 extends AbstractRedisClient {
+    use CommandsTrait;
+
+    /**
+     * @param \Closure|null $Pipeline
+     * @return PipelineInterface
+     */
+    protected function createPipeline(\Closure $Pipeline = null) {
+        return new Pipeline5x0($Pipeline);
+    }
+
+}

src/RedisClient/ClientFactory.php

@@ -15,6 +15,7 @@
 use RedisClient\Client\Version\RedisClient3x0;
 use RedisClient\Client\Version\RedisClient3x2;
 use RedisClient\Client\Version\RedisClient4x0;
+use RedisClient\Client\Version\RedisClient5x0;
 use RedisClient\Exception\ErrorException;
 use RedisClient\Exception\InvalidArgumentException;
 
@@ -25,7 +26,8 @@ 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_4x0;
+    const REDIS_VERSION_5x0 = '5.0';
+    const REDIS_VERSION_DEFAULT = self::REDIS_VERSION_5x0;
 
     /**
      * @var string|null
@@ -41,6 +43,7 @@ class ClientFactory {
         self::REDIS_VERSION_3x0 => RedisClient3x0::class,
         self::REDIS_VERSION_3x2 => RedisClient3x2::class,
         self::REDIS_VERSION_4x0 => RedisClient4x0::class,
+        self::REDIS_VERSION_5x0 => RedisClient5x0::class,
     ];
 
     /**
@@ -77,7 +80,7 @@ public static function setDefaultRedisVersion($version) {
 
     /**
      * @param null|array $config
-     * @return RedisClient2x6|RedisClient2x8|RedisClient3x0|RedisClient3x2|RedisClient4x0|RedisClient
+     * @return RedisClient2x6|RedisClient2x8|RedisClient3x0|RedisClient3x2|RedisClient4x0|RedisClient5x0|RedisClient
      */
     public static function create($config = null) {
         if (isset($config['version'])) {
@@ -89,7 +92,7 @@ public static function create($config = null) {
     /**
      * @param string $version
      * @param null|array $config
-     * @return RedisClient2x6|RedisClient2x8|RedisClient3x0|RedisClient3x2|RedisClient4x0
+     * @return RedisClient2x6|RedisClient2x8|RedisClient3x0|RedisClient3x2|RedisClient4x0|RedisClient5x0
      * @throws InvalidArgumentException
      */
     public static function createClientByVersion($version, $config = null) {

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

@@ -0,0 +1,58 @@
+<?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\Version5x0;
+
+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\Version2x8\HyperLogLogCommandsTrait;
+use RedisClient\Command\Traits\Version2x6\ListsCommandsTrait;
+use RedisClient\Command\Traits\Version2x6\TransactionsCommandsTrait;
+use RedisClient\Command\Traits\Version3x2\GeoCommandsTrait;
+use RedisClient\Command\Traits\Version3x2\HashesCommandsTrait;
+use RedisClient\Command\Traits\Version3x2\ScriptingCommandsTrait;
+use RedisClient\Command\Traits\Version3x2\SetsCommandsTrait;
+use RedisClient\Command\Traits\Version3x2\StringsCommandsTrait;
+use RedisClient\Command\Traits\Version4x0\ConnectionCommandsTrait;
+use RedisClient\Command\Traits\Version4x0\KeysCommandsTrait;
+use RedisClient\Command\Traits\Version4x0\MemoryCommandsTrait;
+
+trait CommandsTrait {
+
+    use AbstractCommandsTrait;
+
+    use ClusterCommandsTrait;
+    use ConnectionCommandsTrait;
+    use GeoCommandsTrait;
+    use HashesCommandsTrait;
+    use HyperLogLogCommandsTrait;
+    use KeysCommandsTrait;
+    use LatencyCommandsTrait;
+    use ListsCommandsTrait;
+    use MemoryCommandsTrait;
+    use PubSubCommandsTrait;
+    use ScriptingCommandsTrait;
+    use ServerCommandsTrait;
+    use SetsCommandsTrait;
+    use SortedSetsCommandsTrait;
+    use StreamsCommandsTrait;
+    use StringsCommandsTrait;
+    use TransactionsCommandsTrait;
+
+    /**
+     * @return string
+     */
+    public function getSupportedVersion() {
+        return '5.0';
+    }
+
+}