Fix deprecation when using "static" in callables (#1403)

* Be sure that position always have type integer

* Annotate properly return types for SPL interfaces implementation

It is allows avoiding deprecation messages from `symfony/error-handler` like a '[info] User Deprecated: Method "Iterator::rewind()" might add "void" as a native return type declaration in the future. Do the same in implementation "Predis\Collection\Iterator\CursorBasedIterator" now to avoid errors or add an explicit @return annotation to suppress this message.'

Fixed via `symfony/error-handler` patch script: ` SYMFONY_PATCH_TYPE_DECLARATIONS="force=phpdoc&php=5.3" ./vendor/bin/patch-type-declarations` and some additional manual work

Some details about why this is necessary and how checks with trigger deprecations works: https://wouterj.nl/2021/09/symfony-6-native-typing

.gitattributes

@@ -1,10 +1,15 @@
 * text=auto
 
-/tests export-ignore
+/tests/PHPUnit export-ignore
+/tests/Predis export-ignore
+/tests/bootstrap.php export-ignore
+/.github export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs export-ignore
+/.php_cs.dist export-ignore
 /.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
 /phpunit.xml.travisci export-ignore
+/CHANGELOG.md export-ignore
+/CONTRIBUTING.md export-ignore

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: tillkruss
+custom: "https://www.paypal.me/tillkruss"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Run command '...'
+2. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Versions (please complete the following information):**
+ - Predis: [e.g. 1.1.2]
+ - PHP [e.g. 8.0.0]
+ - Redis Server [e.g. 6.0.0]
+ - OS [e.g. Ubuntu 20.10]
+
+**Code sample**
+If applicable, a small snippet of code that reproduces the issue.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -2,6 +2,7 @@
 *.phar
 .php-version
 .php_cs.cache
+.phpunit.result.cache
 phpunit.xml
 package.xml
 composer.lock

.php_cs

@@ -1,34 +0,0 @@
-<?php
-
-$PREDIS_HEADER = <<<EOS
-This file is part of the Predis package.
-
-(c) Daniele Alessandri <suppakilla@gmail.com>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-EOS;
-
-Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($PREDIS_HEADER);
-
-return Symfony\CS\Config\Config::create()
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers(array(
-        // Symfony
-        '-unalign_equals',
-        '-unalign_double_arrow',
-
-        // Contribs
-        'header_comment',
-        'ordered_use',
-        'phpdoc_order',
-        'long_array_syntax',
-    ))
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
-            ->in(__DIR__.'/bin')
-            ->in(__DIR__.'/src')
-            ->in(__DIR__.'/tests')
-            ->in(__DIR__.'/examples')
-    );

.php_cs.dist

@@ -0,0 +1,33 @@
+<?php
+
+$PREDIS_HEADER = <<<EOS
+This file is part of the Predis package.
+
+(c) Daniele Alessandri <suppakilla@gmail.com>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOS;
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        'header_comment' => array(
+            'header' => $PREDIS_HEADER,
+        ),
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'binary_operator_spaces' => array(
+            'align_double_arrow' => false,
+            'align_equals' => false,
+        ),
+        'array_syntax' => array('syntax' => 'long'),
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__.'/bin')
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
+            ->in(__DIR__.'/examples')
+    );

.travis.yml

@@ -1,23 +1,36 @@
 language: php
-sudo: false
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+
 branches:
   except:
-    - v0.5
-    - v0.6
-    - v0.6-PHP_5.2
-    - documentation
-services: redis-server
+    - main
+    - v2.0
+
+before_install:
+  - docker run -d --rm -p 127.0.0.1:6379:6379 redis:3
+
 before_script:
+  - phpenv config-rm xdebug.ini
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
+
 script:
-  - vendor/bin/phpunit -c phpunit.xml.travisci
+  - travis_retry vendor/bin/phpunit -c phpunit.xml.travisci
+
 matrix:
   fast_finish: true
+  include:
+    - php: 5.3
+      dist: precise
+      services: redis-server
+      before_install: skip
+    - php: 5.4
+      dist: trusty
+    - php: 5.5
+      dist: trusty
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: 8.0

CHANGELOG.md

@@ -1,61 +1,144 @@
-v2.0.0 (201x-xx-xx)
+v1.1.10 (2022-01-05)
 ================================================================================
 
-- Accepted values for some client options have changed, this is the new list of
-  accepted values:
+- __FIX__: Avoid PHP 8.1 deprecation notices in `Session/Handler`
+- __FIX__: Fixed "Cannot use object of type Predis\Response\Error as array"
+error in `Connection/Aggregate/SentinelReplication`
 
-  - `aggregate`: callable returning an aggregate connection.
-  - `cluster`: string value (`predis`, `redis`), callable returning an aggregate
-    connection.
-  - `replication`: string value (`predis`, `sentinel`), callable returning an
-     aggregate connection.
-  - `commands`: command factory, named array mapping command IDs to PHP classes,
-    callable returning a command factory or a named array.
-  - `connections`: connection factory, callable returning a connection factory,
-    named array mapping connection schemes to PHP classes.
-  - `prefix`: string value, command processor, callable.
-  - `exceptions`: boolean.
 
-  Note that both the `cluster` and `replication` options now return a closure
-  acting as initializer instead of an aggregate connection instance.
+v1.1.9 (2021-10-05)
+================================================================================
 
-- Client option classes now live in the `Predis\Configuration\Option` namespace.
+- __FIX__: Fixed PHP 8.1 compatibility in `StreamConnection`
 
-- Classes for Redis commands have been moved into the new `Predis\Command\Redis`
-  namespace and each class name mirrors the respective Redis command ID.
 
-- The concept of server profiles is gone, the library now uses a single command
-  factory to create instances of commands classes. The `profile` option has been
-  replaced by the `commands` option accepting `Predis\Command\FactoryInterface`
-  to customize the underlying command factory. The default command factory class
-  used by Predis is `Predis\Command\RedisFactory` and it still allows developers
-  to define or override commands with their own implementations. In addition to
-  that, `Predis\Command\RedisFactory` relies on a convention-over-configuration
-  approach by looking for a suitable class with the same name as the command ID
-  in the `Predis\Command\Redis` when the internal class map does not contain a
-  class associated.
+v1.1.8 (2021-09-29)
+================================================================================
 
-- The method `Predis\Client::getClientFor($connectionID)` has been replaced by
-  `Predis\Client::on($connectionID, $callable = null)`. This new method returns
-  a new client instance for the specified node just like before when the second
-  argument is omitted, otherwise the callback is invoked and the new client is
-  passed to it. The value returned by the callback is used as the return value
-  of the "on()" method.
+- __FIX__: Ensure compatibility with PHP 8.1.
 
-- Changed the signature for the constructor of `Predis\Command\RawCommand`.
 
-- The `Predis\Connection\Aggregate` namespace has been split into two separate
-  namespaces for cluster backends (`Predis\Connection\Cluster`) and replication
-  backends (`Predis\Connection\Replication`).
+v1.1.7 (2021-04-04)
+================================================================================
 
-- The methods `switchToMaster()` and `switchToSlave()` have been promoted to be
-  part of `Predis\Connection\Replication\ReplicationInterface` while the method
-  `switchTo($connection)` has been removed from it.
+- __FIX__: with the phpiredis-based connection backends, failed pipelines led to
+spurious responses returned after reconnecting to Redis because the underlying
+reader was not properly reset by discarding buffered replies after disconnecting
+(ISSUE #363).
+- __FIX__: removed `cweagans/composer-patches` dev dependency and apply patches
+using `post-update-cmd` script.
 
-- The method `Predis\Connection\Cluster\PredisCluster::executeCommandOnNodes()`
-  has been removed as it is possible to achieve the same by iterating over the
-  connection or, even better, over the client instance in order to execute the
-  same command against all of the registered connections.
+
+v1.1.6 (2020-09-11)
+================================================================================
+
+- __FIX__: reverted support for sentinels authentication implemented in v1.1.5
+as it was bugged (see ISSUE #658), sorry for the trouble. This is now postponed
+as it requires a more thorough investigation.
+
+
+v1.1.5 (2020-09-10)
+================================================================================
+
+- __FIX__:~~authentication for sentinels is now supported, previously it was not
+possible to specify a `password` for sentinels as its value was stripped during
+initialization because sentinels did not support authentication until Redis 5.
+**Please note** that with the current implementation each sentinel must have
+its own `password` parameter set in the parameters list despite this password is
+the same for all sentinels (read how `requirepass` works on the Redis docs). In
+this case you should avoid using the global `parameters` client option used to
+set default parameters for every connection created by Predis as this would end
+up using the same password even when connecting to actual Redis nodes.~~
+
+- __FIX__: the username is now correctly retrieved from the userinfo fragment of
+the URI when using the "redis" scheme and a "username:password" pair is present.
+Values retrieved from the userinfo fragment always override the ones specified
+in `username` and `password` if those fields are present in the query string.
+
+- __FIX__: `Predis\Connection\WebdisConnection` was unable to connect to Webdis
+when using an IPv4 address in the URL and this is probably due to some change in
+cURL internals since the last time we tested it.
+
+- __FIX__: an exception is thrown whe passing `FALSE` or any value evaluating to
+`FALSE` to the `replication` client option. This was supposed to be unsupported,
+in fact it actually breaks client initialization and raises a PHP warning. Now
+the user is alerted with an `InvalidArgumentException` and a proper message.
+(PR #381).
+
+
+v1.1.4 (2020-08-31)
+================================================================================
+
+- Improved @method annotations for methods responding to Redis commands defined
+  by `Predis\ClientInterface` and `Predis\ClientContextInterface`. (PR #456 and
+  PR #497, other fixes applied after further analysys).
+
+- __FIX__: the client can now handle ACL authentication when connecting to Redis
+  6.x simply by passing both `username` and `password` to connection parameters.
+  See [the Redis docs](https://redis.io/topics/acl) for details on this topic.
+
+- __FIX__: NULL or zero-length string values passed to `password` and `database`
+  in the connection parameters list do not trigger spurious `AUTH` and `SELECT`
+  commands anymore when connecting to Redis (ISSUE #436).
+
+- __FIX__: initializing an iteration over a client instance when it is connected
+  to a standalone Redis server will not throw an exception anymore, instead it
+  will return an iterator that will run for just one loop returning a new client
+  instance using the underlying single-node connection (ISSUE #552, PR #556).
+
+- __FIX__: `Predis\Cluster\Distributor\HashRingaddNodeToRing()` was calculating
+  the hash required for distribution by using `crc32()` directly instead of the
+  method `Predis\Cluster\Hash\HashGeneratorInterface::hash()` implemented by the
+  class itself. This bug fix does not have any impact on existing clusters that
+  use client-side sharding based on this distributor simply because it does not
+  take any external hash generators so distribution is not going to be affected.
+
+- __FIX__: `SORT` now always trigger a switch to the master node in replication
+  configurations instead of just when the `STORE` modifier is specified, this is
+  because `SORT` is always considered to be a write operation and actually fails
+  with a `-READONLY` error response when executed against a replica node. (ISSUE
+  #554).
+
+
+v1.1.3 (2020-08-18)
+================================================================================
+
+- Ensure compatibility with PHP 8.
+
+- Moved repository from `github.com/nrk/predis` to `github.com/predis/predis`.
+
+- __FIX__: Moved `cweagans/composer-patches` dependency to `require-dev`.
+
+- __FIX__: Include PHPUnit `.patch` files in exports.
+
+
+v1.1.2 (2020-08-11)
+================================================================================
+
+- __FIX__: pure CRC16 implementation failed to calculate the correct hash when
+  the input value passed to the `hash()` method is an integer (PR #450).
+
+- __FIX__: make PHP iterator abstractions for `ZSCAN` and `HSCAN` working with
+  PHP 7.2 due to a breaking change, namely the removal of `each()` (PR #448).
+
+
+v1.1.1 (2016-06-16)
+================================================================================
+
+- __FIX__: `password` and `database` from the global `parameters` client option
+  were still being applied to sentinels connections making them fail (sentinels
+  do not understand the `AUTH` and `SELECT` commands) (PR #346).
+
+- __FIX__: when a sentinel instance reports no sentinel for a service, invoking
+  `connect()` on the redis-sentinel connection backend should fall back to the
+  master connection instead of failing (ISSUE #342).
+
+- __FIX__: the two connection backends based on ext-phpiredis has some kind of
+  issues with the GC and the internal use of closures as reader callbacks that
+  prevented connections going out of scope from being properly collected and the
+  underlying stream or socket resources from being closed and freed. This should
+  not have had any actual effect in real-world scenarios due to the lifecycle of
+  PHP scripts, but we fixed it anyway (ISSUE #345).
 
 
 v1.1.0 (2016-06-02)

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## Filing bug reports ##
 
-Bugs or feature requests can be posted on the [GitHub issues](http://github.com/nrk/predis/issues)
+Bugs or feature requests can be posted on the [GitHub issues](http://github.com/predis/predis/issues)
 section of the project.
 
 When reporting bugs, in addition to the obvious description of your issue you __must__ always provide

FAQ.md

@@ -33,7 +33,7 @@ usually something that developers prefer to customize depending on their needs a
 generalized when using Redis because of the many possible access patterns for your data. This does
 not mean that it is impossible to have such a feature since you can leverage the extensibility of
 this library to define your own serialization-aware commands. You can find more details about how to
-do that [on this issue](http://github.com/nrk/predis/issues/29#issuecomment-1202624).
+do that [on this issue](http://github.com/predis/predis/issues/29#issuecomment-1202624).
 
 ### How can I force Predis to connect to Redis before sending any command? ###
 

README.md

@@ -5,27 +5,19 @@
 [![Latest development][ico-version-dev]][link-packagist]
 [![Monthly installs][ico-downloads-monthly]][link-downloads]
 [![Build status][ico-travis]][link-travis]
-[![HHVM support][ico-hhvm]][link-hhvm]
-[![Gitter room][ico-gitter]][link-gitter]
 
 Flexible and feature-complete [Redis](http://redis.io) client for PHP >= 5.3 and HHVM >= 2.3.0.
 
-__ATTENTION:__ you are on the README file of an unstable branch of Predis specifically meant for the
-development of future releases. This means that the code on this branch is potentially unstable, and
-breaking change may happen without any prior notice. Do not use it in production environments or use
-it at your own risk!
-
 Predis does not require any additional C extension by default, but it can be optionally paired with
 [phpiredis](https://github.com/nrk/phpiredis) to lower the overhead of the serialization and parsing
-of the [Redis RESP Protocol](http://redis.io/topics/protocol). For an __experimental__ asynchronous
-implementation of the client you can refer to [Predis\Async](https://github.com/nrk/predis-async).
+of the [Redis RESP Protocol](http://redis.io/topics/protocol).
 
 More details about this project can be found on the [frequently asked questions](FAQ.md).
 
 
 ## Main features ##
 
-- Support for Redis from __2.0__ to __3.2__.
+- Support for different versions of Redis (from __2.0__ to __3.2__) using profiles.
 - Support for clustering using client-side sharding and pluggable keyspace distributors.
 - Support for [redis-cluster](http://redis.io/topics/cluster-tutorial) (Redis >= 3.0).
 - Support for master-slave replication setups and [redis-sentinel](http://redis.io/topics/sentinel).
@@ -38,7 +30,7 @@ More details about this project can be found on the [frequently asked questions]
 - Connections can be established via TCP/IP (also TLS/SSL-encrypted) or UNIX domain sockets.
 - Support for [Webdis](http://webd.is) (requires both `ext-curl` and `ext-phpiredis`).
 - Support for custom connection classes for providing different network or protocol backends.
-- Flexible system for defining custom commands and override the default ones.
+- Flexible system for defining custom commands and profiles and override the default ones.
 
 
 ## How to _install_ and use Predis ##
@@ -46,7 +38,7 @@ More details about this project can be found on the [frequently asked questions]
 This library can be found on [Packagist](http://packagist.org/packages/predis/predis) for an easier
 management of projects dependencies using [Composer](http://packagist.org/about-composer) or on our
 [own PEAR channel](http://pear.nrk.io) for a more traditional installation using PEAR. Ultimately,
-compressed archives of each release are [available on GitHub](https://github.com/nrk/predis/tags).
+compressed archives of each release are [available on GitHub](https://github.com/predis/predis/releases).
 
 
 ### Loading the library ###
@@ -95,6 +87,9 @@ $client = new Predis\Client([
 $client = new Predis\Client('tcp://10.0.0.1:6379');
 ```
 
+Password protected servers can be accessed by adding `password` to the parameters set. When ACLs are
+enabled on Redis >= 6.0, both `username` and `password` are required for user authentication.
+
 It is also possible to connect to local instances of Redis using UNIX domain sockets, in this case
 the parameters must use the `unix` scheme and specify a path for the socket file:
 
@@ -113,7 +108,7 @@ of suitable [options](http://php.net/manual/context.ssl.php) passed via the `ssl
 $client = new Predis\Client([
   'scheme' => 'tls',
   'ssl'    => ['cafile' => 'private.pem', 'verify_peer' => true],
-]
+]);
 
 // Same set of parameters, but using an URI string:
 $client = new Predis\Client('tls://127.0.0.1?ssl[cafile]=private.pem&ssl[verify_peer]=1');
@@ -153,20 +148,20 @@ Many aspects and behaviors of the client can be configured by passing specific c
 second argument of `Predis\Client::__construct()`:
 
 ```php
-$client = new Predis\Client($parameters, ['prefix' => 'sample:']);
+$client = new Predis\Client($parameters, ['profile' => '2.8', 'prefix' => 'sample:']);
 ```
 
 Options are managed using a mini DI-alike container and their values can be lazily initialized only
 when needed. The client options supported by default in Predis are:
 
-  - `prefix`: prefix string applied to every key found in commands.
+  - `profile`: specifies the profile to use to match a specific version of Redis.
+  - `prefix`: prefix string automatically applied to keys found in commands.
   - `exceptions`: whether the client should throw or return responses upon Redis errors.
   - `connections`: list of connection backends or a connection factory instance.
-  - `cluster`: specifies a cluster backend (`predis`, `redis` or callable).
-  - `replication`: specifies a replication backend (`predis`, `sentinel` or callable).
-  - `aggregate`: configures the client with a custom aggregate connection (callable).
+  - `cluster`: specifies a cluster backend (`predis`, `redis` or callable object).
+  - `replication`: specifies a replication backend (`TRUE`, `sentinel` or callable object).
+  - `aggregate`: overrides `cluster` and `replication` to provide a custom connections aggregator.
   - `parameters`: list of default connection parameters for aggregate connections.
-  - `commands`: specifies a command factory instance to use through the library.
 
 Users can also provide custom options with values or callable objects (for lazy initialization) that
 are stored in the options container for later use through the library.
@@ -270,7 +265,7 @@ $options    = ['replication' => function () {
     $strategy = new Predis\Replication\ReplicationStrategy();
     $strategy->setScriptReadOnly($LUA_SCRIPT);
 
-    return new Predis\Connection\Replication\MasterSlaveReplication($strategy);
+    return new Predis\Connection\Aggregate\MasterSlaveReplication($strategy);
 }];
 
 $client = new Predis\Client($parameters, $options);
@@ -329,7 +324,7 @@ of a transaction using CAS you can see [the following example](examples/transact
 While we try to update Predis to stay up to date with all the commands available in Redis, you might
 prefer to stick with an old version of the library or provide a different way to filter arguments or
 parse responses for specific commands. To achieve that, Predis provides the ability to implement new
-command classes to define or override commands in the default command factory used by the client:
+command classes to define or override commands in the default server profiles used by the client:
 
 ```php
 // Define a new command by extending Predis\Command\Command:
@@ -341,12 +336,9 @@ class BrandNewRedisCommand extends Predis\Command\Command
     }
 }
 
-// Inject your command in the current command factory:
-$client = new Predis\Client($parameters, [
-    'commands' => [
-        'newcmd' => 'BrandNewRedisCommand',
-    ],
-]);
+// Inject your command in the current profile:
+$client = new Predis\Client();
+$client->getProfile()->defineCommand('newcmd', 'BrandNewRedisCommand');
 
 $response = $client->newcmd();
 ```
@@ -365,7 +357,7 @@ $response = $client->executeRaw(['SET', 'foo', 'bar']);
 While it is possible to leverage [Lua scripting](http://redis.io/commands/eval) on Redis 2.6+ using
 directly [`EVAL`](http://redis.io/commands/eval) and [`EVALSHA`](http://redis.io/commands/evalsha),
 Predis offers script commands as an higher level abstraction built upon them to make things simple.
-Script commands can be registered in the command factory used by the client and are accessible as if
+Script commands can be registered in the server profile used by the client and are accessible as if
 they were plain Redis commands, but they define Lua scripts that get transmitted to the server for
 remote execution. Internally they use [`EVALSHA`](http://redis.io/commands/evalsha) by default and
 identify a script by its SHA1 hash to save bandwidth, but [`EVAL`](http://redis.io/commands/eval)
@@ -391,12 +383,9 @@ LUA;
     }
 }
 
-// Inject the script command in the current command factory:
-$client = new Predis\Client($parameters, [
-    'commands' => [
-        'lpushrand' => 'ListPushRandomValue',
-    ],
-]);
+// Inject the script command in the current profile:
+$client = new Predis\Client();
+$client->getProfile()->defineCommand('lpushrand', 'ListPushRandomValue');
 
 $response = $client->lpushrand('random_values', $seed = mt_rand());
 ```
@@ -454,14 +443,18 @@ stay consistent while working on the project.
 __ATTENTION__: Do not ever run the test suite shipped with Predis against instances of Redis running
 in production environments or containing data you are interested in!
 
-Predis has a comprehensive test suite covering every aspect of the library and that can optionally
-perform integration tests against a running instance of Redis (required >= 2.4.0 in order to verify
-the correct behavior of the implementation of each command. Integration tests for unsupported Redis
-commands are automatically skipped. If you do not have Redis up and running, integration tests can
-be disabled. See [the tests README](tests/README.md) for more details about testing this library.
+Predis has a comprehensive test suite covering every aspect of the library. This test suite performs
+integration tests against a running instance of Redis (>= 2.4.0 is required) to verify the correct
+behavior of the implementation of each command and automatically skips commands not defined in the
+specified Redis profile. If you do not have Redis up and running, integration tests can be disabled.
+By default the test suite is configured to execute integration tests using the profile for Redis 3.2
+(which is the current stable version of Redis) but can optionally target a Redis instance built from
+the `unstable` branch by modifying `phpunit.xml` and setting `REDIS_SERVER_VERSION` to `dev` so that
+the development server profile will be used. You can refer to [the tests README](tests/README.md)
+for more detailed information about testing Predis.
 
 Predis uses Travis CI for continuous integration and the history for past and current builds can be
-found [on its project page](http://travis-ci.org/nrk/predis).
+found [on its project page](http://travis-ci.org/predis/predis).
 
 
 ## Other ##
@@ -469,9 +462,9 @@ found [on its project page](http://travis-ci.org/nrk/predis).
 
 ### Project related links ###
 
-- [Source code](https://github.com/nrk/predis)
-- [Wiki](https://wiki.github.com/nrk/predis)
-- [Issue tracker](https://github.com/nrk/predis/issues)
+- [Source code](https://github.com/predis/predis)
+- [Wiki](https://github.com/predis/predis/wiki)
+- [Issue tracker](https://github.com/predis/predis/issues)
 - [PEAR channel](http://pear.nrk.io)
 
 
@@ -484,16 +477,13 @@ found [on its project page](http://travis-ci.org/nrk/predis).
 
 The code for Predis is distributed under the terms of the MIT license (see [LICENSE](LICENSE)).
 
-[ico-license]: https://img.shields.io/github/license/nrk/predis.svg?style=flat-square
+[ico-license]: https://img.shields.io/github/license/predis/predis.svg?style=flat-square
 [ico-version-stable]: https://img.shields.io/packagist/v/predis/predis.svg?style=flat-square
 [ico-version-dev]: https://img.shields.io/packagist/vpre/predis/predis.svg?style=flat-square
 [ico-downloads-monthly]: https://img.shields.io/packagist/dm/predis/predis.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/nrk/predis.svg?style=flat-square
+[ico-travis]: https://img.shields.io/travis/predis/predis.svg?style=flat-square
 [ico-hhvm]: https://img.shields.io/hhvm/predis/predis.svg?style=flat-square
-[ico-gitter]: https://img.shields.io/gitter/room/nrk/predis.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/predis/predis
-[link-travis]: https://travis-ci.org/nrk/predis
+[link-travis]: https://travis-ci.org/predis/predis
 [link-downloads]: https://packagist.org/packages/predis/predis/stats
-[link-hhvm]: http://hhvm.h4cc.de/package/predis/predis
-[link-gitter]: https://gitter.im/nrk/predis

VERSION

@@ -1 +1 @@
-2.0.0-dev
+1.1.11-dev

bin/create-command-test

@@ -15,7 +15,7 @@
 // of a test case to test a Redis command by specifying the name of the class
 // in the Predis\Command namespace (only classes in this namespace are valid).
 // For example, to generate a test case for SET (which is represented by the
-// Predis\Command\Redis\StringSet class):
+// Predis\Command\StringSet class):
 //
 //   $ ./bin/generate-command-test --class=StringSet
 //
@@ -45,11 +45,6 @@ class CommandTestCaseGenerator
         if (!isset($options['class'])) {
             throw new RuntimeException("Missing 'class' option.");
         }
-
-        if (!isset($options['realm'])) {
-            throw new RuntimeException("Missing 'realm' option.");
-        }
-
         $this->options = $options;
     }
 
@@ -97,12 +92,8 @@ class CommandTestCaseGenerator
             throw new RuntimeException("Missing 'class' option.");
         }
 
-        if (!isset($options['realm'])) {
-            throw new RuntimeException("Missing 'realm' option.");
-        }
-
-        $options['fqn'] = "Predis\\Command\\Redis\\{$options['class']}";
-        $options['path'] = "Command/Redis/{$options['class']}.php";
+        $options['fqn'] = "Predis\\Command\\{$options['class']}";
+        $options['path'] = "Command/{$options['class']}.php";
 
         $source = __DIR__.'/../src/'.$options['path'];
         if (!file_exists($source)) {
@@ -110,7 +101,7 @@ class CommandTestCaseGenerator
         }
 
         if (!isset($options['output'])) {
-            $options['output'] = sprintf("%s/%s", $options['tests'], str_replace('.php', '_Test.php', $options['path']));
+            $options['output'] = sprintf("%s/%s", $options['tests'], str_replace('.php', 'Test.php', $options['path']));
         }
 
         return new self($options);
@@ -118,11 +109,18 @@ class CommandTestCaseGenerator
 
     protected function getTestRealm()
     {
-        if (empty($this->options['realm'])) {
-            throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
+        if (isset($this->options['realm'])) {
+            if (!$this->options['realm']) {
+                throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
+            }
+            return $this->options['realm'];
         }
 
-        return $this->options['realm'];
+        $fqnParts = explode('\\', $this->options['fqn']);
+        $class = array_pop($fqnParts);
+        list($realm,) = preg_split('/([[:upper:]][[:lower:]]+)/', $class, 2, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+        return strtolower($realm);
     }
 
     public function generate()
@@ -132,7 +130,6 @@ class CommandTestCaseGenerator
         if (!$reflection->isInstantiable()) {
             throw new RuntimeException("Class $class must be instantiable, abstract classes or interfaces are not allowed.");
         }
-
         if (!$reflection->implementsInterface('Predis\Command\CommandInterface')) {
             throw new RuntimeException("Class $class must implement Predis\Command\CommandInterface.");
         }
@@ -176,7 +173,7 @@ class CommandTestCaseGenerator
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
+namespace Predis\Command;
 
 /**
  * @group commands

bin/create-pear

@@ -115,7 +115,7 @@ function addPackageFile($pkg, $fileinfo, $role, $baseDir = '')
 function generatePackageXml($packageINI)
 {
     $XML = <<<XML
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <package packagerversion="1.4.10" version="2.0"
     xmlns="http://pear.php.net/dtd/package-2.0"
     xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
@@ -197,7 +197,7 @@ function rewritePackageInstallAs($pkg)
 
 function savePackageXml($xml)
 {
-    $dom = new DOMDocument("1.0");
+    $dom = new DOMDocument("1.0", "UTF-8");
     $dom->preserveWhiteSpace = false;
     $dom->formatOutput = true;
     $dom->loadXML($xml->asXML());

bin/create-phar

@@ -59,7 +59,7 @@ spl_autoload_register(function (\$class) {
         }
     }
 });
-__HALT_COMPILER();
+__halt_compiler();
 EOSTUB;
 }
 

composer.json

@@ -3,16 +3,28 @@
     "type": "library",
     "description": "Flexible and feature-complete Redis client for PHP and HHVM",
     "keywords": ["nosql", "redis", "predis"],
-    "homepage": "http://github.com/nrk/predis",
+    "homepage": "http://github.com/predis/predis",
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/nrk/predis/issues"
+        "issues": "https://github.com/predis/predis/issues"
     },
     "authors": [
         {
             "name": "Daniele Alessandri",
             "email": "suppakilla@gmail.com",
-            "homepage": "http://clorophilla.net"
+            "homepage": "http://clorophilla.net",
+            "role": "Creator & Maintainer"
+        },
+        {
+            "name": "Till Krüss",
+            "homepage": "https://till.im",
+            "role": "Maintainer"
+        }
+    ],
+    "funding": [
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/tillkruss"
         }
     ],
     "require": {
@@ -26,11 +38,11 @@
         "ext-curl": "Allows access to Webdis when paired with phpiredis"
     },
     "autoload": {
-        "psr-4": {"Predis\\": "src/"}
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
+        "psr-4": {
+            "Predis\\": "src/"
         }
+    },
+    "scripts": {
+        "post-update-cmd": "@php -f tests/apply-patches.php"
     }
 }

examples/custom_cluster_distributor.php

@@ -18,7 +18,7 @@ require __DIR__.'/shared.php';
 use Predis\Cluster\Distributor\DistributorInterface;
 use Predis\Cluster\Hash\HashGeneratorInterface;
 use Predis\Cluster\PredisStrategy;
-use Predis\Connection\Cluster\PredisCluster;
+use Predis\Connection\Aggregate\PredisCluster;
 
 class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
 {
@@ -104,8 +104,8 @@ for ($i = 0; $i < 100; ++$i) {
     $client->get("key:$i");
 }
 
-$server1 = $client->on('first')->info();
-$server2 = $client->on('second')->info();
+$server1 = $client->getClientFor('first')->info();
+$server2 = $client->getClientFor('second')->info();
 
 if (isset($server1['Keyspace'], $server2['Keyspace'])) {
     $server1 = $server1['Keyspace'];

examples/dispatcher_loop.php

@@ -51,7 +51,7 @@ class EventsListener implements Countable
         return $this->events;
     }
 
-    public function __invoke($payload, $dispatcher)
+    public function __invoke($payload)
     {
         $this->events[] = $payload;
     }
@@ -61,7 +61,7 @@ class EventsListener implements Countable
 $dispatcher->attachCallback('events', ($events = new EventsListener()));
 
 // Attach a function to control the dispatcher loop termination with a message.
-$dispatcher->attachCallback('control', function ($payload, $dispatcher) {
+$dispatcher->attachCallback('control', function ($payload) use ($dispatcher) {
     if ($payload === 'terminate_dispatcher') {
         $dispatcher->stop();
     }

examples/lua_scripting_abstraction.php

@@ -13,10 +13,11 @@ require __DIR__.'/shared.php';
 
 // This example will not work with versions of Redis < 2.6.
 //
-// Additionally to the EVAL command, the Predis\Command\ScriptCommand class can
-// be used to leverage an higher level abstraction for Lua scripting that makes
-// scripts appear just like any other command on the client-side. This is basic
-// example on how a script-based INCREX command can be defined:
+// Additionally to the EVAL command defined in the current development profile,
+// the Predis\Command\ScriptCommand class can be used to build an higher level
+// abstraction for "scriptable" commands so that they will appear just like any
+// other command on the client-side. This is a quick example used to implement
+// INCREX.
 
 use Predis\Command\ScriptCommand;
 
@@ -49,9 +50,12 @@ LUA;
 }
 
 $client = new Predis\Client($single_server, array(
-    'commands' => array(
-        'increxby' => 'IncrementExistingKeysBy',
-    ),
+    'profile' => function ($options) {
+        $profile = $options->getDefault('profile');
+        $profile->defineCommand('increxby', 'IncrementExistingKeysBy');
+
+        return $profile;
+    },
 ));
 
 $client->mset('foo', 10, 'foobar', 100);

examples/redis_collections_iterators.php

@@ -13,7 +13,7 @@ require __DIR__.'/shared.php';
 
 use Predis\Collection\Iterator;
 
-// Starting with Redis 2.8, clients can iterate incrementally over collections
+// Starting from Redis 2.8, clients can iterate incrementally over collections
 // without blocking the server like it happens when a command such as KEYS is
 // executed on a Redis instance storing millions of keys. These commands are:
 //
@@ -29,7 +29,8 @@ use Predis\Collection\Iterator;
 // See http://redis.io/commands/scan for more details.
 //
 
-$client = new Predis\Client($single_server);
+// Create a client using `2.8` as a server profile (needs Redis 2.8!)
+$client = new Predis\Client($single_server, array('profile' => '2.8'));
 
 // Prepare some keys for our example
 $client->del('predis:set', 'predis:zset', 'predis:hash');

examples/replication_complex.php

@@ -14,12 +14,12 @@ require __DIR__.'/shared.php';
 // Predis allows to set Lua scripts as read-only operations for replication.
 // This works for both EVAL and EVALSHA and also for the client-side abstraction
 // built upon them (Predis\Command\ScriptCommand). This example shows a slightly
-// more complex configuration that injects a new script command in the command
-// factory used by the client and marks it as a read-only operation so that it
-// will be executed on slaves.
+// more complex configuration that injects a new script command in the server
+// profile used by the new client instance and marks it marks it as a read-only
+// operation for replication so that it will be executed on slaves.
 
 use Predis\Command\ScriptCommand;
-use Predis\Connection\Replication\MasterSlaveReplication;
+use Predis\Connection\Aggregate\MasterSlaveReplication;
 use Predis\Replication\ReplicationStrategy;
 
 // ------------------------------------------------------------------------- //
@@ -52,9 +52,12 @@ $parameters = array(
 );
 
 $options = array(
-    'commands' => array(
-        'hmgetall' => 'HashMultipleGetAll',
-    ),
+    'profile' => function ($options, $option) {
+        $profile = $options->getDefault($option);
+        $profile->defineCommand('hmgetall', 'HashMultipleGetAll');
+
+        return $profile;
+    },
     'replication' => function () {
         $strategy = new ReplicationStrategy();
         $strategy->setScriptReadOnly(HashMultipleGetAll::BODY);

examples/replication_simple.php

@@ -26,7 +26,7 @@ $parameters = array(
     'tcp://127.0.0.1:6380?database=15&alias=slave',
 );
 
-$options = array('replication' => 'predis');
+$options = array('replication' => true);
 
 $client = new Predis\Client($parameters, $options);
 

examples/shared.php

@@ -9,6 +9,10 @@
  * file that was distributed with this source code.
  */
 
+if (PHP_SAPI !== 'cli') {
+    die("Example scripts are meant to be executed locally via CLI.");
+}
+
 require __DIR__.'/../autoload.php';
 
 function redis_version($info)

package.ini

@@ -10,7 +10,7 @@ name        = "Predis"
 desc        = "Flexible and feature-complete Redis client for PHP and HHVM"
 homepage    = "http://github.com/nrk/predis"
 license     = "MIT"
-version     = "2.0.0"
+version     = "1.1.11"
 stability   = "devel"
 channel     = "pear.nrk.io"
 

phpunit.xml.dist

@@ -38,6 +38,7 @@
 
     <php>
         <!-- Redis -->
+        <const name="REDIS_SERVER_VERSION" value="3.2" />
         <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
         <const name="REDIS_SERVER_PORT" value="6379" />
         <const name="REDIS_SERVER_DBNUM" value="15" />

phpunit.xml.travisci

@@ -36,12 +36,9 @@
         </whitelist>
     </filter>
 
-    <logging>
-        <log type="coverage-text" target="php://stdout" />
-    </logging>
-
     <php>
         <!-- Redis -->
+        <const name="REDIS_SERVER_VERSION" value="3.2" />
         <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
         <const name="REDIS_SERVER_PORT" value="6379" />
         <const name="REDIS_SERVER_DBNUM" value="15" />

src/Autoloader.php

@@ -16,7 +16,6 @@ namespace Predis;
  *
  * @author Eric Naeseth <eric@thumbtack.com>
  * @author Daniele Alessandri <suppakilla@gmail.com>
- * @codeCoverageIgnore
  */
 class Autoloader
 {

src/Client.php

@@ -19,7 +19,6 @@ use Predis\Configuration\OptionsInterface;
 use Predis\Connection\AggregateConnectionInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ParametersInterface;
-use Predis\Connection\Replication\SentinelReplication;
 use Predis\Monitor\Consumer as MonitorConsumer;
 use Predis\Pipeline\Pipeline;
 use Predis\PubSub\Consumer as PubSubConsumer;
@@ -41,22 +40,11 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
  */
 class Client implements ClientInterface, \IteratorAggregate
 {
-    const VERSION = '2.0.0-dev';
+    const VERSION = '1.1.11-dev';
 
-    /**
-     * @var Predis\Configuration\OptionsInterface
-     */
-    private $options;
-
-    /**
-     * @var Predis\Connection\ConnectionInterface
-     */
-    private $connection;
-
-    /**
-     * @var Predis\Command\FactoryInterface
-     */
-    private $commands;
+    protected $connection;
+    protected $options;
+    private $profile;
 
     /**
      * @param mixed $parameters Connection parameters for one or more servers.
@@ -66,7 +54,7 @@ class Client implements ClientInterface, \IteratorAggregate
     {
         $this->options = $this->createOptions($options ?: array());
         $this->connection = $this->createConnection($parameters ?: array());
-        $this->commands = $this->options->commands;
+        $this->profile = $this->options->profile;
     }
 
     /**
@@ -90,7 +78,7 @@ class Client implements ClientInterface, \IteratorAggregate
             return $options;
         }
 
-        throw new \InvalidArgumentException('Invalid type for client options');
+        throw new \InvalidArgumentException('Invalid type for client options.');
     }
 
     /**
@@ -114,76 +102,81 @@ class Client implements ClientInterface, \IteratorAggregate
      */
     protected function createConnection($parameters)
     {
-        $options = $this->getOptions();
-
         if ($parameters instanceof ConnectionInterface) {
             return $parameters;
         }
 
         if ($parameters instanceof ParametersInterface || is_string($parameters)) {
-            return $options->connections->create($parameters);
+            return $this->options->connections->create($parameters);
         }
 
         if (is_array($parameters)) {
             if (!isset($parameters[0])) {
-                return $options->connections->create($parameters);
+                return $this->options->connections->create($parameters);
             }
 
-            if ($options->defined('cluster')) {
-                return $this->createAggregateConnection($parameters, 'cluster');
+            $options = $this->options;
+
+            if ($options->defined('aggregate')) {
+                $initializer = $this->getConnectionInitializerWrapper($options->aggregate);
+                $connection = $initializer($parameters, $options);
             } elseif ($options->defined('replication')) {
-                return $this->createAggregateConnection($parameters, 'replication');
-            } elseif ($options->defined('aggregate')) {
-                return $this->createAggregateConnection($parameters, 'aggregate');
+                $replication = $options->replication;
+
+                if ($replication instanceof AggregateConnectionInterface) {
+                    $connection = $replication;
+                    $options->connections->aggregate($connection, $parameters);
+                } else {
+                    $initializer = $this->getConnectionInitializerWrapper($replication);
+                    $connection = $initializer($parameters, $options);
+                }
             } else {
-                throw new \InvalidArgumentException(
-                    'Array of connection parameters requires `cluster`, `replication` or `aggregate` client option'
-                );
-            }
-        }
-
-        if (is_callable($parameters)) {
-            $connection = call_user_func($parameters, $options);
-
-            if (!$connection instanceof ConnectionInterface) {
-                throw new \InvalidArgumentException('Callable parameters must return a valid connection');
+                $connection = $options->cluster;
+                $options->connections->aggregate($connection, $parameters);
             }
 
             return $connection;
         }
 
-        throw new \InvalidArgumentException('Invalid type for connection parameters');
+        if (is_callable($parameters)) {
+            $initializer = $this->getConnectionInitializerWrapper($parameters);
+            $connection = $initializer($this->options);
+
+            return $connection;
+        }
+
+        throw new \InvalidArgumentException('Invalid type for connection parameters.');
     }
 
     /**
-     * Creates an aggregate connection.
+     * Wraps a callable to make sure that its returned value represents a valid
+     * connection type.
      *
-     * @param mixed  $parameters Connection parameters.
-     * @param string $option     Option for aggregate connections (`aggregate`, `cluster`, `replication`).
+     * @param mixed $callable
      *
      * @return \Closure
      */
-    protected function createAggregateConnection($parameters, $option)
+    protected function getConnectionInitializerWrapper($callable)
     {
-        $options = $this->getOptions();
+        return function () use ($callable) {
+            $connection = call_user_func_array($callable, func_get_args());
 
-        $initializer = $options->$option;
-        $connection = $initializer($parameters);
+            if (!$connection instanceof ConnectionInterface) {
+                throw new \UnexpectedValueException(
+                    'The callable connection initializer returned an invalid type.'
+                );
+            }
 
-        // TODO: this is dirty but we must skip the redis-sentinel backend for now.
-        if ($option !== 'aggregate' && !$connection instanceof SentinelReplication) {
-            $options->connections->aggregate($connection, $parameters);
-        }
-
-        return $connection;
+            return $connection;
+        };
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getCommandFactory()
+    public function getProfile()
     {
-        return $this->commands;
+        return $this->profile;
     }
 
     /**
@@ -195,34 +188,23 @@ class Client implements ClientInterface, \IteratorAggregate
     }
 
     /**
-     * Creates a new client from the specified connection ID / alias.
+     * Creates a new client instance for the specified connection ID or alias,
+     * only when working with an aggregate connection (cluster, replication).
+     * The new client instances uses the same options of the original one.
      *
-     * The new client instances inherites the same options of the original one.
-     * When no callable object is supplied, this method returns the new client.
-     * When a callable object is supplied, the new client is passed as its sole
-     * argument and its return value is returned by this method to the caller.
+     * @param string $connectionID Identifier of a connection.
      *
-     * NOTE: This method works only when the client is configured to work with
-     * aggregate connections (cluster, replication).
+     * @throws \InvalidArgumentException
      *
-     * @param string        $connectionID Identifier of a connection.
-     * @param callable|null $callable     Optional callable object.
-     *
-     * @return ClientInterface|mixed
+     * @return Client
      */
-    public function on($connectionID, $callable = null)
+    public function getClientFor($connectionID)
     {
         if (!$connection = $this->getConnectionById($connectionID)) {
-            throw new \InvalidArgumentException("Invalid connection ID: `$connectionID`");
+            throw new \InvalidArgumentException("Invalid connection ID: $connectionID.");
         }
 
-        $client = new static($connection, $this->getOptions());
-
-        if ($callable) {
-            return call_user_func($callable, $client);
-        } else {
-            return $client;
-        }
+        return new static($connection, $this->options);
     }
 
     /**
@@ -307,10 +289,9 @@ class Client implements ClientInterface, \IteratorAggregate
     public function executeRaw(array $arguments, &$error = null)
     {
         $error = false;
-        $commandID = array_shift($arguments);
 
         $response = $this->connection->executeCommand(
-            new RawCommand($commandID, $arguments)
+            new RawCommand($arguments)
         );
 
         if ($response instanceof ResponseInterface) {
@@ -339,7 +320,7 @@ class Client implements ClientInterface, \IteratorAggregate
      */
     public function createCommand($commandID, $arguments = array())
     {
-        return $this->commands->createCommand($commandID, $arguments);
+        return $this->profile->createCommand($commandID, $arguments);
     }
 
     /**
@@ -373,7 +354,10 @@ class Client implements ClientInterface, \IteratorAggregate
     protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
     {
         if ($command instanceof ScriptCommand && $response->getErrorType() === 'NOSCRIPT') {
-            $response = $this->executeCommand($command->getEvalCommand());
+            $eval = $this->createCommand('EVAL');
+            $eval->setRawArguments($command->getEvalArguments());
+
+            $response = $this->executeCommand($eval);
 
             if (!$response instanceof ResponseInterface) {
                 $response = $command->parseResponse($response);
@@ -416,11 +400,9 @@ class Client implements ClientInterface, \IteratorAggregate
 
                 return $this->$initializer($arg0, $arg1);
 
-        // @codeCoverageIgnoreStart
             default:
                 return $this->$initializer($this, $argv);
         }
-        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -545,15 +527,18 @@ class Client implements ClientInterface, \IteratorAggregate
     }
 
     /**
-     * {@inheritdoc}
+     * @return \Traversable<string, static>
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $clients = array();
         $connection = $this->getConnection();
 
         if (!$connection instanceof \Traversable) {
-            throw new ClientException('The underlying connection is not traversable');
+            return new \ArrayIterator(array(
+                (string) $connection => new static($connection, $this->getOptions())
+            ));
         }
 
         foreach ($connection as $node) {

src/ClientContextInterface.php

@@ -16,7 +16,7 @@ use Predis\Command\CommandInterface;
 /**
  * Interface defining a client-side context such as a pipeline or transaction.
  *
- * @method $this del(array $keys)
+ * @method $this del(array|string $keys)
  * @method $this dump($key)
  * @method $this exists($key)
  * @method $this expire($key, $seconds)
@@ -38,7 +38,8 @@ use Predis\Command\CommandInterface;
  * @method $this append($key, $value)
  * @method $this bitcount($key, $start = null, $end = null)
  * @method $this bitop($operation, $destkey, $key)
- * @method $this bitfield($key, ...)
+ * @method $this bitfield($key, $subcommand, ...$subcommandArg)
+ * @method $this bitpos($key, $bit, $start = null, $end = null)
  * @method $this decr($key)
  * @method $this decrby($key, $decrement)
  * @method $this get($key)
@@ -73,15 +74,15 @@ use Predis\Command\CommandInterface;
  * @method $this hsetnx($key, $field, $value)
  * @method $this hvals($key)
  * @method $this hstrlen($key, $field)
- * @method $this blpop(array $keys, $timeout)
- * @method $this brpop(array $keys, $timeout)
+ * @method $this blpop(array|string $keys, $timeout)
+ * @method $this brpop(array|string $keys, $timeout)
  * @method $this brpoplpush($source, $destination, $timeout)
  * @method $this lindex($key, $index)
  * @method $this linsert($key, $whence, $pivot, $value)
  * @method $this llen($key)
  * @method $this lpop($key)
  * @method $this lpush($key, array $values)
- * @method $this lpushx($key, $value)
+ * @method $this lpushx($key, array $values)
  * @method $this lrange($key, $start, $stop)
  * @method $this lrem($key, $count, $value)
  * @method $this lset($key, $index, $value)
@@ -89,13 +90,13 @@ use Predis\Command\CommandInterface;
  * @method $this rpop($key)
  * @method $this rpoplpush($source, $destination)
  * @method $this rpush($key, array $values)
- * @method $this rpushx($key, $value)
+ * @method $this rpushx($key, array $values)
  * @method $this sadd($key, array $members)
  * @method $this scard($key)
- * @method $this sdiff(array $keys)
- * @method $this sdiffstore($destination, array $keys)
- * @method $this sinter(array $keys)
- * @method $this sinterstore($destination, array $keys)
+ * @method $this sdiff(array|string $keys)
+ * @method $this sdiffstore($destination, array|string $keys)
+ * @method $this sinter(array|string $keys)
+ * @method $this sinterstore($destination, array|string $keys)
  * @method $this sismember($key, $member)
  * @method $this smembers($key)
  * @method $this smove($source, $destination, $member)
@@ -103,13 +104,13 @@ use Predis\Command\CommandInterface;
  * @method $this srandmember($key, $count = null)
  * @method $this srem($key, $member)
  * @method $this sscan($key, $cursor, array $options = null)
- * @method $this sunion(array $keys)
- * @method $this sunionstore($destination, array $keys)
+ * @method $this sunion(array|string $keys)
+ * @method $this sunionstore($destination, array|string $keys)
  * @method $this zadd($key, array $membersAndScoresDictionary)
  * @method $this zcard($key)
  * @method $this zcount($key, $min, $max)
  * @method $this zincrby($key, $increment, $member)
- * @method $this zinterstore($destination, array $keys, array $options = null)
+ * @method $this zinterstore($destination, array|string $keys, array $options = null)
  * @method $this zrange($key, $start, $stop, array $options = null)
  * @method $this zrangebyscore($key, $min, $max, array $options = null)
  * @method $this zrank($key, $member)
@@ -117,9 +118,9 @@ use Predis\Command\CommandInterface;
  * @method $this zremrangebyrank($key, $start, $stop)
  * @method $this zremrangebyscore($key, $min, $max)
  * @method $this zrevrange($key, $start, $stop, array $options = null)
- * @method $this zrevrangebyscore($key, $min, $max, array $options = null)
+ * @method $this zrevrangebyscore($key, $max, $min, array $options = null)
  * @method $this zrevrank($key, $member)
- * @method $this zunionstore($destination, array $keys, array $options = null)
+ * @method $this zunionstore($destination, array|string $keys, array $options = null)
  * @method $this zscore($key, $member)
  * @method $this zscan($key, $cursor, array $options = null)
  * @method $this zrangebylex($key, $start, $stop, array $options = null)
@@ -127,8 +128,8 @@ use Predis\Command\CommandInterface;
  * @method $this zremrangebylex($key, $min, $max)
  * @method $this zlexcount($key, $min, $max)
  * @method $this pfadd($key, array $elements)
- * @method $this pfmerge($destinationKey, array $sourceKeys)
- * @method $this pfcount(array $keys)
+ * @method $this pfmerge($destinationKey, array|string $sourceKeys)
+ * @method $this pfcount(array|string $keys)
  * @method $this pubsub($subcommand, $argument)
  * @method $this publish($channel, $message)
  * @method $this discard()

src/ClientInterface.php

@@ -12,9 +12,9 @@
 namespace Predis;
 
 use Predis\Command\CommandInterface;
-use Predis\Command\FactoryInterface;
 use Predis\Configuration\OptionsInterface;
 use Predis\Connection\ConnectionInterface;
+use Predis\Profile\ProfileInterface;
 
 /**
  * Interface defining a client able to execute commands against Redis.
@@ -24,164 +24,165 @@ use Predis\Connection\ConnectionInterface;
  * and more friendly interface to ease programming which is described in the
  * following list of methods:
  *
- * @method int    del(array $keys)
- * @method string dump($key)
- * @method int    exists($key)
- * @method int    expire($key, $seconds)
- * @method int    expireat($key, $timestamp)
- * @method array  keys($pattern)
- * @method int    move($key, $db)
- * @method mixed  object($subcommand, $key)
- * @method int    persist($key)
- * @method int    pexpire($key, $milliseconds)
- * @method int    pexpireat($key, $timestamp)
- * @method int    pttl($key)
- * @method string randomkey()
- * @method mixed  rename($key, $target)
- * @method int    renamenx($key, $target)
- * @method array  scan($cursor, array $options = null)
- * @method array  sort($key, array $options = null)
- * @method int    ttl($key)
- * @method mixed  type($key)
- * @method int    append($key, $value)
- * @method int    bitcount($key, $start = null, $end = null)
- * @method int    bitop($operation, $destkey, $key)
- * @method array  bitfield($key, ...)
- * @method int    decr($key)
- * @method int    decrby($key, $decrement)
- * @method string get($key)
- * @method int    getbit($key, $offset)
- * @method string getrange($key, $start, $end)
- * @method string getset($key, $value)
- * @method int    incr($key)
- * @method int    incrby($key, $increment)
- * @method string incrbyfloat($key, $increment)
- * @method array  mget(array $keys)
- * @method mixed  mset(array $dictionary)
- * @method int    msetnx(array $dictionary)
- * @method mixed  psetex($key, $milliseconds, $value)
- * @method mixed  set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
- * @method int    setbit($key, $offset, $value)
- * @method int    setex($key, $seconds, $value)
- * @method int    setnx($key, $value)
- * @method int    setrange($key, $offset, $value)
- * @method int    strlen($key)
- * @method int    hdel($key, array $fields)
- * @method int    hexists($key, $field)
- * @method string hget($key, $field)
- * @method array  hgetall($key)
- * @method int    hincrby($key, $field, $increment)
- * @method string hincrbyfloat($key, $field, $increment)
- * @method array  hkeys($key)
- * @method int    hlen($key)
- * @method array  hmget($key, array $fields)
- * @method mixed  hmset($key, array $dictionary)
- * @method array  hscan($key, $cursor, array $options = null)
- * @method int    hset($key, $field, $value)
- * @method int    hsetnx($key, $field, $value)
- * @method array  hvals($key)
- * @method int    hstrlen($key, $field)
- * @method array  blpop(array $keys, $timeout)
- * @method array  brpop(array $keys, $timeout)
- * @method array  brpoplpush($source, $destination, $timeout)
- * @method string lindex($key, $index)
- * @method int    linsert($key, $whence, $pivot, $value)
- * @method int    llen($key)
- * @method string lpop($key)
- * @method int    lpush($key, array $values)
- * @method int    lpushx($key, $value)
- * @method array  lrange($key, $start, $stop)
- * @method int    lrem($key, $count, $value)
- * @method mixed  lset($key, $index, $value)
- * @method mixed  ltrim($key, $start, $stop)
- * @method string rpop($key)
- * @method string rpoplpush($source, $destination)
- * @method int    rpush($key, array $values)
- * @method int    rpushx($key, $value)
- * @method int    sadd($key, array $members)
- * @method int    scard($key)
- * @method array  sdiff(array $keys)
- * @method int    sdiffstore($destination, array $keys)
- * @method array  sinter(array $keys)
- * @method int    sinterstore($destination, array $keys)
- * @method int    sismember($key, $member)
- * @method array  smembers($key)
- * @method int    smove($source, $destination, $member)
- * @method string spop($key, $count = null)
- * @method string srandmember($key, $count = null)
- * @method int    srem($key, $member)
- * @method array  sscan($key, $cursor, array $options = null)
- * @method array  sunion(array $keys)
- * @method int    sunionstore($destination, array $keys)
- * @method int    zadd($key, array $membersAndScoresDictionary)
- * @method int    zcard($key)
- * @method string zcount($key, $min, $max)
- * @method string zincrby($key, $increment, $member)
- * @method int    zinterstore($destination, array $keys, array $options = null)
- * @method array  zrange($key, $start, $stop, array $options = null)
- * @method array  zrangebyscore($key, $min, $max, array $options = null)
- * @method int    zrank($key, $member)
- * @method int    zrem($key, $member)
- * @method int    zremrangebyrank($key, $start, $stop)
- * @method int    zremrangebyscore($key, $min, $max)
- * @method array  zrevrange($key, $start, $stop, array $options = null)
- * @method array  zrevrangebyscore($key, $max, $min, array $options = null)
- * @method int    zrevrank($key, $member)
- * @method int    zunionstore($destination, array $keys, array $options = null)
- * @method string zscore($key, $member)
- * @method array  zscan($key, $cursor, array $options = null)
- * @method array  zrangebylex($key, $start, $stop, array $options = null)
- * @method array  zrevrangebylex($key, $start, $stop, array $options = null)
- * @method int    zremrangebylex($key, $min, $max)
- * @method int    zlexcount($key, $min, $max)
- * @method int    pfadd($key, array $elements)
- * @method mixed  pfmerge($destinationKey, array $sourceKeys)
- * @method int    pfcount(array $keys)
- * @method mixed  pubsub($subcommand, $argument)
- * @method int    publish($channel, $message)
- * @method mixed  discard()
- * @method array  exec()
- * @method mixed  multi()
- * @method mixed  unwatch()
- * @method mixed  watch($key)
- * @method mixed  eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method mixed  evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method mixed  script($subcommand, $argument = null)
- * @method mixed  auth($password)
- * @method string echo($message)
- * @method mixed  ping($message = null)
- * @method mixed  select($database)
- * @method mixed  bgrewriteaof()
- * @method mixed  bgsave()
- * @method mixed  client($subcommand, $argument = null)
- * @method mixed  config($subcommand, $argument = null)
- * @method int    dbsize()
- * @method mixed  flushall()
- * @method mixed  flushdb()
- * @method array  info($section = null)
- * @method int    lastsave()
- * @method mixed  save()
- * @method mixed  slaveof($host, $port)
- * @method mixed  slowlog($subcommand, $argument = null)
- * @method array  time()
- * @method array  command()
- * @method int    geoadd($key, $longitude, $latitude, $member)
- * @method array  geohash($key, array $members)
- * @method array  geopos($key, array $members)
- * @method string geodist($key, $member1, $member2, $unit = null)
- * @method array  georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method array  georadiusbymember($key, $member, $radius, $unit, array $options = null)
+ * @method int         del(array|string $keys)
+ * @method string|null dump($key)
+ * @method int         exists($key)
+ * @method int         expire($key, $seconds)
+ * @method int         expireat($key, $timestamp)
+ * @method array       keys($pattern)
+ * @method int         move($key, $db)
+ * @method mixed       object($subcommand, $key)
+ * @method int         persist($key)
+ * @method int         pexpire($key, $milliseconds)
+ * @method int         pexpireat($key, $timestamp)
+ * @method int         pttl($key)
+ * @method string|null randomkey()
+ * @method mixed       rename($key, $target)
+ * @method int         renamenx($key, $target)
+ * @method array       scan($cursor, array $options = null)
+ * @method array       sort($key, array $options = null)
+ * @method int         ttl($key)
+ * @method mixed       type($key)
+ * @method int         append($key, $value)
+ * @method int         bitcount($key, $start = null, $end = null)
+ * @method int         bitop($operation, $destkey, $key)
+ * @method array|null  bitfield($key, $subcommand, ...$subcommandArg)
+ * @method int         bitpos($key, $bit, $start = null, $end = null)
+ * @method int         decr($key)
+ * @method int         decrby($key, $decrement)
+ * @method string|null get($key)
+ * @method int         getbit($key, $offset)
+ * @method string      getrange($key, $start, $end)
+ * @method string|null getset($key, $value)
+ * @method int         incr($key)
+ * @method int         incrby($key, $increment)
+ * @method string      incrbyfloat($key, $increment)
+ * @method array       mget(array $keys)
+ * @method mixed       mset(array $dictionary)
+ * @method int         msetnx(array $dictionary)
+ * @method mixed       psetex($key, $milliseconds, $value)
+ * @method mixed       set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
+ * @method int         setbit($key, $offset, $value)
+ * @method int         setex($key, $seconds, $value)
+ * @method int         setnx($key, $value)
+ * @method int         setrange($key, $offset, $value)
+ * @method int         strlen($key)
+ * @method int         hdel($key, array $fields)
+ * @method int         hexists($key, $field)
+ * @method string|null hget($key, $field)
+ * @method array       hgetall($key)
+ * @method int         hincrby($key, $field, $increment)
+ * @method string      hincrbyfloat($key, $field, $increment)
+ * @method array       hkeys($key)
+ * @method int         hlen($key)
+ * @method array       hmget($key, array $fields)
+ * @method mixed       hmset($key, array $dictionary)
+ * @method array       hscan($key, $cursor, array $options = null)
+ * @method int         hset($key, $field, $value)
+ * @method int         hsetnx($key, $field, $value)
+ * @method array       hvals($key)
+ * @method int         hstrlen($key, $field)
+ * @method array|null  blpop(array|string $keys, $timeout)
+ * @method array|null  brpop(array|string $keys, $timeout)
+ * @method string|null brpoplpush($source, $destination, $timeout)
+ * @method string|null lindex($key, $index)
+ * @method int         linsert($key, $whence, $pivot, $value)
+ * @method int         llen($key)
+ * @method string|null lpop($key)
+ * @method int         lpush($key, array $values)
+ * @method int         lpushx($key, array $values)
+ * @method array       lrange($key, $start, $stop)
+ * @method int         lrem($key, $count, $value)
+ * @method mixed       lset($key, $index, $value)
+ * @method mixed       ltrim($key, $start, $stop)
+ * @method string|null rpop($key)
+ * @method string|null rpoplpush($source, $destination)
+ * @method int         rpush($key, array $values)
+ * @method int         rpushx($key, array $values)
+ * @method int         sadd($key, array $members)
+ * @method int         scard($key)
+ * @method array       sdiff(array|string $keys)
+ * @method int         sdiffstore($destination, array|string $keys)
+ * @method array       sinter(array|string $keys)
+ * @method int         sinterstore($destination, array|string $keys)
+ * @method int         sismember($key, $member)
+ * @method array       smembers($key)
+ * @method int         smove($source, $destination, $member)
+ * @method string|null spop($key, $count = null)
+ * @method string|null srandmember($key, $count = null)
+ * @method int         srem($key, $member)
+ * @method array       sscan($key, $cursor, array $options = null)
+ * @method array       sunion(array|string $keys)
+ * @method int         sunionstore($destination, array|string $keys)
+ * @method int         zadd($key, array $membersAndScoresDictionary)
+ * @method int         zcard($key)
+ * @method string      zcount($key, $min, $max)
+ * @method string      zincrby($key, $increment, $member)
+ * @method int         zinterstore($destination, array|string $keys, array $options = null)
+ * @method array       zrange($key, $start, $stop, array $options = null)
+ * @method array       zrangebyscore($key, $min, $max, array $options = null)
+ * @method int|null    zrank($key, $member)
+ * @method int         zrem($key, $member)
+ * @method int         zremrangebyrank($key, $start, $stop)
+ * @method int         zremrangebyscore($key, $min, $max)
+ * @method array       zrevrange($key, $start, $stop, array $options = null)
+ * @method array       zrevrangebyscore($key, $max, $min, array $options = null)
+ * @method int|null    zrevrank($key, $member)
+ * @method int         zunionstore($destination, array|string $keys, array $options = null)
+ * @method string|null zscore($key, $member)
+ * @method array       zscan($key, $cursor, array $options = null)
+ * @method array       zrangebylex($key, $start, $stop, array $options = null)
+ * @method array       zrevrangebylex($key, $start, $stop, array $options = null)
+ * @method int         zremrangebylex($key, $min, $max)
+ * @method int         zlexcount($key, $min, $max)
+ * @method int         pfadd($key, array $elements)
+ * @method mixed       pfmerge($destinationKey, array|string $sourceKeys)
+ * @method int         pfcount(array|string $keys)
+ * @method mixed       pubsub($subcommand, $argument)
+ * @method int         publish($channel, $message)
+ * @method mixed       discard()
+ * @method array|null  exec()
+ * @method mixed       multi()
+ * @method mixed       unwatch()
+ * @method mixed       watch($key)
+ * @method mixed       eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
+ * @method mixed       evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
+ * @method mixed       script($subcommand, $argument = null)
+ * @method mixed       auth($password)
+ * @method string      echo($message)
+ * @method mixed       ping($message = null)
+ * @method mixed       select($database)
+ * @method mixed       bgrewriteaof()
+ * @method mixed       bgsave()
+ * @method mixed       client($subcommand, $argument = null)
+ * @method mixed       config($subcommand, $argument = null)
+ * @method int         dbsize()
+ * @method mixed       flushall()
+ * @method mixed       flushdb()
+ * @method array       info($section = null)
+ * @method int         lastsave()
+ * @method mixed       save()
+ * @method mixed       slaveof($host, $port)
+ * @method mixed       slowlog($subcommand, $argument = null)
+ * @method array       time()
+ * @method array       command()
+ * @method int         geoadd($key, $longitude, $latitude, $member)
+ * @method array       geohash($key, array $members)
+ * @method array       geopos($key, array $members)
+ * @method string|null geodist($key, $member1, $member2, $unit = null)
+ * @method array       georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method array       georadiusbymember($key, $member, $radius, $unit, array $options = null)
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ClientInterface
 {
     /**
-     * Returns the command factory used by the client.
+     * Returns the server profile used by the client.
      *
-     * @return FactoryInterface
+     * @return ProfileInterface
      */
-    public function getCommandFactory();
+    public function getProfile();
 
     /**
      * Returns the client options specified upon initialization.

src/Cluster/Distributor/HashRing.php

@@ -161,7 +161,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
         $replicas = (int) round($weightRatio * $totalNodes * $replicas);
 
         for ($i = 0; $i < $replicas; ++$i) {
-            $key = crc32("$nodeHash:$i");
+            $key = $this->hash("$nodeHash:$i");
             $ring[$key] = $nodeObject;
         }
     }

src/Cluster/Hash/CRC16.php

@@ -61,6 +61,8 @@ class CRC16 implements HashGeneratorInterface
         // CRC-CCITT-16 algorithm
         $crc = 0;
         $CCITT_16 = self::$CCITT_16;
+
+        $value = (string) $value;
         $strlen = strlen($value);
 
         for ($i = 0; $i < $strlen; ++$i) {

src/Collection/Iterator/CursorBasedIterator.php

@@ -65,8 +65,8 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getCommandFactory()->supportsCommand($commandID)) {
-            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
+        if (!$client->getProfile()->supportsCommand($commandID)) {
+            throw new NotSupportedException("The current profile does not support '$commandID'.");
         }
     }
 
@@ -92,7 +92,7 @@ abstract class CursorBasedIterator implements \Iterator
     {
         $options = array();
 
-        if (strlen($this->match) > 0) {
+        if (strlen(strval($this->match)) > 0) {
             $options['MATCH'] = $this->match;
         }
 
@@ -138,7 +138,9 @@ abstract class CursorBasedIterator implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -147,7 +149,9 @@ abstract class CursorBasedIterator implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -155,7 +159,9 @@ abstract class CursorBasedIterator implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -163,7 +169,9 @@ abstract class CursorBasedIterator implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         tryFetch: {
@@ -183,7 +191,9 @@ abstract class CursorBasedIterator implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;

src/Collection/Iterator/HashKey.php

@@ -50,11 +50,9 @@ class HashKey extends CursorBasedIterator
      */
     protected function extractNext()
     {
-        if ($kv = each($this->elements)) {
-            $this->position = $kv[0];
-            $this->current = $kv[1];
+        $this->position = key($this->elements);
+        $this->current = current($this->elements);
 
-            unset($this->elements[$this->position]);
-        }
+        unset($this->elements[$this->position]);
     }
 }

src/Collection/Iterator/ListKey.php

@@ -73,8 +73,8 @@ class ListKey implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getCommandFactory()->supportsCommand($commandID)) {
-            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
+        if (!$client->getProfile()->supportsCommand($commandID)) {
+            throw new NotSupportedException("The current profile does not support '$commandID'.");
         }
     }
 
@@ -127,7 +127,9 @@ class ListKey implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -136,7 +138,9 @@ class ListKey implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -144,7 +148,9 @@ class ListKey implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -152,7 +158,9 @@ class ListKey implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         if (!$this->elements && $this->fetchmore) {
@@ -168,7 +176,9 @@ class ListKey implements \Iterator
 
     /**
      * {@inheritdoc}
+     * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;

src/Collection/Iterator/SortedSetKey.php

@@ -50,11 +50,9 @@ class SortedSetKey extends CursorBasedIterator
      */
     protected function extractNext()
     {
-        if ($kv = each($this->elements)) {
-            $this->position = $kv[0];
-            $this->current = $kv[1];
+        $this->position = key($this->elements);
+        $this->current = current($this->elements);
 
-            unset($this->elements[$this->position]);
-        }
+        unset($this->elements[$this->position]);
     }
 }

src/Command/Command.php

@@ -21,12 +21,24 @@ abstract class Command implements CommandInterface
     private $slot;
     private $arguments = array();
 
+    /**
+     * Returns a filtered array of the arguments.
+     *
+     * @param array $arguments List of arguments.
+     *
+     * @return array
+     */
+    protected function filterArguments(array $arguments)
+    {
+        return $arguments;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function setArguments(array $arguments)
     {
-        $this->arguments = $arguments;
+        $this->arguments = $this->filterArguments($arguments);
         unset($this->slot);
     }
 
@@ -92,7 +104,7 @@ abstract class Command implements CommandInterface
      */
     public static function normalizeArguments(array $arguments)
     {
-        if (count($arguments) === 1 && is_array($arguments[0])) {
+        if (count($arguments) === 1 && isset($arguments[0]) && is_array($arguments[0])) {
             return $arguments[0];
         }
 

src/Command/ConnectionAuth.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/auth
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class AUTH extends RedisCommand
+class ConnectionAuth extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ConnectionEcho.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/echo
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ECHO_ extends RedisCommand
+class ConnectionEcho extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ConnectionPing.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/ping
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PING extends RedisCommand
+class ConnectionPing extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ConnectionQuit.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/quit
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class QUIT extends RedisCommand
+class ConnectionQuit extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ConnectionSelect.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/select
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class SELECT extends RedisCommand
+class ConnectionSelect extends Command
 {
     /**
      * {@inheritdoc}

src/Command/GeospatialGeoAdd.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/geoadd
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEOADD extends RedisCommand
+class GeospatialGeoAdd extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,7 +29,7 @@ class GEOADD extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             foreach (array_pop($arguments) as $item) {
@@ -39,6 +37,6 @@ class GEOADD extends RedisCommand
             }
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/GeospatialGeoDist.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/geodist
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEODIST extends RedisCommand
+class GeospatialGeoDist extends Command
 {
     /**
      * {@inheritdoc}

src/Command/GeospatialGeoHash.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/geohash
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEOHASH extends RedisCommand
+class GeospatialGeoHash extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,13 +29,13 @@ class GEOHASH extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $members = array_pop($arguments);
             $arguments = array_merge($arguments, $members);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/GeospatialGeoPos.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/geopos
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEOPOS extends RedisCommand
+class GeospatialGeoPos extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,13 +29,13 @@ class GEOPOS extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $members = array_pop($arguments);
             $arguments = array_merge($arguments, $members);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/GeospatialGeoRadius.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/georadius
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEORADIUS extends RedisCommand
+class GeospatialGeoRadius extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,7 +29,7 @@ class GEORADIUS extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if ($arguments && is_array(end($arguments))) {
             $options = array_change_key_case(array_pop($arguments), CASE_UPPER);
@@ -68,6 +66,6 @@ class GEORADIUS extends RedisCommand
             }
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/GeospatialGeoRadiusByMember.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/georadiusbymember
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class GEORADIUSBYMEMBER extends GEORADIUS
+class GeospatialGeoRadiusByMember extends GeospatialGeoRadius
 {
     /**
      * {@inheritdoc}

src/Command/HashDelete.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hdel
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HDEL extends RedisCommand
+class HashDelete extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class HDEL extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeVariadic($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeVariadic($arguments);
     }
 }

src/Command/HashExists.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hexists
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HEXISTS extends RedisCommand
+class HashExists extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashGet.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hget
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HGET extends RedisCommand
+class HashGet extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashGetAll.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hgetall
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HGETALL extends RedisCommand
+class HashGetAll extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashGetMultiple.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hmget
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HMGET extends RedisCommand
+class HashGetMultiple extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class HMGET extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeVariadic($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeVariadic($arguments);
     }
 }

src/Command/HashIncrementBy.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hincrby
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HINCRBY extends RedisCommand
+class HashIncrementBy extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashIncrementByFloat.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hincrbyfloat
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HINCRBYFLOAT extends RedisCommand
+class HashIncrementByFloat extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashKeys.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hkeys
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HKEYS extends RedisCommand
+class HashKeys extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashLength.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hlen
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HLEN extends RedisCommand
+class HashLength extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashScan.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hscan
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSCAN extends RedisCommand
+class HashScan extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,14 +29,14 @@ class HSCAN extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 
     /**

src/Command/HashSet.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hset
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSET extends RedisCommand
+class HashSet extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashSetMultiple.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hmset
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HMSET extends RedisCommand
+class HashSetMultiple extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,7 +29,7 @@ class HMSET extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $flattenedKVs = array($arguments[0]);
@@ -42,9 +40,9 @@ class HMSET extends RedisCommand
                 $flattenedKVs[] = $v;
             }
 
-            $arguments = $flattenedKVs;
+            return $flattenedKVs;
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/HashSetPreserve.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hsetnx
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSETNX extends RedisCommand
+class HashSetPreserve extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashStringLength.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hstrlen
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSTRLEN extends RedisCommand
+class HashStringLength extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HashValues.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hvals
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HVALS extends RedisCommand
+class HashValues extends Command
 {
     /**
      * {@inheritdoc}

src/Command/HyperLogLogAdd.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pfadd
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PFADD extends RedisCommand
+class HyperLogLogAdd extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class PFADD extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeVariadic($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeVariadic($arguments);
     }
 }

src/Command/HyperLogLogCount.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pfcount
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PFCOUNT extends RedisCommand
+class HyperLogLogCount extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class PFCOUNT extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeArguments($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeArguments($arguments);
     }
 }

src/Command/HyperLogLogMerge.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pfmerge
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PFMERGE extends RedisCommand
+class HyperLogLogMerge extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class PFMERGE extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeArguments($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeArguments($arguments);
     }
 }

src/Command/KeyDelete.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/del
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class DEL extends RedisCommand
+class KeyDelete extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class DEL extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeArguments($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeArguments($arguments);
     }
 }

src/Command/KeyDump.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/dump
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class DUMP extends RedisCommand
+class KeyDump extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyExists.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/exists
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXISTS extends RedisCommand
+class KeyExists extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyExpire.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/expire
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXPIRE extends RedisCommand
+class KeyExpire extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyExpireAt.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/expireat
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXPIREAT extends RedisCommand
+class KeyExpireAt extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyKeys.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/keys
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class KEYS extends RedisCommand
+class KeyKeys extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyMigrate.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/migrate
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class MIGRATE extends RedisCommand
+class KeyMigrate extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,7 +29,7 @@ class MIGRATE extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (is_array(end($arguments))) {
             foreach (array_pop($arguments) as $modifier => $value) {
@@ -47,6 +45,6 @@ class MIGRATE extends RedisCommand
             }
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/KeyMove.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/move
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class MOVE extends RedisCommand
+class KeyMove extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyPersist.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/persist
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PERSIST extends RedisCommand
+class KeyPersist extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyPreciseExpire.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pexpire
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PEXPIRE extends RedisCommand
+class KeyPreciseExpire extends KeyExpire
 {
     /**
      * {@inheritdoc}

src/Command/KeyPreciseExpireAt.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pexpireat
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PEXPIREAT extends RedisCommand
+class KeyPreciseExpireAt extends KeyExpireAt
 {
     /**
      * {@inheritdoc}

src/Command/KeyPreciseTimeToLive.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/pttl
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PTTL extends RedisCommand
+class KeyPreciseTimeToLive extends KeyTimeToLive
 {
     /**
      * {@inheritdoc}

src/Command/KeyRandom.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/randomkey
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RANDOMKEY extends RedisCommand
+class KeyRandom extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyRename.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/rename
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RENAME extends RedisCommand
+class KeyRename extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyRenamePreserve.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/renamenx
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RENAMENX extends RedisCommand
+class KeyRenamePreserve extends KeyRename
 {
     /**
      * {@inheritdoc}

src/Command/KeyRestore.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/restore
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RESTORE extends RedisCommand
+class KeyRestore extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyScan.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/scan
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class SCAN extends RedisCommand
+class KeyScan extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,14 +29,14 @@ class SCAN extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 
     /**

src/Command/KeySort.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/sort
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class SORT extends RedisCommand
+class KeySort extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,12 +29,10 @@ class SORT extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 1) {
-            parent::setArguments($arguments);
-
-            return;
+            return $arguments;
         }
 
         $query = array($arguments[0]);
@@ -82,6 +78,6 @@ class SORT extends RedisCommand
             $query[] = $sortParams['STORE'];
         }
 
-        parent::setArguments($query);
+        return $query;
     }
 }

src/Command/KeyTimeToLive.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/ttl
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class TTL extends RedisCommand
+class KeyTimeToLive extends Command
 {
     /**
      * {@inheritdoc}

src/Command/KeyType.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/type
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class TYPE extends RedisCommand
+class KeyType extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListIndex.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/lindex
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class LINDEX extends RedisCommand
+class ListIndex extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListInsert.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/linsert
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class LINSERT extends RedisCommand
+class ListInsert extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListLength.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/llen
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class LLEN extends RedisCommand
+class ListLength extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPopFirst.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/lpop
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class LPOP extends RedisCommand
+class ListPopFirst extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPopFirstBlocking.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/blpop
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class BLPOP extends RedisCommand
+class ListPopFirstBlocking extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,13 +29,13 @@ class BLPOP extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[0])) {
             list($arguments, $timeout) = $arguments;
             array_push($arguments, $timeout);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 }

src/Command/ListPopLast.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/rpop
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RPOP extends RedisCommand
+class ListPopLast extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPopLastBlocking.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) Daniele Alessandri <suppakilla@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+/**
+ * @link http://redis.io/commands/brpop
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class ListPopLastBlocking extends ListPopFirstBlocking
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BRPOP';
+    }
+}

src/Command/ListPopLastPushHead.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/rpoplpush
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RPOPLPUSH extends RedisCommand
+class ListPopLastPushHead extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPopLastPushHeadBlocking.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/brpoplpush
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class BRPOPLPUSH extends RedisCommand
+class ListPopLastPushHeadBlocking extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPushHead.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) Daniele Alessandri <suppakilla@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+/**
+ * @link http://redis.io/commands/lpush
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class ListPushHead extends ListPushTail
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'LPUSH';
+    }
+}

src/Command/ListPushHeadX.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/lpushx
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class LPUSHX extends RedisCommand
+class ListPushHeadX extends Command
 {
     /**
      * {@inheritdoc}

src/Command/ListPushTail.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/rpush
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RPUSH extends RedisCommand
+class ListPushTail extends Command
 {
     /**
      * {@inheritdoc}
@@ -31,10 +29,8 @@ class RPUSH extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(array $arguments)
     {
-        $arguments = self::normalizeVariadic($arguments);
-
-        parent::setArguments($arguments);
+        return self::normalizeVariadic($arguments);
     }
 }

src/Command/ListPushTailX.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/rpushx
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RPUSHX extends RedisCommand
+class ListPushTailX extends Command
 {
     /**
      * {@inheritdoc}