Implement abstraction for WAIT.

This abstraction makes it possible to issue a WAIT command using a
client instance connected to a single Redis node or configured with
either a replication or cluster backend:

  $client = new Predis\Client($parameters, $options);
  $ack = new Predis\Replication\WaitContext($client);

  $ack->set('key:1', 'value:1');
  $ack->set('key:2', 'value:2');

  if ($ack->wait(2, 500)) {
    // Writes acknowledged by at least 2 slaves.
  } else {
    // Writes were not acknowledged by at least 2 slaves in 500ms.
  }

When the client is operating in replication mode, WAIT is executed
against the connection currently in use by the underlying backend. On
the other hand when it is operating in cluster mode WAIT is executed
against only one connection as cross-slot operations are not allowed.

This is just a first draft in response to #298 that serves as a base
for further improvements and changes. Tests are still missing.

CHANGELOG.md

@@ -1,3 +1,63 @@
+v2.0.0 (201x-xx-xx)
+================================================================================
+
+- Accepted values for some client options have changed, this is the new list of
+  accepted values:
+
+  - `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.
+
+- Client option classes now live in the `Predis\Configuration\Option` namespace.
+
+- 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.
+
+- 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.
+
+- 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`).
+
+- 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.
+
+- 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.0 (2016-06-02)
 ================================================================================
 

README.md

@@ -10,6 +10,11 @@
 
 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
@@ -20,7 +25,7 @@ More details about this project can be found on the [frequently asked questions]
 
 ## Main features ##
 
-- Support for different versions of Redis (from __2.0__ to __3.2__) using profiles.
+- Support for Redis from __2.0__ to __3.2__.
 - 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).
@@ -33,7 +38,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 profiles and override the default ones.
+- Flexible system for defining custom commands and override the default ones.
 
 
 ## How to _install_ and use Predis ##
@@ -148,20 +153,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, ['profile' => '2.8', 'prefix' => 'sample:']);
+$client = new Predis\Client($parameters, ['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:
 
-  - `profile`: specifies the profile to use to match a specific version of Redis.
-  - `prefix`: prefix string automatically applied to keys found in commands.
+  - `prefix`: prefix string applied to every key 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 object).
-  - `replication`: specifies a replication backend (`TRUE`, `sentinel` or callable object).
-  - `aggregate`: overrides `cluster` and `replication` to provide a custom connections aggregator.
+  - `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).
   - `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.
@@ -265,7 +270,7 @@ $options    = ['replication' => function () {
     $strategy = new Predis\Replication\ReplicationStrategy();
     $strategy->setScriptReadOnly($LUA_SCRIPT);
 
-    return new Predis\Connection\Aggregate\MasterSlaveReplication($strategy);
+    return new Predis\Connection\Replication\MasterSlaveReplication($strategy);
 }];
 
 $client = new Predis\Client($parameters, $options);
@@ -324,7 +329,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 server profiles used by the client:
+command classes to define or override commands in the default command factory used by the client:
 
 ```php
 // Define a new command by extending Predis\Command\Command:
@@ -336,9 +341,12 @@ class BrandNewRedisCommand extends Predis\Command\Command
     }
 }
 
-// Inject your command in the current profile:
-$client = new Predis\Client();
-$client->getProfile()->defineCommand('newcmd', 'BrandNewRedisCommand');
+// Inject your command in the current command factory:
+$client = new Predis\Client($parameters, [
+    'commands' => [
+        'newcmd' => 'BrandNewRedisCommand',
+    ],
+]);
 
 $response = $client->newcmd();
 ```
@@ -357,7 +365,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 server profile used by the client and are accessible as if
+Script commands can be registered in the command factory 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)
@@ -383,9 +391,12 @@ LUA;
     }
 }
 
-// Inject the script command in the current profile:
-$client = new Predis\Client();
-$client->getProfile()->defineCommand('lpushrand', 'ListPushRandomValue');
+// Inject the script command in the current command factory:
+$client = new Predis\Client($parameters, [
+    'commands' => [
+        'lpushrand' => 'ListPushRandomValue',
+    ],
+]);
 
 $response = $client->lpushrand('random_values', $seed = mt_rand());
 ```
@@ -443,15 +454,11 @@ 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. 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 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 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).

VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0-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\StringSet class):
+// Predis\Command\Redis\StringSet class):
 //
 //   $ ./bin/generate-command-test --class=StringSet
 //
@@ -45,6 +45,11 @@ 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;
     }
 
@@ -92,8 +97,12 @@ class CommandTestCaseGenerator
             throw new RuntimeException("Missing 'class' option.");
         }
 
-        $options['fqn'] = "Predis\\Command\\{$options['class']}";
-        $options['path'] = "Command/{$options['class']}.php";
+        if (!isset($options['realm'])) {
+            throw new RuntimeException("Missing 'realm' option.");
+        }
+
+        $options['fqn'] = "Predis\\Command\\Redis\\{$options['class']}";
+        $options['path'] = "Command/Redis/{$options['class']}.php";
 
         $source = __DIR__.'/../src/'.$options['path'];
         if (!file_exists($source)) {
@@ -101,7 +110,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);
@@ -109,18 +118,11 @@ class CommandTestCaseGenerator
 
     protected function getTestRealm()
     {
-        if (isset($this->options['realm'])) {
-            if (!$this->options['realm']) {
-                throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
-            }
-            return $this->options['realm'];
+        if (empty($this->options['realm'])) {
+            throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
         }
 
-        $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);
+        return $this->options['realm'];
     }
 
     public function generate()
@@ -130,6 +132,7 @@ 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.");
         }
@@ -173,7 +176,7 @@ class CommandTestCaseGenerator
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
  * @group commands

composer.json

@@ -27,5 +27,10 @@
     },
     "autoload": {
         "psr-4": {"Predis\\": "src/"}
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0-dev"
+        }
     }
 }

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\Aggregate\PredisCluster;
+use Predis\Connection\Cluster\PredisCluster;
 
 class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
 {
@@ -104,8 +104,8 @@ for ($i = 0; $i < 100; ++$i) {
     $client->get("key:$i");
 }
 
-$server1 = $client->getClientFor('first')->info();
-$server2 = $client->getClientFor('second')->info();
+$server1 = $client->on('first')->info();
+$server2 = $client->on('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)
+    public function __invoke($payload, $dispatcher)
     {
         $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) use ($dispatcher) {
+$dispatcher->attachCallback('control', function ($payload, $dispatcher) {
     if ($payload === 'terminate_dispatcher') {
         $dispatcher->stop();
     }

examples/lua_scripting_abstraction.php

@@ -13,11 +13,10 @@ require __DIR__.'/shared.php';
 
 // This example will not work with versions of Redis < 2.6.
 //
-// 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.
+// 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:
 
 use Predis\Command\ScriptCommand;
 
@@ -50,12 +49,9 @@ LUA;
 }
 
 $client = new Predis\Client($single_server, array(
-    'profile' => function ($options) {
-        $profile = $options->getDefault('profile');
-        $profile->defineCommand('increxby', 'IncrementExistingKeysBy');
-
-        return $profile;
-    },
+    'commands' => array(
+        'increxby' => 'IncrementExistingKeysBy',
+    ),
 ));
 
 $client->mset('foo', 10, 'foobar', 100);

examples/redis_collections_iterators.php

@@ -13,7 +13,7 @@ require __DIR__.'/shared.php';
 
 use Predis\Collection\Iterator;
 
-// Starting from Redis 2.8, clients can iterate incrementally over collections
+// Starting with 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,8 +29,7 @@ use Predis\Collection\Iterator;
 // See http://redis.io/commands/scan for more details.
 //
 
-// Create a client using `2.8` as a server profile (needs Redis 2.8!)
-$client = new Predis\Client($single_server, array('profile' => '2.8'));
+$client = new Predis\Client($single_server);
 
 // 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 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.
+// 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.
 
 use Predis\Command\ScriptCommand;
-use Predis\Connection\Aggregate\MasterSlaveReplication;
+use Predis\Connection\Replication\MasterSlaveReplication;
 use Predis\Replication\ReplicationStrategy;
 
 // ------------------------------------------------------------------------- //
@@ -52,12 +52,9 @@ $parameters = array(
 );
 
 $options = array(
-    'profile' => function ($options, $option) {
-        $profile = $options->getDefault($option);
-        $profile->defineCommand('hmgetall', 'HashMultipleGetAll');
-
-        return $profile;
-    },
+    'commands' => array(
+        'hmgetall' => 'HashMultipleGetAll',
+    ),
     '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' => true);
+$options = array('replication' => 'predis');
 
 $client = new Predis\Client($parameters, $options);
 

package.ini

@@ -10,8 +10,8 @@ name        = "Predis"
 desc        = "Flexible and feature-complete Redis client for PHP and HHVM"
 homepage    = "http://github.com/nrk/predis"
 license     = "MIT"
-version     = "1.1.0"
-stability   = "stable"
+version     = "2.0.0"
+stability   = "devel"
 channel     = "pear.nrk.io"
 
 author      = "Daniele Alessandri \"nrk\" <suppakilla@gmail.com>"

phpunit.xml.dist

@@ -38,7 +38,6 @@
 
     <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

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

src/Client.php

@@ -19,6 +19,7 @@ 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;
@@ -40,11 +41,22 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
  */
 class Client implements ClientInterface, \IteratorAggregate
 {
-    const VERSION = '1.1.0';
+    const VERSION = '2.0.0-dev';
 
-    protected $connection;
-    protected $options;
-    private $profile;
+    /**
+     * @var Predis\Configuration\OptionsInterface
+     */
+    private $options;
+
+    /**
+     * @var Predis\Connection\ConnectionInterface
+     */
+    private $connection;
+
+    /**
+     * @var Predis\Command\FactoryInterface
+     */
+    private $commands;
 
     /**
      * @param mixed $parameters Connection parameters for one or more servers.
@@ -54,7 +66,7 @@ class Client implements ClientInterface, \IteratorAggregate
     {
         $this->options = $this->createOptions($options ?: array());
         $this->connection = $this->createConnection($parameters ?: array());
-        $this->profile = $this->options->profile;
+        $this->commands = $this->options->commands;
     }
 
     /**
@@ -78,7 +90,7 @@ class Client implements ClientInterface, \IteratorAggregate
             return $options;
         }
 
-        throw new \InvalidArgumentException('Invalid type for client options.');
+        throw new \InvalidArgumentException('Invalid type for client options');
     }
 
     /**
@@ -102,81 +114,76 @@ 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 $this->options->connections->create($parameters);
+            return $options->connections->create($parameters);
         }
 
         if (is_array($parameters)) {
             if (!isset($parameters[0])) {
-                return $this->options->connections->create($parameters);
+                return $options->connections->create($parameters);
             }
 
-            $options = $this->options;
-
-            if ($options->defined('aggregate')) {
-                $initializer = $this->getConnectionInitializerWrapper($options->aggregate);
-                $connection = $initializer($parameters, $options);
+            if ($options->defined('cluster')) {
+                return $this->createAggregateConnection($parameters, 'cluster');
             } elseif ($options->defined('replication')) {
-                $replication = $options->replication;
-
-                if ($replication instanceof AggregateConnectionInterface) {
-                    $connection = $replication;
-                    $options->connections->aggregate($connection, $parameters);
-                } else {
-                    $initializer = $this->getConnectionInitializerWrapper($replication);
-                    $connection = $initializer($parameters, $options);
-                }
+                return $this->createAggregateConnection($parameters, 'replication');
+            } elseif ($options->defined('aggregate')) {
+                return $this->createAggregateConnection($parameters, 'aggregate');
             } else {
-                $connection = $options->cluster;
-                $options->connections->aggregate($connection, $parameters);
+                throw new \InvalidArgumentException(
+                    'Array of connection parameters requires `cluster`, `replication` or `aggregate` client option'
+                );
             }
-
-            return $connection;
         }
 
         if (is_callable($parameters)) {
-            $initializer = $this->getConnectionInitializerWrapper($parameters);
-            $connection = $initializer($this->options);
+            $connection = call_user_func($parameters, $options);
+
+            if (!$connection instanceof ConnectionInterface) {
+                throw new \InvalidArgumentException('Callable parameters must return a valid connection');
+            }
 
             return $connection;
         }
 
-        throw new \InvalidArgumentException('Invalid type for connection parameters.');
+        throw new \InvalidArgumentException('Invalid type for connection parameters');
     }
 
     /**
-     * Wraps a callable to make sure that its returned value represents a valid
-     * connection type.
+     * Creates an aggregate connection.
      *
-     * @param mixed $callable
+     * @param mixed  $parameters Connection parameters.
+     * @param string $option     Option for aggregate connections (`aggregate`, `cluster`, `replication`).
      *
      * @return \Closure
      */
-    protected function getConnectionInitializerWrapper($callable)
+    protected function createAggregateConnection($parameters, $option)
     {
-        return function () use ($callable) {
-            $connection = call_user_func_array($callable, func_get_args());
+        $options = $this->getOptions();
 
-            if (!$connection instanceof ConnectionInterface) {
-                throw new \UnexpectedValueException(
-                    'The callable connection initializer returned an invalid type.'
-                );
-            }
+        $initializer = $options->$option;
+        $connection = $initializer($parameters);
 
-            return $connection;
-        };
+        // 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;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getProfile()
+    public function getCommandFactory()
     {
-        return $this->profile;
+        return $this->commands;
     }
 
     /**
@@ -188,23 +195,34 @@ class Client implements ClientInterface, \IteratorAggregate
     }
 
     /**
-     * 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.
+     * Creates a new client from the specified connection ID / alias.
      *
-     * @param string $connectionID Identifier of a connection.
+     * 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.
      *
-     * @throws \InvalidArgumentException
+     * NOTE: This method works only when the client is configured to work with
+     * aggregate connections (cluster, replication).
      *
-     * @return Client
+     * @param string        $connectionID Identifier of a connection.
+     * @param callable|null $callable     Optional callable object.
+     *
+     * @return ClientInterface|mixed
      */
-    public function getClientFor($connectionID)
+    public function on($connectionID, $callable = null)
     {
         if (!$connection = $this->getConnectionById($connectionID)) {
-            throw new \InvalidArgumentException("Invalid connection ID: $connectionID.");
+            throw new \InvalidArgumentException("Invalid connection ID: `$connectionID`");
         }
 
-        return new static($connection, $this->options);
+        $client = new static($connection, $this->getOptions());
+
+        if ($callable) {
+            return call_user_func($callable, $client);
+        } else {
+            return $client;
+        }
     }
 
     /**
@@ -278,7 +296,7 @@ class Client implements ClientInterface, \IteratorAggregate
      * applying any prefix to keys or throwing exceptions on Redis errors even
      * regardless of client options.
      *
-     * It is possibile to indentify Redis error responses from normal responses
+     * It is possible to identify Redis error responses from normal responses
      * using the second optional argument which is populated by reference.
      *
      * @param array $arguments Command arguments as defined by the command signature.
@@ -289,9 +307,10 @@ class Client implements ClientInterface, \IteratorAggregate
     public function executeRaw(array $arguments, &$error = null)
     {
         $error = false;
+        $commandID = array_shift($arguments);
 
         $response = $this->connection->executeCommand(
-            new RawCommand($arguments)
+            new RawCommand($commandID, $arguments)
         );
 
         if ($response instanceof ResponseInterface) {
@@ -320,7 +339,7 @@ class Client implements ClientInterface, \IteratorAggregate
      */
     public function createCommand($commandID, $arguments = array())
     {
-        return $this->profile->createCommand($commandID, $arguments);
+        return $this->commands->createCommand($commandID, $arguments);
     }
 
     /**
@@ -354,10 +373,7 @@ class Client implements ClientInterface, \IteratorAggregate
     protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
     {
         if ($command instanceof ScriptCommand && $response->getErrorType() === 'NOSCRIPT') {
-            $eval = $this->createCommand('EVAL');
-            $eval->setRawArguments($command->getEvalArguments());
-
-            $response = $this->executeCommand($eval);
+            $response = $this->executeCommand($command->getEvalCommand());
 
             if (!$response instanceof ResponseInterface) {
                 $response = $command->parseResponse($response);
@@ -400,9 +416,11 @@ class Client implements ClientInterface, \IteratorAggregate
 
                 return $this->$initializer($arg0, $arg1);
 
+        // @codeCoverageIgnoreStart
             default:
                 return $this->$initializer($this, $argv);
         }
+        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -481,7 +499,7 @@ class Client implements ClientInterface, \IteratorAggregate
     }
 
     /**
-     * Creates a new publis/subscribe context and returns it, or starts its loop
+     * Creates a new publish/subscribe context and returns it, or starts its loop
      * inside the optionally provided callable object.
      *
      * @param mixed ... Array of options, a callable for execution, or both.

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.
@@ -177,11 +177,11 @@ use Predis\Profile\ProfileInterface;
 interface ClientInterface
 {
     /**
-     * Returns the server profile used by the client.
+     * Returns the command factory used by the client.
      *
-     * @return ProfileInterface
+     * @return FactoryInterface
      */
-    public function getProfile();
+    public function getCommandFactory();
 
     /**
      * Returns the client options specified upon initialization.

src/Collection/Iterator/CursorBasedIterator.php

@@ -65,8 +65,8 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getProfile()->supportsCommand($commandID)) {
-            throw new NotSupportedException("The current profile does not support '$commandID'.");
+        if (!$client->getCommandFactory()->supportsCommand($commandID)) {
+            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
         }
     }
 

src/Collection/Iterator/ListKey.php

@@ -73,8 +73,8 @@ class ListKey implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getProfile()->supportsCommand($commandID)) {
-            throw new NotSupportedException("The current profile does not support '$commandID'.");
+        if (!$client->getCommandFactory()->supportsCommand($commandID)) {
+            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
         }
     }
 

src/Command/Command.php

@@ -21,24 +21,12 @@ 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 = $this->filterArguments($arguments);
+        $this->arguments = $arguments;
         unset($this->slot);
     }
 

src/Command/Factory.php

@@ -9,43 +9,30 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Profile;
+namespace Predis\Command;
 
 use Predis\ClientException;
 use Predis\Command\Processor\ProcessorInterface;
 
 /**
- * Base class implementing common functionalities for Redis server profiles.
+ * Base command factory.
+ *
+ * This class provides all of the common functionalities needed for the creation
+ * of new instances of Redis commands.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class RedisProfile implements ProfileInterface
+abstract class Factory implements FactoryInterface
 {
-    private $commands;
-    private $processor;
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->commands = $this->getSupportedCommands();
-    }
-
-    /**
-     * Returns a map of all the commands supported by the profile and their
-     * actual PHP classes.
-     *
-     * @return array
-     */
-    abstract protected function getSupportedCommands();
+    protected $commands = array();
+    protected $processor;
 
     /**
      * {@inheritdoc}
      */
     public function supportsCommand($commandID)
     {
-        return isset($this->commands[strtoupper($commandID)]);
+        return $this->getCommandClass($commandID) !== null;
     }
 
     /**
@@ -63,8 +50,9 @@ abstract class RedisProfile implements ProfileInterface
     }
 
     /**
-     * Returns the fully-qualified name of a class representing the specified
-     * command ID registered in the current server profile.
+     * Returns the FQN of a class that represents the specified command ID.
+     *
+     * @codeCoverageIgnore
      *
      * @param string $commandID Command ID.
      *
@@ -82,13 +70,12 @@ abstract class RedisProfile implements ProfileInterface
      */
     public function createCommand($commandID, array $arguments = array())
     {
-        $commandID = strtoupper($commandID);
+        if (!$commandClass = $this->getCommandClass($commandID)) {
+            $commandID = strtoupper($commandID);
 
-        if (!isset($this->commands[$commandID])) {
             throw new ClientException("Command '$commandID' is not a registered Redis command.");
         }
 
-        $commandClass = $this->commands[$commandID];
         $command = new $commandClass();
         $command->setArguments($arguments);
 
@@ -100,7 +87,7 @@ abstract class RedisProfile implements ProfileInterface
     }
 
     /**
-     * Defines a new command in the server profile.
+     * Defines a new command in the factory.
      *
      * @param string $commandID Command ID.
      * @param string $class     Fully-qualified name of a Predis\Command\CommandInterface.
@@ -109,10 +96,12 @@ abstract class RedisProfile implements ProfileInterface
      */
     public function defineCommand($commandID, $class)
     {
-        $reflection = new \ReflectionClass($class);
+        if ($class !== null) {
+            $reflection = new \ReflectionClass($class);
 
-        if (!$reflection->isSubclassOf('Predis\Command\CommandInterface')) {
-            throw new \InvalidArgumentException("The class '$class' is not a valid command class.");
+            if (!$reflection->isSubclassOf('Predis\Command\CommandInterface')) {
+                throw new \InvalidArgumentException("The class '$class' is not a valid command class.");
+            }
         }
 
         $this->commands[strtoupper($commandID)] = $class;
@@ -133,14 +122,4 @@ abstract class RedisProfile implements ProfileInterface
     {
         return $this->processor;
     }
-
-    /**
-     * Returns the version of server profile as its string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getVersion();
-    }
 }

src/Command/FactoryInterface.php

@@ -9,28 +9,20 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Profile;
-
-use Predis\Command\CommandInterface;
+namespace Predis\Command;
 
 /**
- * A profile defines all the features and commands supported by certain versions
- * of Redis. Instances of Predis\Client should use a server profile matching the
- * version of Redis being used.
+ * Command factory interface.
+ *
+ * Each Redis command should have a class counterpart and commands factories are
+ * used to create new instances of these classes through the library.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-interface ProfileInterface
+interface FactoryInterface
 {
     /**
-     * Returns the profile version corresponding to the Redis version.
-     *
-     * @return string
-     */
-    public function getVersion();
-
-    /**
-     * Checks if the profile supports the specified command.
+     * Checks if the command factory supports the specified command.
      *
      * @param string $commandID Command ID.
      *
@@ -39,7 +31,7 @@ interface ProfileInterface
     public function supportsCommand($commandID);
 
     /**
-     * Checks if the profile supports the specified list of commands.
+     * Checks if the command factory supports the specified list of commands.
      *
      * @param array $commandIDs List of command IDs.
      *

src/Command/Processor/ProcessorChain.php

@@ -111,8 +111,7 @@ class ProcessorChain implements \ArrayAccess, ProcessorInterface
     {
         if (!$processor instanceof ProcessorInterface) {
             throw new \InvalidArgumentException(
-                'A processor chain accepts only instances of '.
-                "'Predis\Command\Processor\ProcessorInterface'."
+                'Processor chain accepts only instances of `Predis\Command\Processor\ProcessorInterface`'
             );
         }
 

src/Command/RawCommand.php

@@ -28,20 +28,13 @@ class RawCommand implements CommandInterface
     private $arguments;
 
     /**
-     * @param array $arguments Command ID and its arguments.
-     *
-     * @throws \InvalidArgumentException
+     * @param string $commandID Command ID.
+     * @param array  $arguments Command arguments.
      */
-    public function __construct(array $arguments)
+    public function __construct($commandID, array $arguments = array())
     {
-        if (!$arguments) {
-            throw new \InvalidArgumentException(
-                'The arguments array must contain at least the command ID.'
-            );
-        }
-
-        $this->commandID = strtoupper(array_shift($arguments));
-        $this->arguments = $arguments;
+        $this->commandID = strtoupper($commandID);
+        $this->setArguments($arguments);
     }
 
     /**
@@ -55,7 +48,7 @@ class RawCommand implements CommandInterface
     public static function create($commandID /* [ $arg, ... */)
     {
         $arguments = func_get_args();
-        $command = new self($arguments);
+        $command = new static(array_shift($arguments), $arguments);
 
         return $command;
     }

src/Command/Redis/APPEND.php

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

src/Command/Redis/AUTH.php

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

src/Command/Redis/BGREWRITEAOF.php

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

src/Command/Redis/BGSAVE.php

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

src/Command/Redis/BITCOUNT.php

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

src/Command/Redis/BITFIELD.php

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

src/Command/Redis/BITOP.php

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

src/Command/Redis/BITPOS.php

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

src/Command/Redis/BLPOP.php

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

src/Command/Redis/BRPOP.php

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

src/Command/Redis/BRPOPLPUSH.php

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

src/Command/Redis/CLIENT.php

@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
  * @link http://redis.io/commands/client-list
@@ -19,7 +21,7 @@ namespace Predis\Command;
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ServerClient extends Command
+class CLIENT extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -44,7 +46,7 @@ class ServerClient extends Command
             case 'SETNAME':
             default:
                 return $data;
-        }
+        } // @codeCoverageIgnore
     }
 
     /**

src/Command/Redis/COMMAND.php

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

src/Command/Redis/CONFIG.php

@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
  * @link http://redis.io/commands/config-set
@@ -19,7 +21,7 @@ namespace Predis\Command;
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ServerConfig extends Command
+class CONFIG extends RedisCommand
 {
     /**
      * {@inheritdoc}

src/Command/Redis/DBSIZE.php

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

src/Command/Redis/DECR.php

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

src/Command/Redis/DECRBY.php

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

src/Command/Redis/DEL.php

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

src/Command/Redis/DISCARD.php

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

src/Command/Redis/DUMP.php

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

src/Command/Redis/ECHO_.php

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

src/Command/Redis/EVALSHA.php

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

src/Command/Redis/EVAL_.php

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

src/Command/Redis/EXEC.php

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

src/Command/Redis/EXISTS.php

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

src/Command/Redis/EXPIRE.php

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

src/Command/Redis/EXPIREAT.php

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

src/Command/Redis/FLUSHALL.php

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

src/Command/Redis/FLUSHDB.php

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

src/Command/Redis/GEOADD.php

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

src/Command/Redis/GEODIST.php

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

src/Command/Redis/GEOHASH.php

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

src/Command/Redis/GEOPOS.php

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

src/Command/Redis/GEORADIUS.php

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

src/Command/Redis/GEORADIUSBYMEMBER.php

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

src/Command/Redis/GET.php

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

src/Command/Redis/GETBIT.php

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

src/Command/Redis/GETRANGE.php

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

src/Command/Redis/GETSET.php

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

src/Command/Redis/HDEL.php

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

src/Command/Redis/HEXISTS.php

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

src/Command/Redis/HGET.php

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

src/Command/Redis/HGETALL.php

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

src/Command/Redis/HINCRBY.php

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

src/Command/Redis/HINCRBYFLOAT.php

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

src/Command/Redis/HKEYS.php

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

src/Command/Redis/HLEN.php

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

src/Command/Redis/HMGET.php

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

src/Command/Redis/HMSET.php

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

src/Command/Redis/HSCAN.php

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

src/Command/Redis/HSET.php

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

src/Command/Redis/HSETNX.php

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

src/Command/Redis/HSTRLEN.php

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

src/Command/Redis/HVALS.php

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

src/Command/Redis/INCR.php

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

src/Command/Redis/INCRBY.php

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

src/Command/Redis/INCRBYFLOAT.php

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

src/Command/Redis/INFO.php

@@ -9,14 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
  * @link http://redis.io/commands/info
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ServerInfo extends Command
+class INFO extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -31,10 +33,51 @@ class ServerInfo extends Command
      */
     public function parseResponse($data)
     {
-        $info = array();
-        $infoLines = preg_split('/\r?\n/', $data);
+        if (empty($data) || !$lines = preg_split('/\r?\n/', $data)) {
+            return array();
+        }
 
-        foreach ($infoLines as $row) {
+        if (strpos($lines[0], '#') === 0) {
+            return $this->parseNewResponseFormat($lines);
+        } else {
+            return $this->parseOldResponseFormat($lines);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseNewResponseFormat($lines)
+    {
+        $info = array();
+        $current = null;
+
+        foreach ($lines as $row) {
+            if ($row === '') {
+                continue;
+            }
+
+            if (preg_match('/^# (\w+)$/', $row, $matches)) {
+                $info[$matches[1]] = array();
+                $current = &$info[$matches[1]];
+                continue;
+            }
+
+            list($k, $v) = $this->parseRow($row);
+            $current[$k] = $v;
+        }
+
+        return $info;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseOldResponseFormat($lines)
+    {
+        $info = array();
+
+        foreach ($lines as $row) {
             if (strpos($row, ':') === false) {
                 continue;
             }
@@ -82,30 +125,4 @@ class ServerInfo extends Command
 
         return $db;
     }
-
-    /**
-     * Parses the response and extracts the allocation statistics.
-     *
-     * @param string $str Response buffer.
-     *
-     * @return array
-     */
-    protected function parseAllocationStats($str)
-    {
-        $stats = array();
-
-        foreach (explode(',', $str) as $kv) {
-            @list($size, $objects, $extra) = explode('=', $kv);
-
-            // hack to prevent incorrect values when parsing the >=256 key
-            if (isset($extra)) {
-                $size = ">=$objects";
-                $objects = $extra;
-            }
-
-            $stats[$size] = $objects;
-        }
-
-        return $stats;
-    }
 }

src/Command/Redis/KEYS.php

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

src/Command/Redis/LASTSAVE.php

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

src/Command/Redis/LINDEX.php

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

src/Command/Redis/LINSERT.php

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

src/Command/Redis/LLEN.php

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

src/Command/Redis/LPOP.php

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

src/Command/Redis/LPUSH.php

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

src/Command/Redis/LPUSHX.php

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

src/Command/Redis/LRANGE.php

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

src/Command/Redis/LREM.php

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

src/Command/Redis/LSET.php

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

src/Command/Redis/LTRIM.php

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

src/Command/Redis/MGET.php

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

src/Command/Redis/MIGRATE.php

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

src/Command/Redis/MONITOR.php

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

src/Command/Redis/MOVE.php

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

src/Command/Redis/MSET.php

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

src/Command/Redis/MSETNX.php

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