Update CHANGELOG and bump VERSION.

[tests] Do not allow failures for HHVM on Travis CI.
[tests] Troubles with HHVM <= 3.6.6 and float timeouts.
2026-08-19 03:11:54 +00:00 · 2016-05-30 17:25:52 +02:00 · 2016-05-30 17:00:46 +02:00 · 2016-05-30 17:00:14 +02:00 · 2016-05-27 22:01:45 +02:00 · 2016-05-27 21:32:47 +02:00
375 changed files with 7188 additions and 3650 deletions
@@ -0,0 +1,17 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+trim_trailing_whitespace = true
+max_line_length = 120
+
+[*.{md,yml}]
+indent_size = 2
@@ -1,8 +1,10 @@
 * text=auto

 /tests export-ignore
+/.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.php_cs export-ignore
 /.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
 /phpunit.xml.travisci export-ignore
@@ -1,5 +1,7 @@
 *.tgz
 *.phar
+.php-version
+.php_cs.cache
 phpunit.xml
 package.xml
 composer.lock
@@ -0,0 +1,34 @@
+<?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')
+    );
@@ -1,16 +1,17 @@
 language: php
+sudo: false
 php:
  - 5.3
  - 5.4
  - 5.5
  - 5.6
+  - 7.0
  - hhvm
-  - hhvm-nightly
 branches:
  except:
    - v0.5
    - v0.6
-    - php5.2_backport
+    - v0.6-PHP_5.2
    - documentation
 services: redis-server
 before_script:
@@ -19,7 +20,4 @@ before_script:
 script:
  - vendor/bin/phpunit -c phpunit.xml.travisci
 matrix:
-  allow_failures:
-    - php: hhvm
-    - php: hhvm-nightly
  fast_finish: true
@@ -1,3 +1,62 @@
+v1.0.4 (2016-05-30)
+================================================================================
+
+- Added new profile for Redis 3.2 with its new commands: `HSTRLEN`, `BITFIELD`,
+  `GEOADD`, `GEOHASH`, `GEOPOS`, `GEODIST`, `GEORADIUS`, `GEORADIUSBYMEMBER`.
+  The default server profile for Predis is still the one for Redis 3.0 you must
+  set the `profile` client option to `3.2` when initializing the client in order
+  to be able to use them when connecting to Redis 3.2.
+
+- Various improvements in the handling of redis-cluster:
+
+    - If the connection to a specific node fails when executing a command, the
+      client tries to connect to another node in order to refresh the slots map
+      and perform a new attempt to execute the command.
+
+    - Connections to nodes can be preassigned to non-contiguous slot ranges via
+      the `slots` parameter using a comma separator. This is how it looks like
+      in practice: `tcp://127.0.0.1:6379?slots=0-5460,5500-5600,11000`.
+
+- __FIX__: broken values returned by `Predis\Collection\Iterator\HashKey` when
+  iterating hash keys containing integer fields (PR #330, ISSUE #331).
+
+- __FIX__: prevent failures when `Predis\Connection\StreamConnection` serializes
+  commands with holes in their arguments (e.g. `[0 => 'key:0', 2 => 'key:2']`).
+  The same fix has been applied to `Predis\Protocol\Text\RequestSerializer`.
+  (ISSUE #316).
+
+
+v1.0.3 (2015-07-30)
+================================================================================
+
+- __FIX__: the previous release introduced a severe regression on HHVM that made
+  the library unable to connect to Redis when using IPv4 addresses. Code running
+  on the standard PHP interpreter is not affected.
+
+
+v1.0.2 (2015-07-30)
+================================================================================
+
+- IPv6 is now fully supported.
+
+- Added `redis` as an accepted scheme for connection parameters. When using this
+  scheme, the rules used to parse URI strings match the provisional registration
+  [published by IANA](http://www.iana.org/assignments/uri-schemes/prov/redis).
+
+- Added new or missing commands: `HSTRLEN` (>= 3.2), `ZREVRANGEBYLEX` (>= 2.8)
+  and `MIGRATE` (>= 2.6).
+
+- Implemented support for the `ZADD` modifiers `NX|XX`, `CH`, `INCR` (Redis >=
+  3.0.2) using the simplified signature where scores and members are passed as
+  a named array.
+
+- __FIX__: `Predis\Configuration\Options` must not trigger the autoloader when
+  option values are strings (ISSUE #257).
+
+- __FIX__: `BITPOS` was not defined in the key-prefix processor (ISSUE #265) and
+  in the replication strategy.
+
+
 v1.0.1 (2015-01-02)
 ================================================================================

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Daniele Alessandri
+Copyright (c) 2009-2016 Daniele Alessandri

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -1,50 +1,46 @@
 # Predis #

-[![Latest Stable Version](https://poser.pugx.org/predis/predis/v/stable.png)](https://packagist.org/packages/predis/predis)
-[![Total Downloads](https://poser.pugx.org/predis/predis/downloads.png)](https://packagist.org/packages/predis/predis)
-[![License](https://poser.pugx.org/predis/predis/license.svg)](https://packagist.org/packages/predis/predis)
-[![Build Status](https://travis-ci.org/nrk/predis.svg?branch=master)](https://travis-ci.org/nrk/predis)
-[![HHVM Status](http://hhvm.h4cc.de/badge/predis/predis.png)](http://hhvm.h4cc.de/package/predis/predis)
+[![Latest stable][ico-version-stable]][link-packagist]
+[![Latest development][ico-version-dev]][link-packagist]
+[![Software license][ico-license]](LICENSE)
+[![Monthly installs][ico-downloads-monthly]][link-downloads]
+[![Build status][ico-travis]][link-travis]
+[![HHVM support][ico-hhvm]][link-hhvm]

-Predis is a flexible and feature-complete [Redis](http://redis.io) client library for PHP >= 5.3.
+Flexible and feature-complete [Redis](http://redis.io) client for PHP >= 5.3 and HHVM >= 2.3.0.

-By default Predis does not require any additional C extension, but it can be optionally paired with
-[phpiredis](https://github.com/nrk/phpiredis) to lower the overhead of serializing and parsing the
-Redis protocol. An asynchronous implementation of the client, albeit experimental, is also available
-through [Predis\Async](https://github.com/nrk/predis-async).
+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).

-Predis can be used with [HHVM](http://www.hhvm.com) >= 2.3.0, but there are no guarantees you will
-not run into unexpected issues (especially when the JIT compiler is enabled via `Eval.Jit = true`)
-due to HHVM being still under heavy development, thus unstable and not yet 100% compatible with PHP.
-
-More details about the project can be found in our [frequently asked questions](FAQ.md) section or
-on the online [wiki](https://github.com/nrk/predis/wiki).
+More details about this project can be found on the [frequently asked questions](FAQ.md).


 ## Main features ##

- Wide range of Redis versions supported (from __2.0__ to __3.0__ and __unstable__) using profiles.
- Cluster of nodes via client-side sharding using consistent hashing or custom distributors.
- Smart support for [redis-cluster](http://redis.io/topics/cluster-tutorial) (Redis >= 3.0).
- Support for master-slave replication configurations (write on master, read from slaves).
- Transparent key prefixing for all known Redis commands using a customizable prefixing strategy.
- Command pipelining (works on both single nodes and aggregate connections).
- Abstraction for Redis transactions (Redis >= 2.0) supporting CAS operations (Redis >= 2.2).
- Abstraction for Lua scripting (Redis >= 2.6) with automatic switching between `EVALSHA` or `EVAL`.
+- 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 standalone master-slave replication setups.
+- Transparent key prefixing of keys using a customizable prefix strategy.
+- Command pipelining on both single nodes and clusters (client-side sharding only).
+- Abstraction for Redis transactions (Redis >= 2.0) and CAS operations (Redis >= 2.2).
+- Abstraction for Lua scripting (Redis >= 2.6) and automatic switching between `EVALSHA` or `EVAL`.
 - Abstraction for `SCAN`, `SSCAN`, `ZSCAN` and `HSCAN` (Redis >= 2.8) based on PHP iterators.
- Connections to Redis are established lazily by the client upon the first command.
- Support for both TCP/IP and UNIX domain sockets and persistent connections.
- Support for [Webdis](http://webd.is) (both `ext-curl` and `ext-phpiredis` are needed).
+- Connections are established lazily by the client upon the first command and can be persisted.
+- Connections can be established via TCP/IP 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 and registering custom sets of supported commands or profiles.
+- Flexible system for defining custom commands and server profiles.


-## How to use Predis ##
+## How to _install_ and use Predis ##

-Predis is available on [Packagist](http://packagist.org/packages/predis/predis) which allows a quick
-installation using [Composer](http://packagist.org/about-composer). Alternatively, the library can
-be found on our [own PEAR channel](http://pear.nrk.io) for a more traditional installation via PEAR.
-Ultimately, archives of each release are [available on GitHub](https://github.com/nrk/predis/tags).
+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).


 ### Loading the library ###
@@ -52,7 +48,7 @@ Ultimately, archives of each release are [available on GitHub](https://github.co
 Predis relies on the autoloading features of PHP to load its files when needed and complies with the
 [PSR-4 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md).
 Autoloading is handled automatically when dependencies are managed through Composer, but it is also
-possible to leverage its own autoloader in projects or scripts not having any autoload facility:
+possible to leverage its own autoloader in projects or scripts lacking any autoload facility:

 ```php
 // Prepend a base path if Predis is not available in your "include_path".
@@ -61,17 +57,15 @@ require 'Predis/Autoloader.php';
 Predis\Autoloader::register();
 ```

-It is possible to easily create a [phar](http://www.php.net/manual/en/intro.phar.php) archive from
-the repository just by launching `bin/create-phar`. The generated phar contains a stub defining an
-autoloader function for Predis, so you just need to require the phar to start using the library.
-Alternatively it is possible to generate one single PHP file holding every class like older versions
-of Predis by launching `bin/create-single-file`, but this practice __is not__ encouraged.
+It is also possible to create a [phar](http://www.php.net/manual/en/intro.phar.php) archive directly
+from the repository by launching the `bin/create-phar` script. The generated phar already contains a
+stub defining its own autoloader, so you just need to `require()` it to start using the library.


 ### Connecting to Redis ###

-When not specifying any connection parameter to create a new client, Predis assumes `127.0.0.1` and
-`6379` as the default host and port with a connection timeout of 5 seconds:
+When creating a client instance without passing any connection parameter, Predis assumes `127.0.0.1`
+and `6379` as default host and port. The default timeout for the `connect()` operation is 5 seconds:

 ```php
 $client = new Predis\Client();
@@ -79,22 +73,37 @@ $client->set('foo', 'bar');
 $value = $client->get('foo');
 ```

-Connection parameters can be supplied either in the form of URI strings or named arrays. While the
-latter is the preferred way to supply parameters, URI strings can be useful for quick configurations
-or when parameters are read from a non-structured source:
+Connection parameters can be supplied either in the form of URI strings or named arrays. The latter
+is the preferred way to supply parameters, but URI strings can be useful when parameters are read
+from non-structured or partially-structured sources:

 ```php
-// Named array of connection parameters:
+// Parameters passed using a named array:
 $client = new Predis\Client([
    'scheme' => 'tcp',
    'host'   => '10.0.0.1',
    'port'   => 6379,
 ]);

-// Same set of parameters, but using an URI string:
+// Same set of parameters, passed using an URI string:
 $client = new Predis\Client('tcp://10.0.0.1:6379');
 ```

+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:
+
+```php
+$client = new Predis\Client(['scheme' => 'unix', 'path' => '/path/to/redis.sock']);
+$client = new Predis\Client('unix:///path/to/redis.sock');
+```
+
+The connection schemes [`redis`](http://www.iana.org/assignments/uri-schemes/prov/redis) (alias of
+`tcp`) is also supported, with the difference that URI strings containing these schemes are parsed
+following the rules described on the IANA provisional registration.
+
+The actual list of supported connection parameters can vary depending on each connection backend so
+it is recommended to refer to their specific documentation or implementation for details.
+
 When an array of connection parameters is provided, Predis automatically works in cluster mode using
 client-side sharding. Both named arrays and URI strings can be mixed when providing configurations
 for each node:
@@ -106,68 +115,97 @@ $client = new Predis\Client([
 ]);
 ```

-The actual list of supported connection parameters can vary depending on each connection backend so
-it is recommended to refer to their specific documentation or implementation for details.
+See the [aggregate connections](#aggregate-connections) section of this document for more details.


 ### Client configuration ###

-Various aspects of the client can be configured simply by passing options to the second argument of
-`Predis\Client::__construct()`:
+Many aspects and behaviors of the client can be configured by passing specific client options to the
+second argument of `Predis\Client::__construct()`:

 ```php
-$client = new \Predis\Client(
-    $connection_parameters,
-    ['profile' => '2.8', 'prefix' => 'sample:']
-);
+$client = new Predis\Client($parameters, ['profile' => '2.8', 'prefix' => 'sample:']);
 ```

-Options are managed using a mini DI-alike container and their values
-are usually lazily initialized only when needed. Predis by default supports the following options:
+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`: which profile to use in order to match a specific version of Redis.
-  - `prefix`: a prefix string that is automatically applied to keys 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`: connection backends or a connection factory to be used by the client.
-  - `cluster`: which backend to use for clustering (`predis`, `redis` or custom configuration).
-  - `replication`: which backend to use for replication (predis or custom configuration).
-  - `aggregate`: custom connections aggregator (overrides both `cluster` and `replication`).
+  - `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` or callable object).
+  - `aggregate`: overrides `cluster` and `replication` to provide a custom connections aggregator.

-Users can provide custom options with their values or lazy callable initializers that are stored in
-the options container for later 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.


 ### Aggregate connections ###

-Predis is able to aggregate multiple connections which is the base for cluster and replication. By
-default the client implements a cluster of nodes using either client-side sharding (default) or a
-Redis-backed solution using [redis-cluster](http://redis.io/topics/cluster-tutorial).
-As for replication, Predis can handle a single-master and multiple-slaves setup by executing read
-operations on slaves and switching to the master for write operations. The replication behavior is
-fully configurable.
+Aggregate connections are the foundation upon which Predis implements clustering and replication and
+they are used to group multiple connections to single Redis nodes and hide the specific logic needed
+to handle them properly depending on the context. Aggregate connections usually require an array of
+connection parameters when creating a new client instance.
+
+#### Cluster ####
+
+By default, when no specific client options are set and an array of connection parameters is passed
+to the client's constructor, Predis configures itself to work in clustering mode using a traditional
+client-side sharding approach to create a cluster of independent nodes and distribute the keyspace
+among them. This approach needs some form of external health monitoring of nodes and requires manual
+operations to rebalance the keyspace when changing its configuration by adding or removing nodes:
+
+```php
+$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+
+$client = new Predis\Client($parameters);
+```
+
+Along with Redis 3.0, a new supervised and coordinated type of clustering was introduced in the form
+of [redis-cluster](http://redis.io/topics/cluster-tutorial). This kind of approach uses a different
+algorithm to distribute the keyspaces, with Redis nodes coordinating themselves by communicating via
+a gossip protocol to handle health status, rebalancing, nodes discovery and request redirection. In
+order to connect to a cluster managed by redis-cluster, the client requires a list of its nodes (not
+necessarily complete since it will automatically discover new nodes if necessary) and the `cluster`
+client options set to `redis`:
+
+```php
+$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options    = ['cluster' => 'redis'];
+
+$client = new Predis\Client($parameters, $options);
+```

 #### Replication ####

-The client can be configured to work in a master / slave replication setup by executing read-only
-commands on slave nodes and automatically switch to the master node as soon as a command performing
-a write operation is executed. This is the basic configuration needed to work with replication:
+The client can be configured to operate in a single master / multiple slaves setup to provide better
+service availability. When using replication, Predis recognizes read-only commands and sends them to
+a random slave in order to provide some sort of load-balancing and switches to the master as soon as
+it detects a command that performs any kind of operation that would end up modifying the keyspace or
+the value of a key. Instead of raising a connection error when a slave fails, the client attempts to
+fall back to a different slave among the ones provided in the configuration.
+
+The basic configuration needed to use the client in replication mode requires one Redis server to be
+identified as the master (this can be done via connection parameters using the `alias` parameter set
+to `master`) and one or more servers acting as slaves:

 ```php
-// Parameters require one master node specifically marked with `alias=master`.
-$parameters = ['tcp://10.0.0.1?alias=master', 'tcp://10.0.0.2?alias=slave-01'];
+$parameters = ['tcp://10.0.0.1?alias=master', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
 $options    = ['replication' => true];

 $client = new Predis\Client($parameters, $options);
 ```

 While Predis is able to distinguish commands performing write and read-only operations, `EVAL` and
-`EVALSHA` represent a corner case in which the client switches to the master node because it is not
-able to tell when a Lua script is safe to be executed on slaves. While this is the default behavior,
+`EVALSHA` represent a corner case in which the client switches to the master node because it cannot
+tell when a Lua script is safe to be executed on slaves. While this is indeed the default behavior,
 when certain Lua scripts do not perform write operations it is possible to provide an hint to tell
-the client to stick with slaves for their execution.
+the client to stick with slaves for their execution:

 ```php
-$parameters = ['tcp://10.0.0.1?alias=master', 'tcp://10.0.0.2?alias=slave-01'];
+$parameters = ['tcp://10.0.0.1?alias=master', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
 $options    = ['replication' => function () {
    // Set scripts that won't trigger a switch from a slave to the master node.
    $strategy = new Predis\Replication\ReplicationStrategy();
@@ -181,29 +219,8 @@ $client->eval($LUA_SCRIPT, 0);             // Sticks to slave using `eval`...
 $client->evalsha(sha1($LUA_SCRIPT), 0);    // ... and `evalsha`, too.
 ```

-The `examples` directory contains two complete scripts showing how replication can be configured for
-[simple](examples/replication_simple.php) or [complex](examples/replication_complex.php) scenarios.
-
-
-#### Cluster ####
-
-Simply passing an array of connection parameters to the client constructor configures Predis to work
-in cluster mode using client-side sharding. If you, on the other hand, want to leverage Redis >= 3.0
-nodes coordinated by redis-cluster, then the client must be initialized like this:
-
-```php
-$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2'];
-$options    = ['cluster' => 'redis'];
-
-$client = new Predis\Client($parameters, $options);
-```
-
-When using redis-cluster, it is not necessary to pass all of the nodes that compose your cluster but
-you can simply specify only a few nodes: Predis will automatically fetch the full and updated slots
-map directly from Redis by contacting one of the servers.
-
-__NOTE__: our support for redis-cluster does not currently consider master / slave replication but
-this feature will be added in a future release of this library.
+The [`examples`](examples/) directory contains a few scripts that demonstrate how the client can be
+configured and used to leverage replication in both basic and complex scenarios.


 ### Command pipelines ###
@@ -214,7 +231,7 @@ The client can execute the pipeline inside a callable block or return a pipeline
 ability to chain commands thanks to its fluent interface:

 ```php
-// Executes a pipeline inside a given callable block:
+// Executes a pipeline inside the given callable block:
 $responses = $client->pipeline(function ($pipe) {
    for ($i = 0; $i < 1000; $i++) {
        $pipe->set("key:$i", str_pad($i, 4, '0', 0));
@@ -222,7 +239,7 @@ $responses = $client->pipeline(function ($pipe) {
    }
 });

-// Returns a pipeline instance with fluent interface:
+// Returns a pipeline that can be chained thanks to its fluent interface:
 $responses = $client->pipeline()->set('foo', 'bar')->get('foo')->execute();
 ```

@@ -233,13 +250,13 @@ The client provides an abstraction for Redis transactions based on `MULTI` and `
 interface to command pipelines:

 ```php
-// Executes a transaction inside a given callable block:
+// Executes a transaction inside the given callable block:
 $responses = $client->transaction(function ($tx) {
    $tx->set('foo', 'bar');
    $tx->get('foo');
 });

-// Returns a transaction instance with fluent interface:
+// Returns a transaction that can be chained thanks to its fluent interface:
 $responses = $client->transaction()->set('foo', 'bar')->get('foo')->execute();
 ```

@@ -251,9 +268,9 @@ of a transaction using CAS you can see [the following example](examples/transact
 ### Adding new commands ###

 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 older 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 server profiles used by the client:
+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:

 ```php
 // Define a new command by extending Predis\Command\Command:
@@ -273,8 +290,8 @@ $response = $client->newcmd();
 ```

 There is also a method to send raw commands without filtering their arguments or parsing responses.
-Users must provide the arguments list as an array, following the command signatures as defined by
-the [Redis documentation for commands](http://redis.io/commands):
+Users must provide the list of arguments for the command as an array, following the signatures as
+defined by the [Redis documentation for commands](http://redis.io/commands):

 ```php
 $response = $client->executeRaw(['SET', 'foo', 'bar']);
@@ -284,16 +301,16 @@ $response = $client->executeRaw(['SET', 'foo', 'bar']);
 ### Script commands ###

 While it is possible to leverage [Lua scripting](http://redis.io/commands/eval) on Redis 2.6+ using
-[`EVAL`](http://redis.io/commands/eval) and [`EVALSHA`](http://redis.io/commands/evalsha), Predis
-offers script commands as an higher level abstraction aiming to make things simple. 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) is used as a fall
-back when needed:
+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
+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)
+is used as a fall back when needed:

 ```php
-// Define a new scriptable command by extending Predis\Command\ScriptCommand:
+// Define a new script command by extending Predis\Command\ScriptCommand:
 class ListPushRandomValue extends Predis\Command\ScriptCommand
 {
    public function getKeysCount()
@@ -312,7 +329,7 @@ LUA;
    }
 }

-// Inject your script command in the current profile:
+// Inject the script command in the current profile:
 $client = new Predis\Client();
 $client->getProfile()->defineCommand('lpushrand', 'ListPushRandomValue');

@@ -325,19 +342,19 @@ $response = $client->lpushrand('random_values', $seed = mt_rand());
 Predis can use different connection backends to connect to Redis. Two of them leverage a third party
 extension such as [phpiredis](https://github.com/nrk/phpiredis) resulting in major performance gains
 especially when dealing with big multibulk responses. While one is based on PHP streams, the other
-is based on socket resources provided by `ext-socket`. Both support TCP/IP or UNIX domain sockets:
+is based on socket resources provided by `ext-socket`. Both support TCP/IP and UNIX domain sockets:

 ```php
 $client = new Predis\Client('tcp://127.0.0.1', [
    'connections' => [
-        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection',  // PHP streams
-        'unix' => 'Predis\Connection\PhpiredisSocketConnection',  // ext-socket
+        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection',  // PHP stream resources
+        'unix' => 'Predis\Connection\PhpiredisSocketConnection',  // ext-socket resources
    ],
 ]);
 ```

 Developers can create their own connection classes to support whole new network backends, extend
-existing ones or provide completely different implementations. Connection classes must implement
+existing classes or provide completely different implementations. Connection classes must implement
 `Predis\Connection\NodeConnectionInterface` or extend `Predis\Connection\AbstractConnection`:

 ```php
@@ -405,3 +422,15 @@ found [on its project page](http://travis-ci.org/nrk/predis).
 ### License ###

 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-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-hhvm]: https://img.shields.io/hhvm/predis/predis.svg?style=flat-square
+
+[link-packagist]: https://packagist.org/packages/predis/predis
+[link-travis]: https://travis-ci.org/nrk/predis
+[link-downloads]: https://packagist.org/packages/predis/predis/stats
+[link-hhvm]: http://hhvm.h4cc.de/package/predis/predis
@@ -1 +1 @@
-1.1.0-dev
+1.0.4
@@ -19,7 +19,7 @@
 // files, but namespaces and classes definitions must follow a precise order
 // when dealing with subclassing and inheritance.
 //
-// The current implementation is pretty naïve, but it should do for now.
+// The current implementation is pretty naïve, but it should do for now.
 // -------------------------------------------------------------------------- //

 class CommandLine
@@ -27,10 +27,10 @@ class CommandLine
    public static function getOptions()
    {
        $parameters = array(
-            's:'  => 'source:',
-            'o:'  => 'output:',
-            'e:'  => 'exclude:',
-            'E:'  => 'exclude-classes:',
+            's:' => 'source:',
+            'o:' => 'output:',
+            'e:' => 'exclude:',
+            'E:' => 'exclude-classes:',
        );

        $getops = getopt(implode(array_keys($parameters)), $parameters);
@@ -1,7 +1,7 @@
 {
    "name": "predis/predis",
    "type": "library",
-    "description": "Flexible and feature-complete PHP client library for Redis",
+    "description": "Flexible and feature-complete Redis client for PHP and HHVM",
    "keywords": ["nosql", "redis", "predis"],
    "homepage": "http://github.com/nrk/predis",
    "license": "MIT",
@@ -16,10 +16,10 @@
        }
    ],
    "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.2"
    },
    "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~4.8"
    },
    "suggest": {
        "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol",
@@ -27,10 +27,5 @@
    },
    "autoload": {
        "psr-4": {"Predis\\": "src/"}
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.1-dev"
-        }
    }
 }
@@ -15,9 +15,9 @@ require __DIR__.'/shared.php';
 // their own distributors used by the client to distribute keys among a cluster
 // of servers.

-use Predis\Cluster\PredisStrategy;
 use Predis\Cluster\Distributor\DistributorInterface;
 use Predis\Cluster\Hash\HashGeneratorInterface;
+use Predis\Cluster\PredisStrategy;
 use Predis\Connection\Aggregate\PredisCluster;

 class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
@@ -34,7 +34,7 @@ class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
    public function add($node, $weight = null)
    {
        $this->nodes[] = $node;
-        $this->nodesCount++;
+        ++$this->nodesCount;
    }

    public function remove($node)
@@ -99,7 +99,7 @@ $options = array(

 $client = new Predis\Client($multiple_servers, $options);

-for ($i = 0; $i < 100; $i++) {
+for ($i = 0; $i < 100; ++$i) {
    $client->set("key:$i", str_pad($i, 4, '0', 0));
    $client->get("key:$i");
 }
@@ -26,7 +26,7 @@ var_export($response); echo PHP_EOL;
 $mkv = array(
    'uid:0001' => '1st user',
    'uid:0002' => '2nd user',
-    'uid:0003' => '3rd user'
+    'uid:0003' => '3rd user',
 );

 $client->mset($mkv);
@@ -45,7 +45,7 @@ array (
 // their arguments are not filtered nor responses coming from Redis are parsed.

 $response = $client->executeRaw(array(
-    'MGET', 'uid:0001', 'uid:0002', 'uid:0003'
+    'MGET', 'uid:0001', 'uid:0002', 'uid:0003',
 ));

 var_export($response); echo PHP_EOL;
@@ -55,7 +55,7 @@ $client = new Predis\Client($single_server, array(
        $profile->defineCommand('increxby', 'IncrementExistingKeysBy');

        return $profile;
-    }
+    },
 ));

 $client->mset('foo', 10, 'foobar', 100);
@@ -28,7 +28,7 @@ foreach (($monitor = $client->monitor()) as $event) {
    // If we notice a ECHO command with the message QUIT_MONITOR, we stop the
    // monitor consumer and then break the loop.
    if ($event->command === 'ECHO' && $event->arguments === '"QUIT_MONITOR"') {
-        echo "Exiting the monitor loop...", PHP_EOL;
+        echo 'Exiting the monitor loop...', PHP_EOL;
        $monitor->stop();
        break;
    }
@@ -36,7 +36,7 @@ foreach ($pubsub as $message) {
        case 'message':
            if ($message->channel == 'control_channel') {
                if ($message->payload == 'quit_loop') {
-                    echo "Aborting pubsub loop...", PHP_EOL;
+                    echo 'Aborting pubsub loop...', PHP_EOL;
                    $pubsub->unsubscribe();
                } else {
                    echo "Received an unrecognized command: {$message->payload}.", PHP_EOL;
@@ -34,7 +34,7 @@ $client = new Predis\Client($single_server, array('profile' => '2.8'));

 // Prepare some keys for our example
 $client->del('predis:set', 'predis:zset', 'predis:hash');
-for ($i = 0; $i < 5; $i++) {
+for ($i = 0; $i < 5; ++$i) {
    $client->sadd('predis:set', "member:$i");
    $client->zadd('predis:zset', -$i, "member:$i");
    $client->hset('predis:hash', "field:$i", "value:$i");
@@ -81,5 +81,5 @@ $hashes = $client->hmgetall('metavars', 'servers');
 $replication = $client->getConnection();
 $stillOnSlave = $replication->getCurrent() === $replication->getConnectionById('slave');

-echo "Is still on slave? ", $stillOnSlave ? 'YES!' : 'NO!', PHP_EOL;
+echo 'Is still on slave? ', $stillOnSlave ? 'YES!' : 'NO!', PHP_EOL;
 var_export($hashes);
@@ -25,7 +25,7 @@ require __DIR__.'/shared.php';
 //

 if (!interface_exists('SessionHandlerInterface')) {
-    die("ATTENTION: the session handler implemented by Predis requires PHP >= 5.4.0 ".
+    die('ATTENTION: the session handler implemented by Predis requires PHP >= 5.4.0 '.
        "or a polyfill for SessionHandlerInterface provided by an external package.\n");
 }

@@ -25,7 +25,7 @@ function redis_version($info)
 $single_server = array(
    'host'     => '127.0.0.1',
    'port'     => 6379,
-    'database' => 15
+    'database' => 15,
 );

 $multiple_servers = array(
@@ -49,4 +49,4 @@ function zpop($client, $key)
 $client = new Predis\Client($single_server);
 $zpopped = zpop($client, 'zset');

-echo isset($zpopped) ? "ZPOPed $zpopped" : "Nothing to ZPOP!", PHP_EOL;
+echo isset($zpopped) ? "ZPOPed $zpopped" : 'Nothing to ZPOP!', PHP_EOL;
@@ -7,17 +7,17 @@

 [package]
 name        = "Predis"
-desc        = "Flexible and feature-complete PHP client library for Redis"
+desc        = "Flexible and feature-complete Redis client for PHP and HHVM"
 homepage    = "http://github.com/nrk/predis"
 license     = "MIT"
-version     = "1.1.0"
-stability   = "devel"
+version     = "1.0.4"
+stability   = "stable"
 channel     = "pear.nrk.io"

 author      = "Daniele Alessandri \"nrk\" <suppakilla@gmail.com>"

 [require]
-php = ">= 5.3.9"
+php = ">= 5.3.2"
 pearinstaller = "1.4.1"

 [roles]
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<phpunit bootstrap="tests/bootstrap.php" colors="true" strict="true">
+<phpunit bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         beStrictAboutTestSize="true"
+         beStrictAboutTestsThatDoNotTestAnything="true">
+
    <testsuites>
        <testsuite name="Predis Test Suite">
            <directory>tests/Predis/</directory>
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<phpunit bootstrap="tests/bootstrap.php" colors="true" strict="true">
+<phpunit bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         beStrictAboutTestSize="true"
+         beStrictAboutTestsThatDoNotTestAnything="true">
+
    <testsuites>
        <testsuite name="Predis Test Suite">
            <directory>tests/Predis/</directory>
@@ -29,7 +29,7 @@ class Autoloader
    public function __construct($baseDirectory = __DIR__)
    {
        $this->directory = $baseDirectory;
-        $this->prefix = __NAMESPACE__ . '\\';
+        $this->prefix = __NAMESPACE__.'\\';
        $this->prefixLength = strlen($this->prefix);
    }

@@ -40,7 +40,7 @@ class Autoloader
     */
    public static function register($prepend = false)
    {
-        spl_autoload_register(array(new self, 'autoload'), true, $prepend);
+        spl_autoload_register(array(new self(), 'autoload'), true, $prepend);
    }

    /**
@@ -55,7 +55,7 @@ class Autoloader
            $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';

            if (is_file($filepath)) {
-                require($filepath);
+                require $filepath;
            }
        }
    }
@@ -11,15 +11,13 @@

 namespace Predis;

-use InvalidArgumentException;
-use UnexpectedValueException;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
 use Predis\Command\ScriptCommand;
 use Predis\Configuration\Options;
 use Predis\Configuration\OptionsInterface;
-use Predis\Connection\ConnectionInterface;
 use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ParametersInterface;
 use Predis\Monitor\Consumer as MonitorConsumer;
 use Predis\Pipeline\Pipeline;
@@ -42,7 +40,7 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
 */
 class Client implements ClientInterface
 {
-    const VERSION = '1.1.0-dev';
+    const VERSION = '1.0.4';

    protected $connection;
    protected $options;
@@ -66,9 +64,9 @@ class Client implements ClientInterface
     *
     * @param mixed $options Client options.
     *
-     * @return OptionsInterface
-     *
     * @throws \InvalidArgumentException
+     *
+     * @return OptionsInterface
     */
    protected function createOptions($options)
    {
@@ -80,7 +78,7 @@ class Client implements ClientInterface
            return $options;
        }

-        throw new InvalidArgumentException("Invalid type for client options.");
+        throw new \InvalidArgumentException('Invalid type for client options.');
    }

    /**
@@ -98,9 +96,9 @@ class Client implements ClientInterface
     *
     * @param mixed $parameters Connection parameters or connection instance.
     *
-     * @return ConnectionInterface
-     *
     * @throws \InvalidArgumentException
+     *
+     * @return ConnectionInterface
     */
    protected function createConnection($parameters)
    {
@@ -142,7 +140,7 @@ class Client implements ClientInterface
            return $connection;
        }

-        throw new InvalidArgumentException('Invalid type for connection parameters.');
+        throw new \InvalidArgumentException('Invalid type for connection parameters.');
    }

    /**
@@ -159,7 +157,7 @@ class Client implements ClientInterface
            $connection = call_user_func_array($callable, func_get_args());

            if (!$connection instanceof ConnectionInterface) {
-                throw new UnexpectedValueException(
+                throw new \UnexpectedValueException(
                    'The callable connection initializer returned an invalid type.'
                );
            }
@@ -191,14 +189,14 @@ class Client implements ClientInterface
     *
     * @param string $connectionID Identifier of a connection.
     *
-     * @return Client
-     *
     * @throws \InvalidArgumentException
+     *
+     * @return Client
     */
    public function getClientFor($connectionID)
    {
        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);
@@ -255,9 +253,9 @@ class Client implements ClientInterface
     *
     * @param string $connectionID Index or alias of the single connection.
     *
-     * @return Connection\NodeConnectionInterface
-     *
     * @throws NotSupportedException
+     *
+     * @return Connection\NodeConnectionInterface
     */
    public function getConnectionById($connectionID)
    {
@@ -344,9 +342,9 @@ class Client implements ClientInterface
     * @param CommandInterface       $command  Redis command that generated the error.
     * @param ErrorResponseInterface $response Instance of the error response.
     *
-     * @return mixed
-     *
     * @throws ServerException
+     *
+     * @return mixed
     */
    protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
    {
@@ -38,6 +38,7 @@ 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 decr($key)
 * @method $this decrby($key, $decrement)
 * @method $this get($key)
@@ -71,6 +72,7 @@ use Predis\Command\CommandInterface;
 * @method $this hset($key, $field, $value)
 * @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 brpoplpush($source, $destination, $timeout)
@@ -97,7 +99,7 @@ use Predis\Command\CommandInterface;
 * @method $this sismember($key, $member)
 * @method $this smembers($key)
 * @method $this smove($source, $destination, $member)
- * @method $this spop($key)
+ * @method $this spop($key, $count = null)
 * @method $this srandmember($key, $count = null)
 * @method $this srem($key, $member)
 * @method $this sscan($key, $cursor, array $options = null)
@@ -121,6 +123,7 @@ use Predis\Command\CommandInterface;
 * @method $this zscore($key, $member)
 * @method $this zscan($key, $cursor, array $options = null)
 * @method $this zrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zrevrangebylex($key, $start, $stop, array $options = null)
 * @method $this zremrangebylex($key, $min, $max)
 * @method $this zlexcount($key, $min, $max)
 * @method $this pfadd($key, array $elements)
@@ -154,12 +157,17 @@ use Predis\Command\CommandInterface;
 * @method $this slowlog($subcommand, $argument = null)
 * @method $this time()
 * @method $this command()
+ * @method $this geoadd($key, $longitude, $latitude, $member)
+ * @method $this geohash($key, array $members)
+ * @method $this geopos($key, array $members)
+ * @method $this geodist($key, $member1, $member2, $unit = null)
+ * @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 interface ClientContextInterface
 {
-
    /**
     * Sends the specified command instance to Redis.
     *
@@ -46,6 +46,7 @@ use Predis\Profile\ProfileInterface;
 * @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)
@@ -79,6 +80,7 @@ use Predis\Profile\ProfileInterface;
 * @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)
@@ -105,7 +107,7 @@ use Predis\Profile\ProfileInterface;
 * @method int    sismember($key, $member)
 * @method array  smembers($key)
 * @method int    smove($source, $destination, $member)
- * @method string spop($key)
+ * @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)
@@ -123,12 +125,13 @@ use Predis\Profile\ProfileInterface;
 * @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, $min, $max, 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)
@@ -162,6 +165,12 @@ use Predis\Profile\ProfileInterface;
 * @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)
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
@@ -11,7 +11,6 @@

 namespace Predis\Cluster;

-use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Command\ScriptCommand;

@@ -44,126 +43,136 @@ abstract class ClusterStrategy implements StrategyInterface

        return array(
            /* commands operating on the key space */
-            'EXISTS'                => $getKeyFromFirstArgument,
-            'DEL'                   => $getKeyFromAllArguments,
-            'TYPE'                  => $getKeyFromFirstArgument,
-            'EXPIRE'                => $getKeyFromFirstArgument,
-            'EXPIREAT'              => $getKeyFromFirstArgument,
-            'PERSIST'               => $getKeyFromFirstArgument,
-            'PEXPIRE'               => $getKeyFromFirstArgument,
-            'PEXPIREAT'             => $getKeyFromFirstArgument,
-            'TTL'                   => $getKeyFromFirstArgument,
-            'PTTL'                  => $getKeyFromFirstArgument,
-            'SORT'                  => $getKeyFromFirstArgument, // TODO
-            'DUMP'                  => $getKeyFromFirstArgument,
-            'RESTORE'               => $getKeyFromFirstArgument,
+            'EXISTS' => $getKeyFromAllArguments,
+            'DEL' => $getKeyFromAllArguments,
+            'TYPE' => $getKeyFromFirstArgument,
+            'EXPIRE' => $getKeyFromFirstArgument,
+            'EXPIREAT' => $getKeyFromFirstArgument,
+            'PERSIST' => $getKeyFromFirstArgument,
+            'PEXPIRE' => $getKeyFromFirstArgument,
+            'PEXPIREAT' => $getKeyFromFirstArgument,
+            'TTL' => $getKeyFromFirstArgument,
+            'PTTL' => $getKeyFromFirstArgument,
+            'SORT' => array($this, 'getKeyFromSortCommand'),
+            'DUMP' => $getKeyFromFirstArgument,
+            'RESTORE' => $getKeyFromFirstArgument,

            /* commands operating on string values */
-            'APPEND'                => $getKeyFromFirstArgument,
-            'DECR'                  => $getKeyFromFirstArgument,
-            'DECRBY'                => $getKeyFromFirstArgument,
-            'GET'                   => $getKeyFromFirstArgument,
-            'GETBIT'                => $getKeyFromFirstArgument,
-            'MGET'                  => $getKeyFromAllArguments,
-            'SET'                   => $getKeyFromFirstArgument,
-            'GETRANGE'              => $getKeyFromFirstArgument,
-            'GETSET'                => $getKeyFromFirstArgument,
-            'INCR'                  => $getKeyFromFirstArgument,
-            'INCRBY'                => $getKeyFromFirstArgument,
-            'INCRBYFLOAT'           => $getKeyFromFirstArgument,
-            'SETBIT'                => $getKeyFromFirstArgument,
-            'SETEX'                 => $getKeyFromFirstArgument,
-            'MSET'                  => array($this, 'getKeyFromInterleavedArguments'),
-            'MSETNX'                => array($this, 'getKeyFromInterleavedArguments'),
-            'SETNX'                 => $getKeyFromFirstArgument,
-            'SETRANGE'              => $getKeyFromFirstArgument,
-            'STRLEN'                => $getKeyFromFirstArgument,
-            'SUBSTR'                => $getKeyFromFirstArgument,
-            'BITOP'                 => array($this, 'getKeyFromBitOp'),
-            'BITCOUNT'              => $getKeyFromFirstArgument,
+            'APPEND' => $getKeyFromFirstArgument,
+            'DECR' => $getKeyFromFirstArgument,
+            'DECRBY' => $getKeyFromFirstArgument,
+            'GET' => $getKeyFromFirstArgument,
+            'GETBIT' => $getKeyFromFirstArgument,
+            'MGET' => $getKeyFromAllArguments,
+            'SET' => $getKeyFromFirstArgument,
+            'GETRANGE' => $getKeyFromFirstArgument,
+            'GETSET' => $getKeyFromFirstArgument,
+            'INCR' => $getKeyFromFirstArgument,
+            'INCRBY' => $getKeyFromFirstArgument,
+            'INCRBYFLOAT' => $getKeyFromFirstArgument,
+            'SETBIT' => $getKeyFromFirstArgument,
+            'SETEX' => $getKeyFromFirstArgument,
+            'MSET' => array($this, 'getKeyFromInterleavedArguments'),
+            'MSETNX' => array($this, 'getKeyFromInterleavedArguments'),
+            'SETNX' => $getKeyFromFirstArgument,
+            'SETRANGE' => $getKeyFromFirstArgument,
+            'STRLEN' => $getKeyFromFirstArgument,
+            'SUBSTR' => $getKeyFromFirstArgument,
+            'BITOP' => array($this, 'getKeyFromBitOp'),
+            'BITCOUNT' => $getKeyFromFirstArgument,
+            'BITFIELD' => $getKeyFromFirstArgument,

            /* commands operating on lists */
-            'LINSERT'               => $getKeyFromFirstArgument,
-            'LINDEX'                => $getKeyFromFirstArgument,
-            'LLEN'                  => $getKeyFromFirstArgument,
-            'LPOP'                  => $getKeyFromFirstArgument,
-            'RPOP'                  => $getKeyFromFirstArgument,
-            'RPOPLPUSH'             => $getKeyFromAllArguments,
-            'BLPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
-            'BRPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
-            'BRPOPLPUSH'            => array($this, 'getKeyFromBlockingListCommands'),
-            'LPUSH'                 => $getKeyFromFirstArgument,
-            'LPUSHX'                => $getKeyFromFirstArgument,
-            'RPUSH'                 => $getKeyFromFirstArgument,
-            'RPUSHX'                => $getKeyFromFirstArgument,
-            'LRANGE'                => $getKeyFromFirstArgument,
-            'LREM'                  => $getKeyFromFirstArgument,
-            'LSET'                  => $getKeyFromFirstArgument,
-            'LTRIM'                 => $getKeyFromFirstArgument,
+            'LINSERT' => $getKeyFromFirstArgument,
+            'LINDEX' => $getKeyFromFirstArgument,
+            'LLEN' => $getKeyFromFirstArgument,
+            'LPOP' => $getKeyFromFirstArgument,
+            'RPOP' => $getKeyFromFirstArgument,
+            'RPOPLPUSH' => $getKeyFromAllArguments,
+            'BLPOP' => array($this, 'getKeyFromBlockingListCommands'),
+            'BRPOP' => array($this, 'getKeyFromBlockingListCommands'),
+            'BRPOPLPUSH' => array($this, 'getKeyFromBlockingListCommands'),
+            'LPUSH' => $getKeyFromFirstArgument,
+            'LPUSHX' => $getKeyFromFirstArgument,
+            'RPUSH' => $getKeyFromFirstArgument,
+            'RPUSHX' => $getKeyFromFirstArgument,
+            'LRANGE' => $getKeyFromFirstArgument,
+            'LREM' => $getKeyFromFirstArgument,
+            'LSET' => $getKeyFromFirstArgument,
+            'LTRIM' => $getKeyFromFirstArgument,

            /* commands operating on sets */
-            'SADD'                  => $getKeyFromFirstArgument,
-            'SCARD'                 => $getKeyFromFirstArgument,
-            'SDIFF'                 => $getKeyFromAllArguments,
-            'SDIFFSTORE'            => $getKeyFromAllArguments,
-            'SINTER'                => $getKeyFromAllArguments,
-            'SINTERSTORE'           => $getKeyFromAllArguments,
-            'SUNION'                => $getKeyFromAllArguments,
-            'SUNIONSTORE'           => $getKeyFromAllArguments,
-            'SISMEMBER'             => $getKeyFromFirstArgument,
-            'SMEMBERS'              => $getKeyFromFirstArgument,
-            'SSCAN'                 => $getKeyFromFirstArgument,
-            'SPOP'                  => $getKeyFromFirstArgument,
-            'SRANDMEMBER'           => $getKeyFromFirstArgument,
-            'SREM'                  => $getKeyFromFirstArgument,
+            'SADD' => $getKeyFromFirstArgument,
+            'SCARD' => $getKeyFromFirstArgument,
+            'SDIFF' => $getKeyFromAllArguments,
+            'SDIFFSTORE' => $getKeyFromAllArguments,
+            'SINTER' => $getKeyFromAllArguments,
+            'SINTERSTORE' => $getKeyFromAllArguments,
+            'SUNION' => $getKeyFromAllArguments,
+            'SUNIONSTORE' => $getKeyFromAllArguments,
+            'SISMEMBER' => $getKeyFromFirstArgument,
+            'SMEMBERS' => $getKeyFromFirstArgument,
+            'SSCAN' => $getKeyFromFirstArgument,
+            'SPOP' => $getKeyFromFirstArgument,
+            'SRANDMEMBER' => $getKeyFromFirstArgument,
+            'SREM' => $getKeyFromFirstArgument,

            /* commands operating on sorted sets */
-            'ZADD'                  => $getKeyFromFirstArgument,
-            'ZCARD'                 => $getKeyFromFirstArgument,
-            'ZCOUNT'                => $getKeyFromFirstArgument,
-            'ZINCRBY'               => $getKeyFromFirstArgument,
-            'ZINTERSTORE'           => array($this, 'getKeyFromZsetAggregationCommands'),
-            'ZRANGE'                => $getKeyFromFirstArgument,
-            'ZRANGEBYSCORE'         => $getKeyFromFirstArgument,
-            'ZRANK'                 => $getKeyFromFirstArgument,
-            'ZREM'                  => $getKeyFromFirstArgument,
-            'ZREMRANGEBYRANK'       => $getKeyFromFirstArgument,
-            'ZREMRANGEBYSCORE'      => $getKeyFromFirstArgument,
-            'ZREVRANGE'             => $getKeyFromFirstArgument,
-            'ZREVRANGEBYSCORE'      => $getKeyFromFirstArgument,
-            'ZREVRANK'              => $getKeyFromFirstArgument,
-            'ZSCORE'                => $getKeyFromFirstArgument,
-            'ZUNIONSTORE'           => array($this, 'getKeyFromZsetAggregationCommands'),
-            'ZSCAN'                 => $getKeyFromFirstArgument,
-            'ZLEXCOUNT'             => $getKeyFromFirstArgument,
-            'ZRANGEBYLEX'           => $getKeyFromFirstArgument,
-            'ZREMRANGEBYLEX'        => $getKeyFromFirstArgument,
-            'ZREVRANGEBYLEX'        => $getKeyFromFirstArgument,
+            'ZADD' => $getKeyFromFirstArgument,
+            'ZCARD' => $getKeyFromFirstArgument,
+            'ZCOUNT' => $getKeyFromFirstArgument,
+            'ZINCRBY' => $getKeyFromFirstArgument,
+            'ZINTERSTORE' => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZRANGE' => $getKeyFromFirstArgument,
+            'ZRANGEBYSCORE' => $getKeyFromFirstArgument,
+            'ZRANK' => $getKeyFromFirstArgument,
+            'ZREM' => $getKeyFromFirstArgument,
+            'ZREMRANGEBYRANK' => $getKeyFromFirstArgument,
+            'ZREMRANGEBYSCORE' => $getKeyFromFirstArgument,
+            'ZREVRANGE' => $getKeyFromFirstArgument,
+            'ZREVRANGEBYSCORE' => $getKeyFromFirstArgument,
+            'ZREVRANK' => $getKeyFromFirstArgument,
+            'ZSCORE' => $getKeyFromFirstArgument,
+            'ZUNIONSTORE' => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZSCAN' => $getKeyFromFirstArgument,
+            'ZLEXCOUNT' => $getKeyFromFirstArgument,
+            'ZRANGEBYLEX' => $getKeyFromFirstArgument,
+            'ZREMRANGEBYLEX' => $getKeyFromFirstArgument,
+            'ZREVRANGEBYLEX' => $getKeyFromFirstArgument,

            /* commands operating on hashes */
-            'HDEL'                  => $getKeyFromFirstArgument,
-            'HEXISTS'               => $getKeyFromFirstArgument,
-            'HGET'                  => $getKeyFromFirstArgument,
-            'HGETALL'               => $getKeyFromFirstArgument,
-            'HMGET'                 => $getKeyFromFirstArgument,
-            'HMSET'                 => $getKeyFromFirstArgument,
-            'HINCRBY'               => $getKeyFromFirstArgument,
-            'HINCRBYFLOAT'          => $getKeyFromFirstArgument,
-            'HKEYS'                 => $getKeyFromFirstArgument,
-            'HLEN'                  => $getKeyFromFirstArgument,
-            'HSET'                  => $getKeyFromFirstArgument,
-            'HSETNX'                => $getKeyFromFirstArgument,
-            'HVALS'                 => $getKeyFromFirstArgument,
-            'HSCAN'                 => $getKeyFromFirstArgument,
+            'HDEL' => $getKeyFromFirstArgument,
+            'HEXISTS' => $getKeyFromFirstArgument,
+            'HGET' => $getKeyFromFirstArgument,
+            'HGETALL' => $getKeyFromFirstArgument,
+            'HMGET' => $getKeyFromFirstArgument,
+            'HMSET' => $getKeyFromFirstArgument,
+            'HINCRBY' => $getKeyFromFirstArgument,
+            'HINCRBYFLOAT' => $getKeyFromFirstArgument,
+            'HKEYS' => $getKeyFromFirstArgument,
+            'HLEN' => $getKeyFromFirstArgument,
+            'HSET' => $getKeyFromFirstArgument,
+            'HSETNX' => $getKeyFromFirstArgument,
+            'HVALS' => $getKeyFromFirstArgument,
+            'HSCAN' => $getKeyFromFirstArgument,
+            'HSTRLEN' => $getKeyFromFirstArgument,

            /* commands operating on HyperLogLog */
-            'PFADD'                 => $getKeyFromFirstArgument,
-            'PFCOUNT'               => $getKeyFromAllArguments,
-            'PFMERGE'               => $getKeyFromAllArguments,
+            'PFADD' => $getKeyFromFirstArgument,
+            'PFCOUNT' => $getKeyFromAllArguments,
+            'PFMERGE' => $getKeyFromAllArguments,

            /* scripting */
-            'EVAL'                  => array($this, 'getKeyFromScriptingCommands'),
-            'EVALSHA'               => array($this, 'getKeyFromScriptingCommands'),
+            'EVAL' => array($this, 'getKeyFromScriptingCommands'),
+            'EVALSHA' => array($this, 'getKeyFromScriptingCommands'),
+
+            /* commands performing geospatial operations */
+            'GEOADD' => $getKeyFromFirstArgument,
+            'GEOHASH' => $getKeyFromFirstArgument,
+            'GEOPOS' => $getKeyFromFirstArgument,
+            'GEODIST' => $getKeyFromFirstArgument,
+            'GEORADIUS' => array($this, 'getKeyFromGeoradiusCommands'),
+            'GEORADIUSBYMEMBER' => array($this, 'getKeyFromGeoradiusCommands'),
        );
    }

@@ -202,8 +211,8 @@ abstract class ClusterStrategy implements StrategyInterface
        }

        if (!is_callable($callback)) {
-            throw new InvalidArgumentException(
-                "The argument must be a callable object or NULL."
+            throw new \InvalidArgumentException(
+                'The argument must be a callable object or NULL.'
            );
        }

@@ -261,6 +270,35 @@ abstract class ClusterStrategy implements StrategyInterface
        }
    }

+    /**
+     * Extracts the key from SORT command.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return string|null
+     */
+    protected function getKeyFromSortCommand(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $firstKey = $arguments[0];
+
+        if (1 === $argc = count($arguments)) {
+            return $firstKey;
+        }
+
+        $keys = array($firstKey);
+
+        for ($i = 1; $i < $argc; ++$i) {
+            if (strtoupper($arguments[$i]) === 'STORE') {
+                $keys[] = $arguments[++$i];
+            }
+        }
+
+        if ($this->checkSameSlotForKeys($keys)) {
+            return $firstKey;
+        }
+    }
+
    /**
     * Extracts the key from BLPOP and BRPOP commands.
     *
@@ -293,6 +331,39 @@ abstract class ClusterStrategy implements StrategyInterface
        }
    }

+    /**
+     * Extracts the key from GEORADIUS and GEORADIUSBYMEMBER commands.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return string|null
+     */
+    protected function getKeyFromGeoradiusCommands(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $argc = count($arguments);
+        $startIndex = $command->getId() === 'GEORADIUS' ? 5 : 4;
+
+        if ($argc > $startIndex) {
+            $keys = array($arguments[0]);
+
+            for ($i = $startIndex; $i < $argc; ++$i) {
+                $argument = strtoupper($arguments[$i]);
+                if ($argument === 'STORE' || $argument === 'STOREDIST') {
+                    $keys[] = $arguments[++$i];
+                }
+            }
+
+            if ($this->checkSameSlotForKeys($keys)) {
+                return $arguments[0];
+            } else {
+                return;
+            }
+        }
+
+        return $arguments[0];
+    }
+
    /**
     * Extracts the key from ZINTERSTORE and ZUNIONSTORE commands.
     *
@@ -364,7 +435,7 @@ abstract class ClusterStrategy implements StrategyInterface

        $currentSlot = $this->getSlotByKey($keys[0]);

-        for ($i = 1; $i < $count; $i++) {
+        for ($i = 1; $i < $count; ++$i) {
            $nextSlot = $this->getSlotByKey($keys[$i]);

            if ($currentSlot !== $nextSlot) {
@@ -11,13 +11,11 @@

 namespace Predis\Cluster\Distributor;

-use Exception;
-
 /**
 * Exception class that identifies empty rings.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
-class EmptyRingException extends Exception
+class EmptyRingException extends \Exception
 {
 }
@@ -24,7 +24,7 @@ use Predis\Cluster\Hash\HashGeneratorInterface;
 class HashRing implements DistributorInterface, HashGeneratorInterface
 {
    const DEFAULT_REPLICAS = 128;
-    const DEFAULT_WEIGHT   = 100;
+    const DEFAULT_WEIGHT = 100;

    private $ring;
    private $ringKeys;
@@ -55,7 +55,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
        // last wins, thus the order in which nodes are added is significant.
        $this->nodes[] = array(
            'object' => $node,
-            'weight' => (int) $weight ?: $this::DEFAULT_WEIGHT
+            'weight' => (int) $weight ?: $this::DEFAULT_WEIGHT,
        );

        $this->reset();
@@ -160,7 +160,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
        $nodeHash = $this->getNodeHash($nodeObject);
        $replicas = (int) round($weightRatio * $totalNodes * $replicas);

-        for ($i = 0; $i < $replicas; $i++) {
+        for ($i = 0; $i < $replicas; ++$i) {
            $key = crc32("$nodeHash:$i");
            $ring[$key] = $nodeObject;
        }
@@ -40,7 +40,7 @@ class KetamaRing extends HashRing
        $nodeHash = $this->getNodeHash($nodeObject);
        $replicas = (int) floor($weightRatio * $totalNodes * ($replicas / 4));

-        for ($i = 0; $i < $replicas; $i++) {
+        for ($i = 0; $i < $replicas; ++$i) {
            $unpackedDigest = unpack('V4', md5("$nodeHash-$i", true));

            foreach ($unpackedDigest as $key) {
@@ -63,7 +63,7 @@ class CRC16 implements HashGeneratorInterface
        $CCITT_16 = self::$CCITT_16;
        $strlen = strlen($value);

-        for ($i = 0; $i < $strlen; $i++) {
+        for ($i = 0; $i < $strlen; ++$i) {
            $crc = (($crc << 8) ^ $CCITT_16[($crc >> 8) ^ ord($value[$i])]) & 0xFFFF;
        }

@@ -56,7 +56,7 @@ class PredisStrategy extends ClusterStrategy

        $currentKey = $this->extractKeyTag($keys[0]);

-        for ($i = 1; $i < $count; $i++) {
+        for ($i = 1; $i < $count; ++$i) {
            $nextKey = $this->extractKeyTag($keys[$i]);

            if ($currentKey !== $nextKey) {
@@ -11,9 +11,9 @@

 namespace Predis\Cluster;

-use Predis\NotSupportedException;
-use Predis\Cluster\Hash\HashGeneratorInterface;
 use Predis\Cluster\Hash\CRC16;
+use Predis\Cluster\Hash\HashGeneratorInterface;
+use Predis\NotSupportedException;

 /**
 * Default class used by Predis to calculate hashes out of keys of
@@ -40,7 +40,7 @@ class RedisStrategy extends ClusterStrategy
     */
    public function getSlotByKey($key)
    {
-        $key  = $this->extractKeyTag($key);
+        $key = $this->extractKeyTag($key);
        $slot = $this->hashGenerator->hash($key) & 0x3FFF;

        return $slot;
@@ -11,7 +11,6 @@

 namespace Predis\Collection\Iterator;

-use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;

@@ -28,7 +27,7 @@ use Predis\NotSupportedException;
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
-abstract class CursorBasedIterator implements Iterator
+abstract class CursorBasedIterator implements \Iterator
 {
    protected $client;
    protected $match;
@@ -133,7 +132,7 @@ abstract class CursorBasedIterator implements Iterator
     */
    protected function extractNext()
    {
-        $this->position++;
+        ++$this->position;
        $this->current = array_shift($this->elements);
    }

@@ -18,6 +18,7 @@ use Predis\ClientInterface;
 * HSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
+ *
 * @link http://redis.io/commands/scan
 */
 class HashKey extends CursorBasedIterator
@@ -49,7 +50,11 @@ class HashKey extends CursorBasedIterator
     */
    protected function extractNext()
    {
-        $this->position = key($this->elements);
-        $this->current = array_shift($this->elements);
+        if ($kv = each($this->elements)) {
+            $this->position = $kv[0];
+            $this->current = $kv[1];
+
+            unset($this->elements[$this->position]);
+        }
    }
 }
@@ -18,6 +18,7 @@ use Predis\ClientInterface;
 * SCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
+ *
 * @link http://redis.io/commands/scan
 */
 class Keyspace extends CursorBasedIterator
@@ -11,8 +11,6 @@

 namespace Predis\Collection\Iterator;

-use InvalidArgumentException;
-use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;

@@ -27,9 +25,10 @@ use Predis\NotSupportedException;
 * times (trimmed, deleted, overwritten) during the iteration process.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
+ *
 * @link http://redis.io/commands/lrange
 */
-class ListKey implements Iterator
+class ListKey implements \Iterator
 {
    protected $client;
    protected $count;
@@ -53,7 +52,7 @@ class ListKey implements Iterator
        $this->requiredCommand($client, 'LRANGE');

        if ((false === $count = filter_var($count, FILTER_VALIDATE_INT)) || $count < 0) {
-            throw new InvalidArgumentException('The $count argument must be a positive integer.');
+            throw new \InvalidArgumentException('The $count argument must be a positive integer.');
        }

        $this->client = $client;
@@ -122,7 +121,7 @@ class ListKey implements Iterator
     */
    protected function extractNext()
    {
-        $this->position++;
+        ++$this->position;
        $this->current = array_shift($this->elements);
    }

@@ -18,6 +18,7 @@ use Predis\ClientInterface;
 * command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
+ *
 * @link http://redis.io/commands/scan
 */
 class SetKey extends CursorBasedIterator
@@ -18,6 +18,7 @@ use Predis\ClientInterface;
 * ZSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
 *
 * @author Daniele Alessandri <suppakilla@gmail.com>
+ *
 * @link http://redis.io/commands/scan
 */
 class SortedSetKey extends CursorBasedIterator
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/auth
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ConnectionAuth extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/echo
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ConnectionEcho extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/ping
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ConnectionPing extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/quit
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ConnectionQuit extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/select
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ConnectionSelect extends Command
@@ -0,0 +1,42 @@
+<?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/geoadd
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoAdd extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOADD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function filterArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            foreach (array_pop($arguments) as $item) {
+                $arguments = array_merge($arguments, $item);
+            }
+        }
+
+        return $arguments;
+    }
+}
@@ -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/geodist
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoDist extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEODIST';
+    }
+}
@@ -0,0 +1,41 @@
+<?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/geohash
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoHash extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOHASH';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function filterArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $members = array_pop($arguments);
+            $arguments = array_merge($arguments, $members);
+        }
+
+        return $arguments;
+    }
+}
@@ -0,0 +1,41 @@
+<?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/geopos
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoPos extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOPOS';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function filterArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $members = array_pop($arguments);
+            $arguments = array_merge($arguments, $members);
+        }
+
+        return $arguments;
+    }
+}
@@ -0,0 +1,71 @@
+<?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/georadius
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoRadius extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEORADIUS';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function filterArguments(array $arguments)
+    {
+        if ($arguments && is_array(end($arguments))) {
+            $options = array_change_key_case(array_pop($arguments), CASE_UPPER);
+
+            if (isset($options['WITHCOORD']) && $options['WITHCOORD'] == true) {
+                $arguments[] = 'WITHCOORD';
+            }
+
+            if (isset($options['WITHDIST']) && $options['WITHDIST'] == true) {
+                $arguments[] = 'WITHDIST';
+            }
+
+            if (isset($options['WITHHASH']) && $options['WITHHASH'] == true) {
+                $arguments[] = 'WITHHASH';
+            }
+
+            if (isset($options['COUNT'])) {
+                $arguments[] = 'COUNT';
+                $arguments[] = $options['COUNT'];
+            }
+
+            if (isset($options['SORT'])) {
+                $arguments[] = strtoupper($options['SORT']);
+            }
+
+            if (isset($options['STORE'])) {
+                $arguments[] = 'STORE';
+                $arguments[] = $options['STORE'];
+            }
+
+            if (isset($options['STOREDIST'])) {
+                $arguments[] = 'STOREDIST';
+                $arguments[] = $options['STOREDIST'];
+            }
+        }
+
+        return $arguments;
+    }
+}
@@ -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/georadiusbymember
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class GeospatialGeoRadiusByMember extends GeospatialGeoRadius
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEORADIUSBYMEMBER';
+    }
+}
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hdel
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashDelete extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hexists
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashExists extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hget
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashGet extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hgetall
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashGetAll extends Command
@@ -32,7 +33,7 @@ class HashGetAll extends Command
    {
        $result = array();

-        for ($i = 0; $i < count($data); $i++) {
+        for ($i = 0; $i < count($data); ++$i) {
            $result[$data[$i]] = $data[++$i];
        }

@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hmget
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashGetMultiple extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hincrby
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashIncrementBy extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hincrbyfloat
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashIncrementByFloat extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hkeys
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashKeys extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hlen
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashLength extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hscan
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashScan extends Command
@@ -72,7 +73,7 @@ class HashScan extends Command
            $fields = $data[1];
            $result = array();

-            for ($i = 0; $i < count($fields); $i++) {
+            for ($i = 0; $i < count($fields); ++$i) {
                $result[$fields[$i]] = $fields[++$i];
            }

@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hset
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashSet extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hmset
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashSetMultiple extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hsetnx
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashSetPreserve extends Command
@@ -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/hstrlen
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class HashStringLength extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HSTRLEN';
+    }
+}
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/hvals
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HashValues extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pfadd
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HyperLogLogAdd extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pfcount
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HyperLogLogCount extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pfmerge
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class HyperLogLogMerge extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/del
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyDelete extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/dump
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyDump extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/exists
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyExists extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/expire
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyExpire extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/expireat
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyExpireAt extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/keys
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyKeys extends Command
@@ -0,0 +1,50 @@
+<?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/migrate
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class KeyMigrate extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'MIGRATE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function filterArguments(array $arguments)
+    {
+        if (is_array(end($arguments))) {
+            foreach (array_pop($arguments) as $modifier => $value) {
+                $modifier = strtoupper($modifier);
+
+                if ($modifier === 'COPY' && $value == true) {
+                    $arguments[] = $modifier;
+                }
+
+                if ($modifier === 'REPLACE' && $value == true) {
+                    $arguments[] = $modifier;
+                }
+            }
+        }
+
+        return $arguments;
+    }
+}
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/move
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyMove extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/persist
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyPersist extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pexpire
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyPreciseExpire extends KeyExpire
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pexpireat
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyPreciseExpireAt extends KeyExpireAt
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/pttl
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyPreciseTimeToLive extends KeyTimeToLive
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/randomkey
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyRandom extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/rename
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyRename extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/renamenx
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyRenamePreserve extends KeyRename
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/restore
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyRestore extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/scan
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyScan extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/sort
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeySort extends Command
@@ -59,7 +60,6 @@ class KeySort extends Command
        if (isset($sortParams['LIMIT']) &&
            is_array($sortParams['LIMIT']) &&
            count($sortParams['LIMIT']) == 2) {
-
            $query[] = 'LIMIT';
            $query[] = $sortParams['LIMIT'][0];
            $query[] = $sortParams['LIMIT'][1];
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/ttl
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyTimeToLive extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/type
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class KeyType extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/lindex
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListIndex extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/linsert
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListInsert extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/llen
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListLength extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/lpop
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopFirst extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/blpop
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopFirstBlocking extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/rpop
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopLast extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/brpop
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopLastBlocking extends ListPopFirstBlocking
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/rpoplpush
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopLastPushHead extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/brpoplpush
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPopLastPushHeadBlocking extends Command
@@ -13,6 +13,7 @@ namespace Predis\Command;

 /**
 * @link http://redis.io/commands/lpush
+ *
 * @author Daniele Alessandri <suppakilla@gmail.com>
 */
 class ListPushHead extends ListPushTail
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniele Alessandri	9ead747663	Update CHANGELOG and bump VERSION.	2016-05-30 17:25:52 +02:00
Daniele Alessandri	39cf6abf82	[tests] Do not allow failures for HHVM on Travis CI.	2016-05-30 17:00:46 +02:00
Daniele Alessandri	dbae384a64	[tests] Troubles with HHVM <= 3.6.6 and float timeouts. HHVM is still being used by Travis CI but this bug makes the build to take 14 minutes to complete, which is unacceptable.	2016-05-30 17:00:14 +02:00
Daniele Alessandri	d9ea0ce14f	Update README of test directory. [ci skip]	2016-05-27 22:01:45 +02:00
Daniele Alessandri	55f940e400	Update README. [ci skip]	2016-05-27 21:32:47 +02:00
Daniele Alessandri	648be824d3	Fix fetching slots map from unreachable nodes. When various nodes in the configuration are unreachable while trying to send a command, we should attempt to contact a reachable node to fetch an updated slots map up to $retryLimit times or until there are no more servers in the pool before giving up. It is possible that the slots map fetched from Redis contains stale data and points to a dead server, this happens when the nodes still have to agree that a master server is down before promoting a slave to the role of master. In this case no further attempts to execute the command are performed and an exception is thrown. This still needs some more testing and will delay v1.0.4 a few days past its scheduled release.	2016-05-27 14:28:12 +02:00
Daniele Alessandri	c4e0f2f037	Run php-cs-fixer.	2016-05-26 09:52:18 +02:00
Daniele Alessandri	62f5ce6baf	Update CHANGELOG.	2016-05-25 10:57:01 +02:00
Daniele Alessandri	9cd4ed9e1e	Update SPOP's @method signature in phpdoc. SPOP accepts the optional "count" argument since Redis 3.2.	2016-05-24 23:28:40 +02:00
Daniele Alessandri	8491b1d880	Add new command: GEORADIUSBYMEMBER (Redis 3.2.0).	2016-05-24 23:28:23 +02:00
Daniele Alessandri	8c8261432f	Add new command: GEORADIUS (Redis 3.2.0).	2016-05-24 23:28:11 +02:00
Daniele Alessandri	5eccd6ee3c	Add new command: GEODIST (Redis 3.2.0).	2016-05-24 23:28:01 +02:00
Daniele Alessandri	3d9588ec1a	Add new command: GEOPOS (Redis 3.2.0).	2016-05-24 23:27:50 +02:00
Daniele Alessandri	e96f7f748a	Add new command: GEOHASH (Redis 3.2.0).	2016-05-24 23:27:33 +02:00
Daniele Alessandri	dd0edf761a	Add new command: GEOADD (Redis 3.2.0).	2016-05-24 23:27:10 +02:00
Daniele Alessandri	8cbbd073cb	Add new command: BITFIELD (Redis 3.2.0).	2016-05-24 23:26:48 +02:00
Daniele Alessandri	1e521b56cd	[tests] Test count argument for SPOP in Redis 3.2.	2016-05-24 23:25:46 +02:00
Daniele Alessandri	fcacd65576	Add new server profile for Redis 3.2 (new stable).	2016-05-24 23:25:31 +02:00
Daniele Alessandri	d5488f81f7	Check that STORE key in SORT ends up in same slot.	2016-05-24 22:09:13 +02:00
Daniele Alessandri	188dc6bf62	Improve detection of STORE in SORT command arguments.	2016-05-24 21:39:26 +02:00
Daniele Alessandri	0bd57ab744	[tests] Add missing test for key prefix in HSTRLEN.	2016-05-24 15:28:39 +02:00
Daniele Alessandri	b996b005cf	Fix cluster strategy to handle variadic EXISTS (Redis >= 3.0.3).	2016-05-24 15:26:35 +02:00
Daniele Alessandri	82116b0366	Fix prefix processor to handle variadic EXISTS (Redis >= 3.0.3). Backported from master. Conflicts: src/Command/Processor/KeyPrefixProcessor.php	2016-05-24 15:26:01 +02:00
Daniele Alessandri	5c1ddc9cfa	Add missing @method tag for HSTRLEN in phpdocs. [ci skip]	2016-05-24 12:26:50 +02:00
Daniele Alessandri	ea2fd9700d	[tests] Missing @requiresRedisVersion for HSTRLEN.	2016-05-24 11:50:15 +02:00
Daniele Alessandri	b2ec264ff9	Update description in package.ini.	2016-05-24 10:27:37 +02:00
Daniele Alessandri	bf7a70d6f0	Update phpunit.xml.*	2016-05-22 20:21:52 +02:00
Daniele Alessandri	4ecc44e1ee	Update description in composer.json.	2016-05-22 20:05:31 +02:00
Daniele Alessandri	52d5b23db7	Fix README. [ci skip]	2016-05-22 15:32:08 +02:00
Daniele Alessandri	d31a4c71ba	Update CHANGELOG. [ci skip]	2016-05-22 15:24:39 +02:00
Daniele Alessandri	c92e305852	Update README. Blame copy&paste practices for the noise (or just blame me). [ci skip]	2016-05-22 15:21:09 +02:00
Daniele Alessandri	b075564278	Update and improve README. [ci skip]	2016-05-22 15:12:14 +02:00
Daniele Alessandri	f9e817f14c	Run php-cs-fixer.	2016-05-21 15:49:25 +02:00
Daniele Alessandri	9e568396c6	Remove old references about HHVM being unstable.	2016-05-20 20:35:58 +02:00
Daniele Alessandri	2a91ebaba9	[tests] Rename old branch for exclusion. [ci skip]	2016-05-20 20:15:12 +02:00
Daniele Alessandri	ce15bd22b9	Update badges in CHANGELOG. [ci skip]	2016-05-20 18:33:28 +02:00
Daniele Alessandri	b0439e503e	Update CHANGELOG.	2016-05-20 16:28:19 +02:00
Daniele Alessandri	ffc1c25baa	Try again on connection failure to node in cluster. When the connection to a node in the cluster fails in the attempt to execute a command, Predis now removes the failed connection from the cluster pool and contacts a random node to ask for a fresh slots map and tries to execute the command once again. When the cluster is configured to have each master replicated to one or more slaves, one the slaves is automatically promoted to the role of master by redis-cluster with this change being reflected in the output of CLUSTER SLOTS, so the next execution should run just fine. Our current approach is relatively naive as CLUSTER SLOTS is executed against a random master node, meaning that the client must open a new connection and execute one more roundtrip only to fetch the new slots map. For now it is enough, it is still better than having the client fail when you actually have somes slaves in your redis-cluster setup, but one improvement could consist in caching the list of slaves for each master returned in the response of CLUSTER SLOTS so that when a connection fails the client can try to guess which connection should use for the next attempt. This commit closes #173, closes #215, and closes #314.	2016-05-20 13:18:25 +02:00
Daniele Alessandri	ac165194f5	Evict connection from slots cache when removed.	2016-05-20 11:43:15 +02:00
Daniele Alessandri	18ae294864	[tests] Fix assertion. PHPUnit_Util_Type::export() has been removed a while ago...	2016-05-19 11:46:56 +02:00
Daniele Alessandri	47de667aea	Bump min. version of PHPUnit (require-dev).	2016-05-19 11:46:52 +02:00
Daniele Alessandri	588940c5cb	Update CHANGELOG.	2016-05-18 21:27:37 +02:00
Daniele Alessandri	a1fe4013e1	Improve handling of slots mapping via parameters. When using redis-cluster it is now also possible to pass one slot or non-contiguous ranges of slots via connection parameters in order to improve the ability to pre-configure the slots map on the client. Here is an example: $parameters = [ 'tcp://10.0.0.1:6379?slots=0-5460,5500-5600,11000', 'tcp://10.0.0.2:6379?slots=5461-5499,5600-10921', 'tcp://10.0.0.3:6379?slots=10922-10999,11001-16383', ]; This commit fixes #312 (props to @kenotr0n for the original PR).	2016-05-18 21:16:42 +02:00
Daniele Alessandri	3328ad76be	[tests] Fix wrong method in mock.	2016-05-16 15:38:42 +02:00
Daniele Alessandri	17b717a8f5	Fix CHANGELOG.	2016-05-15 21:42:00 +02:00
Daniele Alessandri	95dbc2bb34	Bump year in LICENSE.	2016-05-15 21:40:46 +02:00
Daniele Alessandri	9bb5a1c71f	Apply minor styling fix.	2016-05-15 21:40:14 +02:00
Daniele Alessandri	8eb4804a5c	Move member variable initialization.	2016-05-15 21:39:51 +02:00
Daniele Alessandri	5d99914939	Prevent warnings picking slave from empty pool.	2016-05-15 21:39:34 +02:00
Ante Lucic	c45bb15767	add docblocks to MasterSlaveReplication	2016-05-13 17:00:27 +02:00
Ante Braovic	e0329d6c74	added zrevrangebylex in the list of available methods	2016-05-13 16:43:50 +02:00
Daniele Alessandri	2175d87a96	[tests] Fix test executed on current Redis unstable.	2016-05-10 10:59:40 +02:00
Daniele Alessandri	ce85fdadd1	[tests] Fix test executed on current Redis unstable.	2016-05-10 10:59:24 +02:00
Daniele Alessandri	b15c0a02de	[tests] Fix wrong @group annotation	2016-05-09 17:50:22 +02:00
Daniele Alessandri	d2fbcc6b8c	Prevent failures serializing commands with "holes" in arguments array. This could be triggered when passing an array with "holes" to variadic commands. Connection classes based on the protocol serialized exposed by phpiredis were not affected by this bug. Fixes #316.	2016-05-08 18:35:06 +02:00
Daniele Alessandri	6596460a57	Merge branch 'issue-tests' into v1.0	2016-05-08 16:50:28 +02:00
Daniele Alessandri	9ab0e31a75	Merge branch 'v1.0-fix-phpDoc-in-ClientInterface' into v1.0	2016-05-08 16:45:49 +02:00
John Maguire	11adccdaeb	Update useClusterNodes() docs to indicate default	2016-05-08 15:21:01 +02:00
Daniele Alessandri	f465792b27	Update CHANGELOG.	2016-05-08 15:15:48 +02:00
Daniele Alessandri	1399d3863c	Fix bug in HSCAN-based iterator when hash have integer fields. When iterating a hash containing integer fields our iterator abstraction based on HSCAN was always returning "0" as a field name after the first $field => $value pair due to a wrong assumption on how the PHP function array_shift() (which is used internally to advance to the next pair in our buffered response to HSCAN) works. The ZSCAN-based iterator had this very same bug which was already fixed in `24e19a9` so I am not sure how this one went unnoticed until now.	2016-05-08 15:10:09 +02:00
Daniele Alessandri	1f1c9cf1a4	Run php-cs-fixer.	2016-05-08 14:54:29 +02:00
Daniele Alessandri	dae2df0ae9	Merge remote-tracking branch 'marvin255/fix_namespace_typo' into v1.0	2016-05-08 14:49:06 +02:00
postbox433@gmail.com	9338eaf573	Fix namespace typo in StreamConnection.php	2016-04-12 15:20:26 +05:00
Remi Collet	f378faaf22	fix tests, list of allowed commands have changed (redis 3.0.6)	2015-12-28 10:34:24 +01:00
Alexander Cheprasov	8b150fcbf5	Update ClientInterface.php	2015-10-27 16:37:58 +00:00
Daniele Alessandri	84060b9034	Update CHANGELOG and bump VERSION. Hotfix release targeting a severe regression on HHVM, see commit `d4a7bd5`.	2015-07-30 20:34:15 +02:00
Daniele Alessandri	d4a7bd52be	Fix severe regression on HHVM. Apparently HHVM is more strict than PHP in stream_socket_client() and does not like at all IPv4 addresses and hostnames eclosed in square brackets. Note that it is not that weird as square brackets are mandatory only when IPv6 addresses are embedded in URI strings, so it is more like a weird incompatiblity of HHVM with the behaviour of the standard PHP interpreter. The connect() attempt fails but not due to the server being unavailable or some connectivity issue. The important lesson is: never rely on undocumented behaviours especially when targeting different runtimes, and do not forget to run the test suite on every platform right before release like I unfortunately did. This commit fixes #269.	2015-07-30 20:23:45 +02:00
Daniele Alessandri	16a9d4e041	Back to development. [ci skip]	2015-07-30 19:41:27 +02:00
Daniele Alessandri	0b92e8d156	Update CHANGELOG and bump VERSION.	2015-07-30 11:20:39 +02:00
Daniele Alessandri	1f7b534072	Preserve remainder of path in URI after database (redis scheme).	2015-07-30 11:13:42 +02:00
Daniele Alessandri	0c0cbbafff	Use PHP_VERSION_ID constant.	2015-07-30 10:56:54 +02:00
Daniele Alessandri	8aec51b34f	Implement full support for IPv6. Using IPv6 with Predis was basically impossible due to various inconsistencies and bugs through the library, now it is supported by all the connection classes. Following the standard for IPv6 literal addresses in URI strings, the IP literal must be enclosed within square brackets when passing the parameters as a string: $parameters = 'tcp://[2001:db8:0:f101::1]:6379'; See https://tools.ietf.org/html/rfc3986#section-3.2.2 for further details. This commit also fixes #239 making redis-cluster usable with nodes using IPv6.	2015-07-29 23:09:52 +02:00
Daniele Alessandri	eeb1e8b7a7	Reduce unneeded code duplication in URI parsing.	2015-07-29 17:04:34 +02:00
Daniele Alessandri	c3a44b8e2e	Strip brackets from host when parsing embedded IPv6 address. I don't know why PHP's parse_url() does not do that, it does not make sense when the IP is by itself so maybe it is a bug?	2015-07-29 17:01:19 +02:00
Daniele Alessandri	255beac137	Use static:: for invoking static methods in key prefix processor. This trivial change makes it possible to use overridden static methods when extending Predis\Command\Processor\KeyPrefixProcessor. PHP always invokes the static methods of a parent class when using self:: even if the extended classes override them.	2015-07-29 14:16:52 +02:00
Daniele Alessandri	d473328a22	Update CHANGELOG.	2015-07-29 11:54:08 +02:00
Daniele Alessandri	0d25e7b0bb	Add new command: HSTRLEN (Redis 3.2.0). Also bump the unstable profile version to 3.2.	2015-07-29 11:52:55 +02:00
Daniele Alessandri	be3b84ca14	Rephrase latest entries in CHANGELOG by using intelligible English. [ci skip]	2015-07-26 22:27:57 +02:00
Daniele Alessandri	7d0597c62c	Rephrase some parts of the README. [ci skip]	2015-07-26 22:27:49 +02:00
Daniele Alessandri	833e46b79d	[tests] Fix typo.	2015-07-25 21:59:08 +02:00
Daniele Alessandri	a22858438d	[tests] Require pcntl extension to run blocking PubSub\Consumer test.	2015-07-25 21:58:01 +02:00
Daniele Alessandri	f221d0c81e	Run php-cs-fixer.	2015-07-25 21:27:05 +02:00
Daniele Alessandri	0b5bfdfe33	[tests] Improve code-reuse in tests for the Predis\Connection namespace.	2015-07-25 21:27:02 +02:00
Daniele Alessandri	3700d48771	[tests] Share common test among connection classes.	2015-07-25 20:54:01 +02:00
Daniele Alessandri	653d3f08ab	[tests] Use @requires annotation.	2015-07-25 20:52:01 +02:00
Daniele Alessandri	2d2de7837b	[tests] Fix some tests methods names.	2015-07-25 10:07:58 +02:00
Daniele Alessandri	fc18e6456a	[tests] Apply small changes to commands tests with expirations.	2015-07-25 10:07:55 +02:00
Daniele Alessandri	6f2064ed90	[tests] Cover SET modifiers EX, PX, NX\|XX (Redis >= 2.6.12).	2015-07-25 09:11:16 +02:00
Daniele Alessandri	e2e645a8bd	Update .gitattributes file. [ci skip]	2015-07-24 23:31:04 +02:00
Daniele Alessandri	2219964b7e	Restore alignment for a few equals symbols.	2015-07-24 23:21:23 +02:00
Daniele Alessandri	381e44b6e6	Run php-cs-fixer with new configuration.	2015-07-24 23:21:07 +02:00
Daniele Alessandri	808693bfbd	Add .php_cs configuration file for php-cs-fixer.	2015-07-24 23:19:23 +02:00
Daniele Alessandri	33eab38314	Remove unneeded "use" imports.	2015-07-24 21:25:48 +02:00
Daniele Alessandri	82e404660e	Run php-cs-fixer against codebase in src/ and tests/.	2015-07-24 17:58:56 +02:00
Daniele Alessandri	6d60a42400	[tests] Fix me being stupid here.	2015-07-24 17:35:53 +02:00
Daniele Alessandri	95624de5c4	[tests] Apply some fixes and improvements and remove old stuff.	2015-07-24 17:27:41 +02:00
Daniele Alessandri	2ee135099c	Remove useless if condition.	2015-07-24 12:40:33 +02:00
Daniele Alessandri	e26e3b423a	Reverting stupid oversight after a merge from master branch. The culprit is commit `3500371`.	2015-07-24 10:49:14 +02:00
Daniele Alessandri	946fac4454	No need to check the scheme here. Bug introduced in v1.0-dev after changes to support redis scheme. Fixes #268	2015-07-24 10:45:12 +02:00
Daniele Alessandri	4e976a3eb6	Update CHANGELOG. [ci skip]	2015-07-23 21:05:05 +02:00
Daniele Alessandri	baaf26fe5b	Add support for the 'redis://' scheme in URI strings. The URI string will be handled following the rules as described by the the provisional IANA registration document that can be found on IANA's website: http://www.iana.org/assignments/uri-schemes/prov/redis.	2015-07-23 19:21:16 +02:00
Daniele Alessandri	6a0348fbea	Add missing command: MIGRATE (Redis 2.6.0). Fixes #209.	2015-07-23 19:21:03 +02:00
Daniele Alessandri	8365a6be77	[tests] Fix minor oversight.	2015-07-23 19:20:52 +02:00
Daniele Alessandri	f028e428be	Switch to container-based builds on Travis CI. We do not need "sudo" anyway. See http://docs.travis-ci.com/user/migrating-from-legacy/ for details.	2015-07-23 12:16:27 +02:00
Daniele Alessandri	c13b82557d	Update CHANGELOG.	2015-07-23 11:43:47 +02:00
Daniele Alessandri	30d01c40d4	[tests] Improve assert failure messages for replication stategy tests.	2015-07-23 11:40:52 +02:00
Daniele Alessandri	6459546e25	Fix missing BITPOS in replication strategy.	2015-07-23 11:40:39 +02:00
Daniele Alessandri	dede828008	Add missing BITPOS command in key prefix processor. See #265.	2015-07-23 11:40:27 +02:00
Daniele Alessandri	5c0716575e	Exclude .php-version file. [ci skip]	2015-07-19 13:05:40 +02:00
Richard Heelin	90bffb1a5a	Emit socket error if ipredis connection has been lost/reset. The current code is checking for a failure (return false) or an empty buffer string, however neither of these will be the case if the connection has been reset or has errored. According to the docs for socket_recv, $buffer will be set to null if the connection is reset or their is no data. As currently null is not allowed for, we enter an infinite loop, to prevent this I've added null to the things we check before we emit a socket error. This prevents the infinite loop and correctly results in an Exception if the connection is lost/reset. Conflicts: src/Connection/PhpiredisSocketConnection.php	2015-07-07 18:51:44 +02:00
Daniele Alessandri	64ee96c312	[tests] Fix base test case class to handle required Redis versions. This change is needed due to some internal changes in one of the latest minor releases of PHPUnit 4.x that essentially broke how we were checking for the required Redis version from method annotations.	2015-07-07 18:05:55 +02:00
Daniele Alessandri	bff5a9729e	Update CHANGELOG.	2015-07-07 16:19:46 +02:00
Daniele Alessandri	5cd7b774c4	[tests] Adapt to internal encoding changes for lists in Redis 3.0.	2015-07-07 16:11:49 +02:00
Daniele Alessandri	354d1ef921	Support ZADD modifiers when using simplified command signature. The NX\|XX, CH and INCR modifiers for ZADD are available in Redis since version 3.0.2. See http://redis.io/commands/ZADD for additional info.	2015-07-07 16:11:43 +02:00
Daniele Alessandri	9e3a8da94d	Update CHANGELOG.	2015-07-07 15:01:00 +02:00
Daniele Alessandri	35003713a2	Merge remote-tracking branch 'github/pr/235' into v1.0 Conflicts: .travis.yml CHANGELOG.md VERSION package.ini src/Client.php	2015-07-07 14:52:09 +02:00
Daniele Alessandri	cd991e6370	[tests] Remove hhvm-nightly from Travis CI configuration. See https://github.com/travis-ci/travis-ci/issues/3788 for details.	2015-07-07 14:44:28 +02:00
Daniele Alessandri	c59853afb8	[tests] It's 7.0 and not 5.7!	2015-07-07 14:44:08 +02:00
Daniele Alessandri	d4982b6c43	[tests] Add PHP 5.7 to Travis CI configuration.	2015-07-07 13:22:59 +02:00
Daniele Alessandri	96f4af816d	Minor tweak in .editorconfig file. [ci skip]	2015-07-06 18:42:10 +02:00
Daniele Alessandri	22ff3ff992	Commit .editorconfig file. See http://editorconfig.org for more info about EditorConfig [ci skip]	2015-07-06 18:38:30 +02:00
Daniele Alessandri	77b75e0738	Fix wrong phpdoc. Thanks @Aliance for spotting this oversight.	2015-07-03 12:11:45 +02:00
Daniele Alessandri	eeea28b275	Update CHANGELOG.	2015-07-03 12:10:44 +02:00
Daniele Alessandri	aa067d8fd9	[tests] Implement test for #257 to guard against regressions.	2015-07-03 12:03:15 +02:00
Dominic Scheirlinck	ce17c5383a	Don't check for __invoke on non-objects `method_exists` will cause autoloading for strings. Fixes #257	2015-07-03 11:11:53 +02:00
Daniele Alessandri	c4c36cae7a	Back to development.	2015-01-02 13:54:29 +01:00
Daniele Alessandri	7a170b3d81	Update CHANGELOG and bump VERSION.	2015-01-02 13:51:34 +01:00
Daniele Alessandri	17e7bce22e	Bump year in LICENSE. [ci skip]	2015-01-02 13:45:19 +01:00
Daniele Alessandri	7a5d6bac3e	Update CHANGELOG. [ci skip]	2015-01-02 13:42:50 +01:00
Daniele Alessandri	9d6c031ead	Merge remote-tracking branch 'srhnsn/v1.0' into v1.0	2015-01-02 13:33:10 +01:00
Daniele Alessandri	692718afb4	Merge remote-tracking branch 'blocktrail/hhvm-pubsub-blockingread-test-v1.0' into v1.0	2015-01-02 13:00:25 +01:00
Daniele Alessandri	0776377412	Temporarily allow failures for HHVM on Travis-CI. [ci skip]	2015-01-02 12:56:48 +01:00
Daniele Alessandri	e4b0512d42	No need to access a private field used by PHPUnit. Fixes #207.	2015-01-02 12:20:00 +01:00
Daniele Alessandri	75ca2f8111	Add minimum required Redis version for BITPOS integration tests.	2015-01-02 12:14:05 +01:00
Daniele Alessandri	37b1c88115	Apply minor CS fixes and trim spurious spaces.	2015-01-02 12:13:58 +01:00
Daniele Alessandri	a4e6130568	Merge remote-tracking branch 'nicchap/v1.0' into v1.0	2015-01-02 11:58:30 +01:00