Update CHANGELOG and bump VERSION.

[ci skip]

.editorconfig

@@ -1,17 +0,0 @@
-# http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 4
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.php]
-max_line_length = 120
-
-[*.{md,yml}]
-indent_size = 2

.gitattributes

@@ -1,9 +0,0 @@
-* text=auto
-
-/tests export-ignore
-/.github export-ignore
-/.editorconfig export-ignore
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/.php_cs.dist export-ignore
-/phpunit.xml.dist export-ignore

.github/CODE_OF_CONDUCT.md

@@ -1,6 +0,0 @@
-The Predis code of conduct is derived from the Ruby code of conduct. Any violations of the code of conduct may be reported to [Till Krüss](https://till.im):
-
-- Participants will be tolerant of opposing views.
-- Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
-- When interpreting the words and actions of others, participants should always assume good intentions.
-- Behavior that can be reasonably considered harassment will not be tolerated.

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/release-drafter-config.yml

@@ -1,49 +0,0 @@
-name-template: 'v$NEXT_MINOR_VERSION'
-tag-template: 'v$NEXT_MINOR_VERSION'
-change-template: '- $TITLE (#$NUMBER)'
-
-autolabeler:
-  - label: 'maintenance'
-    files:
-      - '*.md'
-      - '.github/*'
-  - label: 'bug'
-    branch:
-      - '/bug-.+'
-  - label: 'maintenance'
-    branch:
-      - '/maintenance-.+'
-  - label: 'feature'
-    branch:
-      - '/feature-.+'
-
-categories:
-  - title: 'Breaking Changes'
-    labels:
-      - 'breakingchange'
-  - title: 'Experimental Features'
-    labels:
-      - 'experimental'
-  - title: 'New Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: 'Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-      - 'BUG'
-  - title: 'Maintenance'
-    label: 'maintenance'
-
-exclude-labels:
-  - 'skip-changelog'
-
-template: |
-  $CHANGES
-
-  ## Contributors
-  We'd like to thank all the contributors who worked on this release!
-
-  $CONTRIBUTORS

.github/workflows/release-drafter.yml

@@ -1,21 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-
-  update_release_draft:
-
-    name: Update release draft
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - uses: release-drafter/release-drafter@v5
-        with:
-           config-name: release-drafter-config.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -1,64 +0,0 @@
-name: Tests
-
-on:
-  - push
-  - pull_request
-
-jobs:
-
-  predis:
-    name: PHP ${{ matrix.php }} (Redis ${{ matrix.redis }})
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-        redis:
-          - 3
-          - 4
-          - 5
-          - 6
-          - 7
-
-    services:
-      redis:
-        image: redis:${{ matrix.redis }}
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
-        ports:
-          - 6379:6379
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP with Composer and extensions
-        with:
-          php-version: ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.directory }}
-          key: tests-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: tests-php-${{ matrix.php }}-composer
-
-      - name: Install Composer dependencies
-        env:
-          PHP_VERSION: ${{ matrix.php }}
-        run: composer install --ansi --no-progress --prefer-dist $(if [ "$PHP_VERSION" == "8.0" ]; then echo "--ignore-platform-reqs"; fi;)
-
-      - name: Run PHPUnit tests
-        run: vendor/bin/phpunit

.gitignore

@@ -1,6 +1,7 @@
-/vendor
-.php-version
-.php_cs.cache
-.phpunit.result.cache
-composer.lock
+*.tgz
+*.phar
 phpunit.xml
+package.xml
+composer.lock
+experiments/
+vendor/

.php_cs.dist

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

.travis.yml

@@ -0,0 +1,13 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+branches:
+  except:
+    - v0.5
+    - v0.6
+    - php5.2_backport
+    - documentation
+services: redis-server
+script: phpunit -c phpunit.xml.travisci

CHANGELOG.NAMING.md

@@ -0,0 +1,53 @@
+# Namespaces, interfaces and classes renamed in Predis v0.8 #
+____________________________________________
+
+Some namespaces, interfaces and classes in Predis v0.8 have been renamed to follow a common rule inspired
+by the naming conventions adopted by the Symfony2 project. This is a list of all the changes:
+
+### Renamed namespaces ###
+
+  - `Predis\Network` => `Predis\Connection`
+  - `Predis\Profiles` => `Predis\Profile`
+  - `Predis\Iterators` => `Predis\Iterator`
+  - `Predis\Options` => `Predis\Option`
+  - `Predis\Commands` => `Predis\Command`
+  - `Predis\Commands\Processors` => `Predis\Command\Processor`
+
+### Renamed interfaces ###
+
+  - `Predis\IReplyObject` => `Predis\ResponseObjectInterface`
+  - `Predis\IRedisServerError` => `Predis\ResponseErrorInterface`
+  - `Predis\Options\IOption` => `Predis\Option\OptionInterface`
+  - `Predis\Options\IClientOptions` => `Predis\Option\ClientOptionsInterface`
+  - `Predis\Profile\IServerProfile` => `Predis\Profile\ServerProfileInterface`
+  - `Predis\Pipeline\IPipelineExecutor` => `Predis\Pipeline\PipelineExecutorInterface`
+  - `Predis\Distribution\INodeKeyGenerator` => `Predis\Distribution\HashGeneratorInterface`
+  - `Predis\Distribution\IDistributionStrategy` => `Predis\Distribution\DistributionStrategyInterface`
+  - `Predis\Protocol\IProtocolProcessor` => `Predis\Protocol\ProtocolInterface`
+  - `Predis\Protocol\IResponseReader` => `Predis\Protocol\ResponseReaderInterface`
+  - `Predis\Protocol\IResponseHandler` => `Predis\Protocol\ResponseHandlerInterface`
+  - `Predis\Protocol\ICommandSerializer` => `Predis\Protocol\CommandSerializerInterface`
+  - `Predis\Protocol\IComposableProtocolProcessor` => `Predis\Protocol\ComposableProtocolInterface`
+  - `Predis\Network\IConnection` => `Predis\Connection\ConnectionInterface`
+  - `Predis\Network\IConnectionSingle` => `Predis\Connection\SingleConnectionInterface`
+  - `Predis\Network\IConnectionComposable` => `Predis\Connection\ComposableConnectionInterface`
+  - `Predis\Network\IConnectionCluster` => `Predis\Connection\ClusterConnectionInterface`
+  - `Predis\Network\IConnectionReplication` => `Predis\Connection\ReplicationConnectionInterface`
+  - `Predis\Commands\ICommand` => `Predis\Command\CommandInterface`
+  - `Predis\Commands\IPrefixable` => `Predis\Command\PrefixableCommandInterface`
+  - `Predis\Command\Processor\ICommandProcessor` => `Predis\Command\Processor\CommandProcessorInterface`
+  - `Predis\Command\Processor\ICommandProcessorChain` => `Predis\Command\Processor\CommandProcessorChainInterface`
+  - `Predis\Command\Processor\IProcessingSupport` => `Predis\Command\Processor\CommandProcessingInterface`
+
+### Renamed classes ###
+
+  - `Predis\Commands\Command` => `Predis\Command\AbstractCommand`
+  - `Predis\Network\ConnectionBase` => `Predis\Connection\AbstractConnection`
+
+### Classes or interfaces moved to different namespaces ###
+
+  - `Predis\MonitorContext` => `Predis\Monitor\MonitorContext`
+  - `Predis\ConnectionParameters` => `Predis\Connection\ConnectionParameters`
+  - `Predis\ConnectionParametersInterface` => `Predis\Connection\ConnectionParametersInterface`
+  - `Predis\ConnectionFactory` => `Predis\Connection\ConnectionFactory`
+  - `Predis\ConnectionFactoryInterface` => `Predis\Connection\ConnectionFactoryInterface`

CHANGELOG.md

@@ -1,181 +1,620 @@
-## Changelog
+v0.8.5 (2014-01-16)
+================================================================================
 
-## v2.1.0 (2023-01-16)
+- Added `2.8` in the server profiles aliases list for Redis 2.8. `2.6` is still
+  the default server profile and `dev` now targets Redis 3.0.
 
-## New Features
+- Added `SCAN`, `SSCAN`, `ZSCAN`, `HSCAN` to the server profile for Redis 2.8.
 
-- Implemented `GETEX` command (#872)
-- Implemented `GETDEL` command (#869)
-- Implemented `COPY` command (#866)
-- Implemented `FAILOVER` command (#875)
-- Implemented `LMOVE` command (#863)
-- Implemented `LMPOP` command (#1013)
-- Implemented `HRANDFIELD` command (#870)
-- Implemented `SMISMEMBER` command (#871)
-- Implemented `ZMPOP` command (#831)
-- Implemented `BLMOVE` command (#865)
-- Implemented `BLMPOP` command (#1015)
-- Implemented `BZMPOP` command (#833)
-- Implemented `BZPOPMIN` command (#862)
-- Implemented `BZPOPMAX` command (#864)
-- Implemented `ZUNION` command (#860)
-- Implemented `ZINTER` command (#859)
-- Implemented `ZINTERCARD` command (#861)
-- Implemented `ZRANGESTORE` command (#829)
-- Implemented `ZDIFFSTORE` command (#828)
-- Implemented `ZDIFF` command (#826)
-- Implemented `ZRANDMEMBER` command (#825)
-- Implemented `ZMSCORE` (#823)
-- Implemented `GEOSEARCH` command (#867)
-- Implemented `GEOSEARCHSTORE` command (#873)
+- Implemented PHP iterators for incremental iterations over Redis collections:
 
-## Bug Fixes
-- Added annotations to suppress PHP 8.1 return type deprecation warning (#810)
+    - keyspace (cursor-based iterator using `SCAN`)
+    - sets (cursor-based iterator using `SSCAN`)
+    - sorted sets (cursor-based iterator using `ZSCAN`)
+    - hashes (cursor-based iterator using `HSCAN`)
+    - lists (plain iterator using `LRANGE`)
 
-## Maintenance
-- Added mixin annotations for traits (#835)
+- It is now possible to execute "raw commands" using `Predis\Command\RawCommand`
+  and a variable list of command arguments. Input arguments are not filtered and
+  responses are not parsed, which means arguments must follow the signature of
+  the command as defined by Redis and complex responses are left untouched.
 
-## v2.0.3 (2022-10-11)
+- URI parsing for connection parameters has been improved and has slightly less
+  overhead when the number of fields in the querystring grows. New features are:
 
-- Improved PHP 8.2 support
-- Call `is_resource()` before reading/writing
-- Added partial support for Redis Stream commands
-- Fixed Sentinel authentication issue
+    - Parsing does not break when value of a field contains one or more "=".
+    - Repeated fieldnames using [] produce an array of values.
+    - Empty or incomplete "key=value" pairs result in an empty string for "key".
 
-## v2.0.2 (2022-09-06)
+- Various improvements and fixes to the redis-cluster connection backend:
 
-- Fixed PHP 8.2 deprecation notice: Use of "static" in callables
+    - __FIX__: the `ASKING` command is sent upon -ASK redirections.
+    - An updated slots-map can be fetched from nodes using the `CLUSTER NODES`
+      command. By default this is a manual operation but can be enabled to get
+      automatically done upon -MOVED redirections.
+    - It is possible to specify a common set of connection parameters that are
+      applied to connections created on the fly upon redirections to nodes not
+      part of the initial pool.
 
-## v2.0.1 (2022-09-04)
+- List of deprecated methods:
 
-- Added retry interval to `RedisCluster` with a default of `10ms`
-- Avoid PHP 8.2 warning in `Connection\Parameters`
-- Fixed Sentinel reconnect issue in long-running PHP processes
+    - `Predis\Client::multiExec()`: superseded by `Predis\Client::transaction()`
+      and to be removed in the next major release.
+    - `Predis\Client::pubSub()`: superseded by `Predis\Client::pubSubLoop()` and
+      to be removed in the next major release. This change was needed due to the
+      recently introduced `PUBSUB` command in Redis 2.8.
 
-## v2.0.0 (2022-06-08)
 
-- Dropped support for PHP 7.1 and older
+v0.8.4 (2013-07-27)
+================================================================================
 
-- Accepted values for some client options have changed, this is the new list of
-  accepted values:
+- Added `DUMP` and `RESTORE` to the server profile for Redis 2.6.
 
-  - `aggregate`: callable returning an aggregate connection.
-  - `cluster`: string value (`predis`, `redis`), callable returning an aggregate
-    connection.
-  - `replication`: string value (`predis`, `sentinel`), callable returning an
-     aggregate connection.
-  - `commands`: command factory, named array mapping command IDs to PHP classes,
-    callable returning a command factory or a named array.
-  - `connections`: connection factory, callable object returning a connection
-    factory, named array mapping URI schemes to PHP classes, string identifying
-    a supported combination of configurations for the connection factory.
-  - `prefix`: string value, command processor, callable.
-  - `exceptions`: boolean.
+- Connection exceptions now report basic host details in their messages.
 
-  Note that both the `cluster` and `replication` options now return a closure
-  acting as initializer instead of an aggregate connection instance.
+- Allow `Predis\Connection\PhpiredisConnection` to use a random IP when a host
+  actually has several IPs (ISSUE #116).
 
-- The `connections` client option now accepts certain string values identifying
-  certain combinations of configurations for the connection factory. Currenlty
-  this is used to provide a short way to configure Predis to load our phpiredis
-  based connection backends simply, accepted values are:
+- __FIX__: allow `HMSET` when using a cluster of Redis nodes with client-side
+  sharding or redis-cluster (ISSUE #106).
 
-  - `phpiredis-stream` maps `Phpiredis\Connection\PhpiredisStreamConnection` to
-    `tcp`, `redis`, `unix` URI schemes.
-  - `phpiredis-socket` maps `Phpiredis\Connection\PhpiredisSocketConnection` to
-    `tcp`, `redis`, `unix` URI schemes.
-  - `phpiredis-stream` is simply an alias of `phpiredis-stream`.
+- __FIX__: set `WITHSCORES` modifer for `ZRANGE`, `ZREVRANGE`, `ZRANGEBYSCORE`
+  and `ZREVRANGEBYSCORE` only when the options array passed to these commands
+  has `WITHSCORES` set to `true` (ISSUE #107).
 
-- Added the new `Predis\Cluster\Hash\PhpiredisCRC16` class using ext-phpiredis
-  to speed-up the generation of the CRC16 hash of keys for redis-cluster. Predis
-  automatically uses this class when ext-phpiredis is loaded, but it is possible
-  to configure the hash generator using the new `crc16` client option (accepted
-  values `predis`, `phpiredis` or an hash generator instance).
+- __FIX__: scripted commands falling back from `EVALSHA` to `EVAL` resulted in
+  PHP errors when using a prefixed client (ISSUE #109).
 
-- Replication backends now use the `role` parameter instead of `alias` in order
-  to distinguish the role of a connection. Accepted values are `master`, `slave`
-  and, for redis-sentinel, `sentinel`. This led to a redesign of how connections
-  can be retrieved from replication backends: the method getConnectionById() now
-  retrieves a connection only by its ID (ip:port pair), to get a connection by
-  its alias there is the new method getConnectionByAlias(). This method is not
-  supported by the redis-sentinel backend due to its dynamic nature (connections
-  are retrieved and initialized at runtime from sentinels) but it is possible to
-  get a single connection from the pool by using its ID. It is also possible to
-  retrive a connection by role using the method getConnectionByRole().
+- __FIX__: `Predis\PubSub\DispatcherLoop` now works properly when using key
+  prefixing (ISSUE #114).
 
-- The concept of connection ID (ip:port pair) and connection alias (the `alias`
-  parameter) in `Predis\Connection\Cluster\PredisCluster` has been separated.
-  This change does not affect distribution and it is safe for existing clusters.
 
-- Client option classes now live in the `Predis\Configuration\Option` namespace.
+v0.8.3 (2013-02-18)
+================================================================================
 
-- Classes for Redis commands have been moved into the new `Predis\Command\Redis`
-  namespace and each class name mirrors the respective Redis command ID.
+- Added `CLIENT SETNAME` and `CLIENT GETNAME` (ISSUE #102).
 
-- The concept of server profiles is gone, the library now uses a single command
-  factory to create instances of commands classes. The `profile` option has been
-  replaced by the `commands` option accepting `Predis\Command\FactoryInterface`
-  to customize the underlying command factory. The default command factory class
-  used by Predis is `Predis\Command\RedisFactory` and it still allows developers
-  to define or override commands with their own implementations. In addition to
-  that, `Predis\Command\RedisFactory` relies on a convention-over-configuration
-  approach by looking for a suitable class with the same name as the command ID
-  in the `Predis\Command\Redis` when the internal class map does not contain a
-  class associated.
+- Implemented the `Predis\Connection\PhpiredisStreamConnection` class using the
+  `phpiredis` extension like `Predis\Connection\PhpiredisStreamConnection`, but
+  without requiring the `socket` extension since it relies on PHP's streams.
 
-- The method `Predis\Client::getClientFor($connectionID)` has been replaced by
-  `getClientBy($selector, $value, $callable = null)` which is more flexible as
-  it is not limited to picking a connection from the underlying replication or
-  cluster backend by ID, but allows users to specify a `$selector` that can be
-  either `id` (the old behavior), `key`, `slot` or `command`. The client uses
-  duck-typing instead of type-checking to verify that the underlying connection
-  implements a method that matches the specified selector which means that some
-  selectors may not be available to all kinds of connection backends.
+- Added support for the TCP_NODELAY flag via the `tcp_nodelay` parameter for
+  stream-based connections, namely `Predis\Connection\StreamConnection` and
+  `Predis\Connection\PhpiredisStreamConnection` (requires PHP >= 5.4.0).
 
-- The method `Predis\Client::getConnectionById($connectionID)` has been removed.
+- Updated the aggregated connection class for redis-cluster to work with 16384
+  hash slots instead of 4096 to reflect the recent change from redis unstable
+  ([see this commit](https://github.com/antirez/redis/commit/ebd666d)).
 
-- Changed the signature for the constructor of `Predis\Command\RawCommand`.
+- The constructor of `Predis\Client` now accepts a callable as first argument
+  returning `Predis\Connection\ConnectionInterface`. Users can create their
+  own self-contained strategies to create and set up the underlying connection.
 
-- The `Predis\Connection\Aggregate` namespace has been split into two separate
-  namespaces for cluster backends (`Predis\Connection\Cluster`) and replication
-  backends (`Predis\Connection\Replication`).
+- Users should return `0` from `Predis\Command\ScriptedCommand::getKeysCount()`
+  instead of `FALSE` to indicate that all of the arguments of a Lua script must
+  be used to populate `ARGV[]`. This does not represent a breaking change.
 
-- The method `Predis\Connection\AggregateConnectionInterface::getConnection()`
-  has been renamed to `getConnectionByCommand()`.
+- The `Predis\Helpers` class has been deprecated and it will be removed in
+  future releases.
 
-- The methods `switchToMaster()` and `switchToSlave()` have been promoted to be
-  part of `Predis\Connection\Replication\ReplicationInterface` while the method
-  `switchTo($connection)` has been removed from it.
 
-- The method `Predis\Connection\Cluster\PredisCluster::executeCommandOnNodes()`
-  has been removed as it is possible to achieve the same by iterating over the
-  connection or, even better, over the client instance in order to execute the
-  same command against all of the registered connections.
+v0.8.2 (2013-02-03)
+================================================================================
 
-- The class `Predis\CommunicationException` now uses the correct default types
-  for the `$message` (string) and `$code` (integer) parameters.
+- Added `Predis\Session\SessionHandler` to make it easy to store PHP sessions
+  on Redis using Predis. Please note that this class needs either PHP >= 5.4.0
+  or a polyfill for PHP's `SessionHandlerInterface`.
 
-- The method `onConnectionError()` in `Predis\Connection\AbstractConnection`
-  class now passes the second argument as an integer value `0` as its default
-  value instead of `null`.
+- Added the ability to get the default value of a client option directly from
+  `Predis\Option\ClientOption` using the `getDefault()` method by passing the
+  option name or its instance.
 
-- Support Pub/Sub and Pipelines when using replication
+- __FIX__: the standard pipeline executor was not using the response parser
+  methods associated to commands to process raw responses (ISSUE #101).
 
-- The class `Predis\Transaction\AbortedMultiExecException` now uses the correct 
-  default types for the `$code` (integer) parameter.
 
-- __FIX__: using `strval` in `getScanOptions()` method, part of
-  `Predis\Collection\Iterator\CursorBasedIterator` to make sure we retrieve the
-  string value of `$this->match` and not passing `null` to `strlen()` function.
+v0.8.1 (2013-01-19)
+================================================================================
 
-- __FIX__: the value returned from `getArgument()` in `isReadOperation()` method,
-  part of `Predis\Replication\ReplicationStrategy` class, is checked to not pass 
-  `null` to `sha1` function.
+- The `connections` client option can now accept a callable object returning
+  an instance of `Predis\Connection\ConnectionFactoryInterface`.
 
-- __FIX__: the value returned from `getArgument()` in `parseResponse()`method,
-  part of `Predis\Command\Redis\SENTINEL` class, is checked to not pass `null`
-  to `strtolower()` function.
+- Client options accepting callable objects as factories now pass their actual
+  instance to the callable as the second argument.
 
-## v2.0.0-beta.1 (2022-05-26)
+- `Predis\Command\Processor\KeyPrefixProcessor` can now be directly casted to
+  string to obtain the current prefix, useful with string interpolation.
 
-Same as v2.0.0
+- Added an optional callable argument to `Predis\Cluster\Distribution\HashRing`
+  and `Predis\Cluster\Distribution\KetamaPureRing` constructor that can be used
+  to customize how the distributor should extract the connection hash when
+  initializing the nodes distribution (ISSUE #36).
+
+- Correctly handle `TTL` and `PTTL` returning -2 on non existing keys starting
+  with Redis 2.8.
+
+- __FIX__: a missing use directive in `Predis\Transaction\MultiExecContext`
+  caused PHP errors when Redis did not return `+QUEUED` replies to commands
+  when inside a MULTI / EXEC context.
+
+- __FIX__: the `parseResponse()` method implemented for a scripted command was
+  ignored when retrying to execute a Lua script by falling back to `EVAL` after
+  a `-NOSCRIPT` error (ISSUE #94).
+
+- __FIX__: when subclassing `Predis\Client` the `getClientFor()` method returns
+  a new instance of the subclass instead of a new instance of `Predis\Client`.
+
+
+v0.8.0 (2012-10-23)
+================================================================================
+
+- The default server profile for Redis is now `2.6`.
+
+- Certain connection parameters have been renamed:
+
+  - `connection_async` is now `async_connect`
+  - `connection_timeout` is now `timeout`
+  - `connection_persistent` is now `persistent`
+
+- The `throw_errors` connection parameter has been removed and replaced by the
+  new `exceptions` client option since exceptions on `-ERR` replies returned by
+  Redis are not generated by connection classes anymore but instead are thrown
+  by the client class and other abstractions such as pipeline contexts.
+
+- Added smart support for redis-cluster (Redis v3.0) in addition to the usual
+  cluster implementation that uses client-side sharding.
+
+- Various namespaces and classes have been renamed to follow rules inspired by
+  the Symfony2 naming conventions.
+
+- The second argument of the constructor of `Predis\Client` does not accept
+  strings or instances of `Predis\Profile\ServerProfileInterface` anymore.
+  To specify a server profile you must explicitly set `profile` in the array
+  of client options.
+
+- `Predis\Command\ScriptedCommand` internally relies on `EVALSHA` instead of
+  `EVAL` thus avoiding to send Lua scripts bodies on each request. The client
+  automatically resends the command falling back to `EVAL` when Redis returns a
+  `-NOSCRIPT` error. Automatic fallback to `EVAL` does not work with pipelines,
+  inside a `MULTI / EXEC` context or with plain `EVALSHA` commands.
+
+- Complex responses are no more parsed by connection classes as they must be
+  processed by consumer classes using the handler associated to the issued
+  command. This means that executing commands directly on connections only
+  returns simple Redis types, but nothing changes when using `Predis\Client`
+  or the provided abstractions for pipelines and transactions.
+
+- Iterators for multi-bulk replies now skip the response parsing method of the
+  command that generated the response and are passed directly to user code.
+  Pipeline and transaction objects still consume automatically iterators.
+
+- Cluster and replication connections now extend a new common interface,
+  `Predis\Connection\AggregatedConnectionInterface`.
+
+- `Predis\Connection\MasterSlaveReplication` now uses an external strategy
+  class to handle the logic for checking readable / writable commands and Lua
+  scripts.
+
+- Command pipelines have been optimized for both speed and code cleanness, but
+  at the cost of bringing a breaking change in the signature of the interface
+  for pipeline executors.
+
+- Added a new pipeline executor that sends commands wrapped in a MULTI / EXEC
+  context to make the execution atomic: if a pipeline fails at a certain point
+  then the whole pipeline is discarded.
+
+- The key-hashing mechanism for commands is now handled externally and is no
+  more a competence of each command class. This change is neeeded to support
+  both client-side sharding and Redis cluster.
+
+- `Predis\Options\Option` is now abstract, see `Predis\Option\AbstractOption`.
+
+
+v0.7.3 (2012-06-01)
+================================================================================
+
+- New commands available in the Redis v2.6 profile (dev): `BITOP`, `BITCOUNT`.
+
+- When the number of keys `Predis\Commands\ScriptedCommand` is negative, Predis
+  will count from the end of the arguments list to calculate the actual number
+  of keys that will be interpreted as elements for `KEYS` by the underlying
+  `EVAL` command.
+
+- __FIX__: `examples\CustomDistributionStrategy.php` had a mistyped constructor
+  call and produced a bad distribution due to an error as pointed in ISSUE #63.
+  This bug is limited to the above mentioned example and does not affect the
+  classes implemented in the `Predis\Distribution` namespace.
+
+- __FIX__: `Predis\Commands\ServerEvalSHA::getScriptHash()` was calculating the
+  hash while it just needs to return the first argument of the command.
+
+- __FIX__: `Predis\Autoloader` has been modified to allow cascading autoloaders
+  for the `Predis` namespace.
+
+
+v0.7.2 (2012-04-01)
+================================================================================
+
+- Added `2.6` in the server profiles aliases list for the upcoming Redis 2.6.
+  `2.4` is still the default server profile. `dev` now targets Redis 2.8.
+
+- Connection instances can be serialized and unserialized using `serialize()`
+  and `unserialize()`. This is handy in certain scenarios such as client-side
+  clustering or replication to lower the overhead of initializing a connection
+  object with many sub-connections since unserializing them can be up to 5x
+  times faster.
+
+- Reworked the default autoloader to make it faster. It is also possible to
+  prepend it in PHP's autoload stack.
+
+- __FIX__: fixed parsing of the payload returned by `MONITOR` with Redis 2.6.
+
+
+v0.7.1 (2011-12-27)
+================================================================================
+
+- The PEAR channel on PearHub has been deprecated in favour of `pear.nrk.io`.
+
+- Miscellaneous minor fixes.
+
+- Added transparent support for master / slave replication configurations where
+  write operations are performed on the master server and read operations are
+  routed to one of the slaves. Please refer to ISSUE #21 for a bit of history
+  and more details about replication support in Predis.
+
+- The `profile` client option now accepts a callable object used to initialize
+  a new instance of `Predis\Profiles\IServerProfile`.
+
+- Exposed a method for MULTI / EXEC contexts that adds the ability to execute
+  instances of Redis commands against transaction objects.
+
+
+v0.7.0 (2011-12-11)
+================================================================================
+
+- Predis now adheres to the PSR-0 standard which means that there is no more a
+  single file holding all the classes of the library, but multiple files (one
+  for each class). You can use any PSR-0 compatible autoloader to load Predis
+  or just leverage the default one shipped with the library by requiring the
+  `Predis/Autoloader.php` and call `Predis\Autoloader::register()`.
+
+- The default server profile for Redis is now 2.4. The `dev` profile supports
+  all the features of Redis 2.6 (currently unstable) such as Lua scripting.
+
+- Support for long aliases (method names) for Redis commands has been dropped.
+
+- Redis 1.0 is no more supported. From now on Predis will use only the unified
+  protocol to serialize commands.
+
+- It is possible to prefix keys transparently on a client-level basis with the
+  new `prefix` client option.
+
+- An external connection factory is used to initialize new connection instances
+  and developers can now register their own connection classes using the new
+  `connections` client option.
+
+- It is possible to connect locally to Redis using UNIX domain sockets. Just
+  use `unix:///path/to/redis.sock` or a named array just like in the following
+  example: `array('scheme' => 'unix', 'path' => '/path/to/redis.sock');`.
+
+- If the `phpiredis` extension is loaded by PHP, it is now possible to use an
+  alternative connection class that leverages it to make Predis faster on many
+  cases, especially when dealing with big multibulk replies, with the the only
+  downside that persistent connections are not supported. Please refer to the
+  documentation to see how to activate this class using the new `connections`
+  client option.
+
+- Predis is capable to talk with Webdis, albeit with some limitations such as
+  the lack of pipelining and transactions, just by using the `http` scheme in
+  in the connection parameters. All is needed is PHP with the `curl` and the
+  `phpiredis` extensions loaded.
+
+- Way too many changes in the public API to make a list here, we just tried to
+  make all the Redis commands compatible with previous releases of v0.6 so that
+  you do not have to worry if you are simply using Predis as a client. Probably
+  the only breaking changes that should be mentioned here are:
+
+  - `throw_on_error` has been renamed to `throw_errors` and it is a connection
+    parameter instead of a client option, along with `iterable_multibulk`.
+
+  - `key_distribution` has been removed from the client options. To customize
+    the distribution strategy you must provide a callable object to the new
+    `cluster` client option to configure and then return a new instance of
+    `Predis\Network\IConnectionCluster`.
+
+  - `Predis\Client::create()` has been removed. Just use the constructor to set
+    up a new instance of `Predis\Client`.
+
+  - `Predis\Client::pipelineSafe()` was deprecated in Predis v0.6.1 and now has
+    finally removed. Use `Predis\Client::pipeline(array('safe' => true))`.
+
+  - `Predis\Client::rawCommand()` has been removed due to inconsistencies with
+    the underlying connection abstractions. You can still get the raw resource
+    out of a connection with `Predis\Network\IConnectionSingle::getResource()`
+    so that you can talk directly with Redis.
+
+- The `Predis\MultiBulkCommand` class has been merged into `Predis\Command` and
+  thus removed. Serialization of commands is now a competence of connections.
+
+- The `Predis\IConnection` interface has been splitted into two new interfaces:
+  `Predis\Network\IConnectionSingle` and `Predis\Network\IConnectionCluster`.
+
+- The constructor of `Predis\Client` now accepts more type of arguments such as
+  instances of `Predis\IConnectionParameters` and `Predis\Network\IConnection`.
+
+
+v0.6.6 (2011-04-01)
+================================================================================
+
+- Switched to Redis 2.2 as the default server profile (there are no changes
+  that would break compatibility with previous releases). Long command names
+  are no more supported by default but if you need them you can still require
+  `Predis_Compatibility.php` to avoid breaking compatibility.
+
+- Added a `VERSION` constant to `Predis\Client`.
+
+- Some performance improvements for multibulk replies (parsing them is about
+  16% faster than the previous version). A few core classes have been heavily
+  optimized to reduce overhead when creating new instances.
+
+- Predis now uses by default a new protocol reader, more lightweight and
+  faster than the default handler-based one. Users can revert to the old
+  protocol reader with the `reader` client option set to `composable`.
+  This client option can also accept custom reader classes implementing the
+  new `Predis\IResponseReader` interface.
+
+- Added support for connecting to Redis using UNIX domain sockets (ISSUE #25).
+
+- The `read_write_timeout` connection parameter can now be set to 0 or false
+  to disable read and write timeouts on connections. The old behaviour of -1
+  is still intact.
+
+- `ZUNIONSTORE` and `ZINTERSTORE` can accept an array to specify a list of the
+  source keys to be used to populate the destination key.
+
+- `MGET`, `SINTER`, `SUNION` and `SDIFF` can accept an array to specify a list
+  of keys. `SINTERSTORE`, `SUNIONSTORE` and `SDIFFSTORE` can also accept an
+  array to specify the list of source keys.
+
+- `SUBSCRIBE` and `PSUBSCRIBE` can accept a list of channels for subscription.
+
+- __FIX__: some client-side clean-ups for `MULTI/EXEC` were handled incorrectly
+  in a couple of corner cases (ISSUE #27).
+
+
+v0.6.5 (2011-02-12)
+================================================================================
+
+- __FIX__: due to an untested internal change introduced in v0.6.4, a wrong
+  handling of bulk reads of zero-length values was producing protocol
+  desynchronization errors (ISSUE #20).
+
+
+v0.6.4 (2011-02-12)
+================================================================================
+
+- Various performance improvements (15% ~ 25%) especially when dealing with
+  long multibulk replies or when using clustered connections.
+
+- Added the `on_retry` option to `Predis\MultiExecBlock` that can be used to
+  specify an external callback (or any callable object) that gets invoked
+  whenever a transaction is aborted by the server.
+
+- Added inline (p)subscribtion via options when initializing an instance of
+  `Predis\PubSubContext`.
+
+
+v0.6.3 (2011-01-01)
+================================================================================
+
+- New commands available in the Redis v2.2 profile (dev):
+  - Strings: `SETRANGE`, `GETRANGE`, `SETBIT`, `GETBIT`
+  - Lists  : `BRPOPLPUSH`
+
+- The abstraction for `MULTI/EXEC` transactions has been dramatically improved
+  by providing support for check-and-set (CAS) operations when using Redis >=
+  2.2. Aborted transactions can also be optionally replayed in automatic up
+  to a user-defined number of times, after which a `Predis\AbortedMultiExec`
+  exception is thrown.
+
+
+v0.6.2 (2010-11-28)
+================================================================================
+
+- Minor internal improvements and clean ups.
+
+- New commands available in the Redis v2.2 profile (dev):
+  - Strings: `STRLEN`
+  - Lists  : `LINSERT`, `RPUSHX`, `LPUSHX`
+  - ZSets  : `ZREVRANGEBYSCORE`
+  - Misc.  : `PERSIST`
+
+- WATCH also accepts a single array parameter with the keys that should be
+  monitored during a transaction.
+
+- Improved the behaviour of `Predis\MultiExecBlock` in certain corner cases.
+
+- Improved parameters checking for the SORT command.
+
+- __FIX__: the `STORE` parameter for the `SORT` command didn't work correctly
+  when using `0` as the target key (ISSUE #13).
+
+- __FIX__: the methods for `UNWATCH` and `DISCARD` do not break anymore method
+  chaining with `Predis\MultiExecBlock`.
+
+
+v0.6.1 (2010-07-11)
+================================================================================
+
+- Minor internal improvements and clean ups.
+
+- New commands available in the Redis v2.2 profile (dev):
+  - Misc.  : `WATCH`, `UNWATCH`
+
+- Optional modifiers for `ZRANGE`, `ZREVRANGE` and `ZRANGEBYSCORE` queries are
+  supported using an associative array passed as the last argument of their
+  respective methods.
+
+- The `LIMIT` modifier for `ZRANGEBYSCORE` can be specified using either:
+  - an indexed array: `array($offset, $count)`
+  - an associative array: `array('offset' => $offset, 'count' => $count)`
+
+- The method `Predis\Client::__construct()` now accepts also instances of
+  `Predis\ConnectionParameters`.
+
+- `Predis\MultiExecBlock` and `Predis\PubSubContext` now throw an exception
+  when trying to create their instances using a profile that does not
+  support the required Redis commands or when the client is connected to
+  a cluster of connections.
+
+- Various improvements to `Predis\MultiExecBlock`:
+  - fixes and more consistent behaviour across various usage cases.
+  - support for `WATCH` and `UNWATCH` when using the current development
+    profile (Redis v2.2) and aborted transactions.
+
+- New signature for `Predis\Client::multiExec()` which is now able to accept
+  an array of options for the underlying instance of `Predis\MultiExecBlock`.
+  Backwards compatibility with previous releases of Predis is ensured.
+
+- New signature for `Predis\Client::pipeline()` which is now able to accept
+  an array of options for the underlying instance of Predis\CommandPipeline.
+  Backwards compatibility with previous releases of Predis is ensured.
+  The method `Predis\Client::pipelineSafe()` is to be considered deprecated.
+
+- __FIX__: The `WEIGHT` modifier for `ZUNIONSTORE` and `ZINTERSTORE` was
+  handled incorrectly with more than two weights specified.
+
+
+v0.6.0 (2010-05-24)
+================================================================================
+
+- Switched to the new multi-bulk request protocol for all of the commands
+  in the Redis 1.2 and Redis 2.0 profiles. Inline and bulk requests are now
+  deprecated as they will be removed in future releases of Redis.
+
+- The default server profile is `2.0` (targeting Redis 2.0.x). If you are
+  using older versions of Redis, it is highly recommended that you specify
+  which server profile the client should use (e.g. `1.2` when connecting
+  to instances of Redis 1.2.x).
+
+- Support for Redis 1.0 is now optional and it is provided by requiring
+  'Predis_Compatibility.php' before creating an instance of `Predis\Client`.
+
+- New commands added to the Redis 2.0 profile since Predis 0.5.1:
+  - Strings: `SETEX`, `APPEND`, `SUBSTR`
+  - ZSets  : `ZCOUNT`, `ZRANK`, `ZUNIONSTORE`, `ZINTERSTORE`, `ZREMBYRANK`,
+             `ZREVRANK`
+  - Hashes : `HSET`, `HSETNX`, `HMSET`, `HINCRBY`, `HGET`, `HMGET`, `HDEL`,
+             `HEXISTS`, `HLEN`, `HKEYS`, `HVALS`, `HGETALL`
+  - PubSub : `PUBLISH`, `SUBSCRIBE`, `UNSUBSCRIBE`
+  - Misc.  : `DISCARD`, `CONFIG`
+
+- Introduced client-level options with the new `Predis\ClientOptions` class.
+  Options can be passed to the constructor of `Predis\Client` in its second
+  argument as an array or an instance of `Predis\ClientOptions`. For brevity's
+  sake and compatibility with older versions, the constructor still accepts
+  an instance of `Predis\RedisServerProfile` in its second argument. The
+  currently supported client options are:
+
+  - `profile` [default: `2.0` as of Predis 0.6.0]: specifies which server
+    profile to use when connecting to Redis. This option accepts an instance
+    of `Predis\RedisServerProfile` or a string that indicates the version.
+
+  - `key_distribution` [default: `Predis\Distribution\HashRing`]: specifies
+    which key distribution strategy to use to distribute keys among the
+    servers that compose a cluster. This option accepts an instance of
+    `Predis\Distribution\IDistributionStrategy` so that users can implement
+    their own key distribution strategy. `Predis\Distribution\KetamaPureRing`
+    is an alternative distribution strategy providing a pure-PHP implementation
+    of the same algorithm used by libketama.
+
+  - `throw_on_error` [default: `TRUE`]: server errors can optionally be handled
+    "silently": instead of throwing an exception, the client returns an error
+    response type.
+
+  - `iterable_multibulk` [EXPERIMENTAL - default: `FALSE`]: in addition to the
+    classic way of fetching a whole multibulk reply into an array, the client
+    can now optionally stream a multibulk reply down to the user code by using
+    PHP iterators. It is just a little bit slower, but it can save a lot of
+    memory in certain scenarios.
+
+- New parameters for connections:
+
+  - `alias` [default: not set]: every connection can now be identified by an
+    alias that is useful to get a specific connections when connected to a
+    cluster of Redis servers.
+  - `weight` [default: not set]: allows to balance keys asymmetrically across
+    multiple servers. This is useful when you have servers with different
+    amounts of memory to distribute the load of your keys accordingly.
+  - `connection_async` [default: `FALSE`]: estabilish connections to servers
+    in a non-blocking way, so that the client is not blocked while the socket
+    resource performs the actual connection.
+  - `connection_persistent` [default: `FALSE`]: the underlying socket resource
+    is left open when a script ends its lifecycle. Persistent connections can
+    lead to unpredictable or strange behaviours, so they should be used with
+    extreme care.
+
+- Introduced the `Predis\Pipeline\IPipelineExecutor` interface. Classes that
+  implements this interface are used internally by the `Predis\CommandPipeline`
+  class to change the behaviour of the pipeline when writing/reading commands
+  from one or multiple servers. Here is the list of the default executors:
+
+  - `Predis\Pipeline\StandardExecutor`: exceptions generated by server errors
+    might be thrown depending on the options passed to the client (see the
+    `throw_on_error` client option). Instead, protocol or network errors always
+    throw exceptions. This is the default executor for single and clustered
+    connections and shares the same behaviour of Predis 0.5.x.
+  - `Predis\Pipeline\SafeExecutor`: exceptions generated by server, protocol
+    or network errors are not thrown but returned in the response array as
+    instances of `Predis\ResponseError` or `Predis\CommunicationException`.
+  - `Predis\Pipeline\SafeClusterExecutor`: this executor shares the same
+    behaviour of `Predis\Pipeline\SafeExecutor` but it is geared towards
+    clustered connections.
+
+- Support for PUB/SUB is handled by the new `Predis\PubSubContext` class, which
+  could also be used to build a callback dispatcher for PUB/SUB scenarios.
+
+- When connected to a cluster of connections, it is now possible to get a
+  new `Predis\Client` instance for a single connection of the cluster by
+  passing its alias/index to the new `Predis\Client::getClientFor()` method.
+
+- `Predis\CommandPipeline` and `Predis\MultiExecBlock` return their instances
+  when invokink commands, thus allowing method chaining in pipelines and
+  multi-exec blocks.
+
+- `Predis\MultiExecBlock` can handle the new `DISCARD` command.
+
+- Connections now support float values for the `connection_timeout` parameter
+  to express timeouts with a microsecond resolution.
+
+- __FIX__: TCP connections now respect the read/write timeout parameter when
+  reading the payload of server responses. Previously, `stream_get_contents()`
+  was being used internally to read data from a connection but it looks like
+  PHP does not honour the specified timeout for socket streams when inside
+  this function.
+
+- __FIX__: The `GET` parameter for the `SORT` command now accepts also multiple
+  key patterns by passing an array of strings. (ISSUE #1).
+
+* __FIX__: Replies to the `DEL` command return the number of elements deleted
+  by the server and not 0 or 1 interpreted as a boolean response. (ISSUE #4).
+
+
+v0.5.1 (2010-01-23)
+================================================================================
+
+* `RPOPLPUSH` has been changed from bulk command to inline command in Redis
+  1.2.1, so `ListPopLastPushHead` now extends `InlineCommand`. The old behavior
+  is still available via the `ListPopLastPushHeadBulk` class so that you can
+  override the server profile if you need the old (and uncorrect) behaviour
+  when connecting to a Redis 1.2.0 instance.
+
+* Added missing support for `BGREWRITEAOF` for Redis >= 1.2.0.
+
+* Implemented a factory method for the `RedisServerProfile` class to ease the
+  creation of new server profile instances based on a version string.
+
+
+v0.5.0 (2010-01-09)
+================================================================================
+* First versioned release of Predis

CONTRIBUTING.md

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

FAQ.md

@@ -18,14 +18,6 @@ least to some degree).
 Yes. Obviously persistent connections actually work only when using PHP configured as a persistent
 process reused by the web server (see [PHP-FPM](http://php-fpm.org)).
 
-### Does Predis support SSL-encrypted connections? ###
-
-Yes. Encrypted connections are mostly useful when connecting to Redis instances exposed by various
-cloud hosting providers without the need to configure an SSL proxy, but you should also take into
-account the general performances degradation especially during the connect() operation when the TLS
-handshake must be performed to secure the connection. Persistent SSL-encrypted connections may help
-in that respect, but they are supported only when running on PHP >= 7.0.0.
-
 ### Does Predis support transparent (de)serialization of values? ###
 
 No and it will not ever do that by default. The reason behind this decision is that serialization is
@@ -33,7 +25,7 @@ usually something that developers prefer to customize depending on their needs a
 generalized when using Redis because of the many possible access patterns for your data. This does
 not mean that it is impossible to have such a feature since you can leverage the extensibility of
 this library to define your own serialization-aware commands. You can find more details about how to
-do that [on this issue](http://github.com/predis/predis/issues/29#issuecomment-1202624).
+do that [on this issue](http://github.com/nrk/predis/issues/29#issuecomment-1202624).
 
 ### How can I force Predis to connect to Redis before sending any command? ###
 
@@ -141,7 +133,7 @@ library for Redis) with a thin layer exposing its features to PHP. You can then
 different connection classes:
 
   - `Predis\Connection\PhpiredisStreamConnection` (using native PHP streams).
-  - `Predis\Connection\PhpiredisSocketConnection` (requires `ext-socket`).
+  - `Predis\Connection\PhpiredisConnection` (requires `ext-socket`).
 
 You will now get the benefits of a faster protocol serializer and parser just by adding a couple of
 lines of code:
@@ -150,7 +142,7 @@ lines of code:
 $client = new Predis\Client('tcp://127.0.0.1', array(
     'connections' => array(
         'tcp'  => 'Predis\Connection\PhpiredisStreamConnection',
-        'unix' => 'Predis\Connection\PhpiredisSocketConnection',
+        'unix' => 'Predis\Connection\PhpiredisConnection',
     ),
 ));
 ```

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2021 Daniele Alessandri
+Copyright (c) 2009-2014 Daniele Alessandri
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -1,51 +1,52 @@
 # Predis #
 
-[![Software license][ico-license]](LICENSE)
-[![Latest stable][ico-version-stable]][link-packagist]
-[![Latest development][ico-version-dev]][link-packagist]
-[![Monthly installs][ico-downloads-monthly]][link-downloads]
-[![Build status][ico-build]][link-actions]
+[![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)
 
-A flexible and feature-complete [Redis](http://redis.io) client for PHP 7.2 and newer.
+Predis is a flexible and feature-complete [Redis](http://redis.io) client library for PHP >= 5.3.
 
-More details about this project can be found on the [frequently asked questions](FAQ.md).
+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).
+
+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).
 
 
 ## Main features ##
 
-- Support for Redis from __3.0__ to __7.0__.
-- Support for clustering using client-side sharding and pluggable keyspace distributors.
-- Support for [redis-cluster](http://redis.io/topics/cluster-tutorial) (Redis >= 3.0).
-- Support for master-slave replication setups and [redis-sentinel](http://redis.io/topics/sentinel).
-- 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`.
+- Wide range of Redis versions supported (from __1.2__ to __2.8__ and unstable) using profiles.
+- Clustering via client-side sharding using consistent hashing or custom distributors.
+- Smart support for [redis-cluster](http://redis.io/topics/cluster-spec) (Redis >= 3.0).
+- Support for master-slave replication configurations (write on master, read from slaves).
+- Transparent key prefixing for all Redis commands.
+- Command pipelining (works on both single 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`.
 - Abstraction for `SCAN`, `SSCAN`, `ZSCAN` and `HSCAN` (Redis >= 2.8) based on PHP iterators.
-- Connections are established lazily by the client upon the first command and can be persisted.
-- Connections can be established via TCP/IP (also TLS/SSL-encrypted) or UNIX domain sockets.
-- Support for [Webdis](http://webd.is) (requires both `ext-curl` and `ext-phpiredis`).
+- 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).
 - Support for custom connection classes for providing different network or protocol backends.
-- Flexible system for defining custom commands and override the default ones.
+- Flexible system for defining and registering custom sets of supported commands or profiles.
 
 
-## How to _install_ and use Predis ##
+## How to use Predis ##
 
-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).
-Compressed archives of each release are [available on GitHub](https://github.com/predis/predis/releases).
-
-```shell
-composer require predis/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).
 
 
 ### Loading the library ###
 
 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 lacking any autoload facility:
+[PSR-0 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) which makes
+it compatible with most PHP frameworks. Autoloading is handled automatically when dependencies are
+managed using Composer, but you can also leverage its own autoloader if you are going to use it in a
+project or script without any PSR-0 compliant autoloading facility:
 
 ```php
 // Prepend a base path if Predis is not available in your "include_path".
@@ -54,11 +55,17 @@ 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 also possible to generate one single PHP file that holds every class like older
+versions of Predis by launching `bin/create-single-file`, but this practice __is not__ encouraged.
+
 
 ### Connecting to Redis ###
 
-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:
+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 and uses a connection timeout of 5 seconds:
 
 ```php
 $client = new Predis\Client();
@@ -66,212 +73,61 @@ $client->set('foo', 'bar');
 $value = $client->get('foo');
 ```
 
-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:
+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:
 
 ```php
-// Parameters passed using a named array:
+// Named array of connection parameters:
 $client = new Predis\Client([
     'scheme' => 'tcp',
     'host'   => '10.0.0.1',
     'port'   => 6379,
 ]);
 
-// Same set of parameters, passed using an URI string:
+// Same set of parameters, but using an URI string:
 $client = new Predis\Client('tcp://10.0.0.1:6379');
 ```
 
-Password protected servers can be accessed by adding `password` to the parameters set. When ACLs are
-enabled on Redis >= 6.0, both `username` and `password` are required for user authentication.
-
-It is also possible to connect to local instances of Redis using UNIX domain sockets, in this case
-the parameters must use the `unix` scheme and specify a path for the socket file:
+When an array of connections parameters is provided, Predis automatically works in clustering mode
+using client-side sharding. Both named arrays and URI strings can be mixed for providing each node
+configuration:
 
 ```php
-$client = new Predis\Client(['scheme' => 'unix', 'path' => '/path/to/redis.sock']);
-$client = new Predis\Client('unix:/path/to/redis.sock');
-```
-
-The client can leverage TLS/SSL encryption to connect to secured remote Redis instances without the
-need to configure an SSL proxy like stunnel. This can be useful when connecting to nodes running on
-various cloud hosting providers. Encryption can be enabled with using the `tls` scheme and an array
-of suitable [options](http://php.net/manual/context.ssl.php) passed via the `ssl` parameter:
-
-```php
-// Named array of connection parameters:
 $client = new Predis\Client([
-  'scheme' => 'tls',
-  'ssl'    => ['cafile' => 'private.pem', 'verify_peer' => true],
+    'tcp://10.0.0.1?alias=first-node',
+    ['host' => '10.0.0.2', 'alias' => 'second-node'],
 ]);
-
-// Same set of parameters, but using an URI string:
-$client = new Predis\Client('tls://127.0.0.1?ssl[cafile]=private.pem&ssl[verify_peer]=1');
 ```
 
-The connection schemes [`redis`](http://www.iana.org/assignments/uri-schemes/prov/redis) (alias of
-`tcp`) and [`rediss`](http://www.iana.org/assignments/uri-schemes/prov/rediss) (alias of `tls`) are
-also supported, with the difference that URI strings containing these schemes are parsed following
-the rules described on their respective IANA provisional registration documents.
-
 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.
-
-Predis can aggregate multiple connections when providing an array of connection parameters and the
-appropriate option to instruct the client about how to aggregate them (clustering, replication or a
-custom aggregation logic). Named arrays and URI strings can be mixed when providing configurations
-for each node:
-
-```php
-$client = new Predis\Client([
-    'tcp://10.0.0.1?alias=first-node', ['host' => '10.0.0.2', 'alias' => 'second-node'],
-], [
-    'cluster' => 'predis',
-]);
-```
-
-See the [aggregate connections](#aggregate-connections) section of this document for more details.
-
-Connections to Redis are lazy meaning that the client connects to a server only if and when needed.
-While it is recommended to let the client do its own stuff under the hood, there may be times when
-it is still desired to have control of when the connection is opened or closed: this can easily be
-achieved by invoking `$client->connect()` and `$client->disconnect()`. Please note that the effect
-of these methods on aggregate connections may differ depending on each specific implementation.
+it is recommended to refer to their specific documentation for details.
 
 
 ### Client configuration ###
 
-Many aspects and behaviors of the client can be configured by passing specific client options to the
-second argument of `Predis\Client::__construct()`:
+Various aspects of the client can be easily configured by passing options to the second argument of
+`Predis\Client::__construct()`. 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:
 
-```php
-$client = new Predis\Client($parameters, ['prefix' => 'sample:']);
-```
-
-Options are managed using a mini DI-alike container and their values can be lazily initialized only
-when needed. The client options supported by default in Predis are:
-
-  - `prefix`: prefix string applied to every key found in commands.
+  - `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.
   - `exceptions`: whether the client should throw or return responses upon Redis errors.
-  - `connections`: list of connection backends or a connection factory instance.
-  - `cluster`: specifies a cluster backend (`predis`, `redis` or callable).
-  - `replication`: specifies a replication backend (`predis`, `sentinel` or callable).
-  - `aggregate`: configures the client with a custom aggregate connection (callable).
-  - `parameters`: list of default connection parameters for aggregate connections.
-  - `commands`: specifies a command factory instance to use through the library.
+  - `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).
 
-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.
+Users can provide custom option values, they are stored in the options container and can be accessed
+later through the library.
 
 
 ### Aggregate connections ###
 
-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 along with the appropriate client option when creating a new client instance.
-
-#### Cluster ####
-
-Predis can be configured to work in clustering mode with a traditional client-side sharding approach
-to create a cluster of independent nodes and distribute the keyspace among them. This approach needs
-some sort of external health monitoring of nodes and requires the keyspace to be rebalanced manually
-when nodes are added or removed:
-
-```php
-$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
-$options    = ['cluster' => 'predis'];
-
-$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 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 by setting the `role` parameter
-to `master`) and one or more slaves (in this case setting `role` to `slave` for slaves is optional):
-
-```php
-$parameters = ['tcp://10.0.0.1?role=master', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
-$options    = ['replication' => 'predis'];
-
-$client = new Predis\Client($parameters, $options);
-```
-
-The above configuration has a static list of servers and relies entirely on the client's logic, but
-it is possible to rely on [`redis-sentinel`](http://redis.io/topics/sentinel) for a more robust HA
-environment with sentinel servers acting as a source of authority for clients for service discovery.
-The minimum configuration required by the client to work with redis-sentinel is a list of connection
-parameters pointing to a bunch of sentinel instances, the `replication` option set to `sentinel` and
-the `service` option set to the name of the service:
-
-```php
-$sentinels = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
-$options   = ['replication' => 'sentinel', 'service' => 'mymaster'];
-
-$client = new Predis\Client($sentinels, $options);
-```
-
-If the master and slave nodes are configured to require an authentication from clients, a password
-must be provided via the global `parameters` client option. This option can also be used to specify
-a different database index. The client options array would then look like this:
-
-```php
-$options = [
-    'replication' => 'sentinel',
-    'service' => 'mymaster',
-    'parameters' => [
-        'password' => $secretpassword,
-        'database' => 10,
-    ],
-];
-```
-
-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 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:
-
-```php
-$parameters = ['tcp://10.0.0.1?role=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();
-    $strategy->setScriptReadOnly($LUA_SCRIPT);
-
-    return new Predis\Connection\Replication\MasterSlaveReplication($strategy);
-}];
-
-$client = new Predis\Client($parameters, $options);
-$client->eval($LUA_SCRIPT, 0);             // Sticks to slave using `eval`...
-$client->evalsha(sha1($LUA_SCRIPT), 0);    // ... and `evalsha`, too.
-```
-
-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.
+Predis is able to aggregate multiple connections which is the base for clustering and replication.
+By default the client implements clustering 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 single-master and multiple-slaves setups by executing read operations on slaves
+and switching to the master for write operations. The replication behaviour is fully configurable.
 
 
 ### Command pipelines ###
@@ -282,7 +138,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 the given callable block:
+// Executes a pipeline inside a given callable block:
 $responses = $client->pipeline(function ($pipe) {
     for ($i = 0; $i < 1000; $i++) {
         $pipe->set("key:$i", str_pad($i, 4, '0', 0));
@@ -290,7 +146,7 @@ $responses = $client->pipeline(function ($pipe) {
     }
 });
 
-// Returns a pipeline that can be chained thanks to its fluent interface:
+// Returns a pipeline instance with fluent interface:
 $responses = $client->pipeline()->set('foo', 'bar')->get('foo')->execute();
 ```
 
@@ -301,31 +157,70 @@ The client provides an abstraction for Redis transactions based on `MULTI` and `
 interface to command pipelines:
 
 ```php
-// Executes a transaction inside the given callable block:
+// Executes a transaction inside a given callable block:
 $responses = $client->transaction(function ($tx) {
     $tx->set('foo', 'bar');
     $tx->get('foo');
 });
 
-// Returns a transaction that can be chained thanks to its fluent interface:
+// Returns a transaction instance with fluent interface:
 $responses = $client->transaction()->set('foo', 'bar')->get('foo')->execute();
 ```
 
 This abstraction can perform check-and-set operations thanks to `WATCH` and `UNWATCH` and provides
 automatic retries of transactions aborted by Redis when `WATCH`ed keys are touched. For an example
-of a transaction using CAS you can see [the following example](examples/transaction_using_cas.php).
+of a transaction using CAS you can see [the following example](examples/TransactionWithCAS.php).
+
+__NOTE__: the method `transaction()` is available since `v0.8.5`, older versions used `multiExec()`
+for the same purpose but it has been deprecated and will be removed in the next major release.
 
 
-### Adding new commands ###
+### Customizable connection backends ###
 
-While we try to update Predis to stay up to date with all the commands available in Redis, you might
-prefer to stick with an old version of the library or provide a different way to filter arguments or
-parse responses for specific commands. To achieve that, Predis provides the ability to implement new
-command classes to define or override commands in the default command factory used by the client:
+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:
 
 ```php
-// Define a new command by extending Predis\Command\Command:
-class BrandNewRedisCommand extends Predis\Command\Command
+$client = new Predis\Client('tcp://127.0.0.1', [
+    'connections' => [
+        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection', // PHP streams
+        'unix' => 'Predis\Connection\PhpiredisConnection',       // ext-socket
+    ],
+]);
+```
+
+Developers can create their own connection classes to add support for new network backends, extend
+existing ones or provide completely different implementations. Connection classes must implement
+`Predis\Connection\SingleConnectionInterface` or extend `Predis\Connection\AbstractConnection`:
+
+```php
+class MyConnectionClass implements Predis\Connection\SingleConnectionInterface
+{
+    // Implementation goes here...
+}
+
+// Use MyConnectionClass to handle connections for the `tcp` scheme:
+$client = new Predis\Client('tcp://127.0.0.1', [
+    'connections' => ['tcp' => 'MyConnectionClass'],
+]);
+```
+
+For a more in-depth insight on how to create new connection backends you can refer to the actual
+implementation of the standard connection classes available in the `Predis\Connection` namespace.
+
+
+### Adding support for 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:
+
+```php
+// Define a new command by extending Predis\Command\AbstractCommand:
+class BrandNewRedisCommand extends Predis\Command\AbstractCommand
 {
     public function getId()
     {
@@ -333,39 +228,27 @@ class BrandNewRedisCommand extends Predis\Command\Command
     }
 }
 
-// Inject your command in the current command factory:
-$client = new Predis\Client($parameters, [
-    'commands' => [
-        'newcmd' => 'BrandNewRedisCommand',
-    ],
-]);
+// Inject your command in the current profile:
+$client = new Predis\Client();
+$client->getProfile()->defineCommand('newcmd', 'BrandNewRedisCommand');
 
 $response = $client->newcmd();
 ```
 
-There is also a method to send raw commands without filtering their arguments or parsing responses.
-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):
+
+### Scriptable commands ###
+
+A scriptable command is just an abstraction for [Lua scripting](http://redis.io/commands/eval) that
+aims to simplify the usage of scripting with Redis >= 2.6. Scriptable 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 a Lua script that gets transmitted to Redis for remote execution. Internally, scriptable
+commands use by default [EVALSHA](http://redis.io/commands/evalsha) and identify a Lua script by its
+SHA1 hash to save bandwidth but [EVAL](http://redis.io/commands/eval) is automatically preferred as
+a fall back when needed:
 
 ```php
-$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
-directly [`EVAL`](http://redis.io/commands/eval) and [`EVALSHA`](http://redis.io/commands/evalsha),
-Predis offers script commands as an higher level abstraction built upon them to make things simple.
-Script commands can be registered in the command factory used by the client and are accessible as if
-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 script command by extending Predis\Command\ScriptCommand:
-class ListPushRandomValue extends Predis\Command\ScriptCommand
+// Define a new scriptable command by extending Predis\Command\ScriptedCommand:
+class ListPushRandomValue extends Predis\Command\ScriptedCommand
 {
     public function getKeysCount()
     {
@@ -383,64 +266,14 @@ LUA;
     }
 }
 
-// Inject the script command in the current command factory:
-$client = new Predis\Client($parameters, [
-    'commands' => [
-        'lpushrand' => 'ListPushRandomValue',
-    ],
-]);
+// Inject your scriptable command in the current profile:
+$client = new Predis\Client();
+$client->getProfile()->defineCommand('lpushrand', 'ListPushRandomValue');
 
 $response = $client->lpushrand('random_values', $seed = mt_rand());
 ```
 
 
-### Customizable connection backends ###
-
-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 and UNIX domain sockets:
-
-```php
-$client = new Predis\Client('tcp://127.0.0.1', [
-    'connections' => [
-        'tcp'  => 'Predis\Connection\PhpiredisStreamConnection',  // PHP stream resources
-        'unix' => 'Predis\Connection\PhpiredisSocketConnection',  // ext-socket resources
-    ],
-]);
-```
-
-The client can also be configured to rely on a [phpiredis](https://github.com/nrk/phpiredis)-backend
-by specifying a descriptive string for the `connections` client option. Supported string values are:
-
-- `phpiredis-stream` maps `tcp`, `redis` and `unix` to `Predis\Connection\PhpiredisStreamConnection`
-- `phpiredis-socket` maps `tcp`, `redis` and `unix` to `Predis\Connection\PhpiredisSocketConnection`
-- `phpiredis` is simply an alias of `phpiredis-stream`
-
-```php
-$client = new Predis\Client('tcp://127.0.0.1', ['connections' => 'phpiredis']);
-```
-
-Developers can create their own connection classes to support whole new network backends, extend
-existing classes or provide completely different implementations. Connection classes must implement
-`Predis\Connection\NodeConnectionInterface` or extend `Predis\Connection\AbstractConnection`:
-
-```php
-class MyConnectionClass implements Predis\Connection\NodeConnectionInterface
-{
-    // Implementation goes here...
-}
-
-// Use MyConnectionClass to handle connections for the `tcp` scheme:
-$client = new Predis\Client('tcp://127.0.0.1', [
-    'connections' => ['tcp' => 'MyConnectionClass'],
-]);
-```
-
-For a more in-depth insight on how to create new connection backends you can refer to the actual
-implementation of the standard connection classes available in the `Predis\Connection` namespace.
-
-
 ## Development ##
 
 
@@ -457,14 +290,18 @@ stay consistent while working on the project.
 __ATTENTION__: Do not ever run the test suite shipped with Predis against instances of Redis running
 in production environments or containing data you are interested in!
 
-Predis has a comprehensive test suite covering every aspect of the library and that can optionally
-perform integration tests against a running instance of Redis (required >= 2.4.0 in order to verify
-the correct behavior of the implementation of each command. Integration tests for unsupported Redis
-commands are automatically skipped. If you do not have Redis up and running, integration tests can
-be disabled. See [the tests README](tests/README.md) for more details about testing this library.
+Predis has a comprehensive test suite covering every aspect of the library. This test suite performs
+integration tests against a running instance of Redis (>= 2.4.0 is required) to verify the correct
+behaviour of the implementation of each command and automatically skips commands not defined in the
+specified Redis profile. If you do not have Redis up and running, integration tests can be disabled.
+By default the test suite is configured to execute integration tests using the profile for Redis 2.6
+but can optionally target a Redis instance built from `2.8` or `unstable` branches by modifying the
+`phpunit.xml` file and setting `REDIS_SERVER_VERSION` respectively to `2.8` or `dev` so that the
+correct server profile will be used. You can refer to [the tests README](tests/README.md) for more
+detailed information about testing Predis.
 
-Predis uses GitHub Actions for continuous integration and the history for past and current builds can be
-found [on its actions page](https://github.com/predis/predis/actions).
+Predis uses Travis CI for continuous integration and the history for past and current builds can be
+found [on its project page](http://travis-ci.org/nrk/predis).
 
 
 ## Other ##
@@ -472,27 +309,17 @@ found [on its actions page](https://github.com/predis/predis/actions).
 
 ### Project related links ###
 
-- [Source code](https://github.com/predis/predis)
-- [Wiki](https://github.com/predis/predis/wiki)
-- [Issue tracker](https://github.com/predis/predis/issues)
+- [Source code](https://github.com/nrk/predis)
+- [Wiki](https://wiki.github.com/nrk/predis)
+- [Issue tracker](https://github.com/nrk/predis/issues)
+- [PEAR channel](http://pear.nrk.io)
 
 
 ### Author ###
 
 - [Daniele Alessandri](mailto:suppakilla@gmail.com) ([twitter](http://twitter.com/JoL1hAHN))
-- [Till Krüss](https://till.im) ([Twitter](http://twitter.com/tillkruss))
 
 
 ### 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/predis/predis.svg?style=flat-square
-[ico-version-stable]: https://img.shields.io/packagist/v/predis/predis.svg?style=flat-square
-[ico-version-dev]: https://img.shields.io/packagist/vpre/predis/predis.svg?style=flat-square
-[ico-downloads-monthly]: https://img.shields.io/packagist/dm/predis/predis.svg?style=flat-square
-[ico-build]: https://img.shields.io/github/actions/workflow/status/predis/predis/tests.yml?branch=main&style=flat-square
-
-[link-packagist]: https://packagist.org/packages/predis/predis
-[link-actions]: https://github.com/predis/predis/actions
-[link-downloads]: https://packagist.org/packages/predis/predis/stats

VERSION

@@ -1 +1 @@
-2.0.4-dev
+0.8.5

autoload.php

@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/src/Autoloader.php';
+require __DIR__.'/lib/Predis/Autoloader.php';
 
 Predis\Autoloader::register();

bin/create-command-test

@@ -15,9 +15,9 @@
 // of a test case to test a Redis command by specifying the name of the class
 // in the Predis\Command namespace (only classes in this namespace are valid).
 // For example, to generate a test case for SET (which is represented by the
-// Predis\Command\Redis\StringSet class):
+// Predis\Command\StringSet class):
 //
-//   $ ./bin/generate-command-test --class=StringSet
+//   $ ./bin/generate-command-test.php --class=StringSet
 //
 // Here is a list of optional arguments:
 //
@@ -40,16 +40,11 @@ class CommandTestCaseGenerator
 {
     private $options;
 
-    public function __construct(array $options)
+    public function __construct(Array $options)
     {
         if (!isset($options['class'])) {
             throw new RuntimeException("Missing 'class' option.");
         }
-
-        if (!isset($options['realm'])) {
-            throw new RuntimeException("Missing 'realm' option.");
-        }
-
         $this->options = $options;
     }
 
@@ -66,7 +61,7 @@ class CommandTestCaseGenerator
 
         $options = array(
             'overwrite' => false,
-            'tests' => __DIR__.'/../tests/Predis',
+            'tests' => __DIR__.'/../tests',
         );
 
         foreach ($getops as $option => $value) {
@@ -97,20 +92,16 @@ class CommandTestCaseGenerator
             throw new RuntimeException("Missing 'class' option.");
         }
 
-        if (!isset($options['realm'])) {
-            throw new RuntimeException("Missing 'realm' option.");
-        }
+        $options['fqn'] = "Predis\\Command\\{$options['class']}";
+        $options['path'] = "Predis/Command/{$options['class']}.php";
 
-        $options['fqn'] = "Predis\\Command\\Redis\\{$options['class']}";
-        $options['path'] = "Command/Redis/{$options['class']}.php";
-
-        $source = __DIR__.'/../src/'.$options['path'];
+        $source = __DIR__.'/../lib/'.$options['path'];
         if (!file_exists($source)) {
             throw new RuntimeException("Cannot find class file for {$options['fqn']} in $source.");
         }
 
         if (!isset($options['output'])) {
-            $options['output'] = sprintf("%s/%s", $options['tests'], str_replace('.php', '_Test.php', $options['path']));
+            $options['output'] = sprintf("%s/%s", $options['tests'], str_replace('.php', 'Test.php', $options['path']));
         }
 
         return new self($options);
@@ -118,11 +109,18 @@ class CommandTestCaseGenerator
 
     protected function getTestRealm()
     {
-        if (empty($this->options['realm'])) {
-            throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
+        if (isset($this->options['realm'])) {
+            if (!$this->options['realm']) {
+                throw new RuntimeException('Invalid value for realm has been sepcified (empty).');
+            }
+            return $this->options['realm'];
         }
 
-        return $this->options['realm'];
+        $fqnParts = explode('\\', $this->options['fqn']);
+        $class = array_pop($fqnParts);
+        list($realm,) = preg_split('/([[:upper:]][[:lower:]]+)/', $class, 2, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+        return strtolower($realm);
     }
 
     public function generate()
@@ -132,16 +130,11 @@ class CommandTestCaseGenerator
         if (!$reflection->isInstantiable()) {
             throw new RuntimeException("Class $class must be instantiable, abstract classes or interfaces are not allowed.");
         }
-
         if (!$reflection->implementsInterface('Predis\Command\CommandInterface')) {
             throw new RuntimeException("Class $class must implement Predis\Command\CommandInterface.");
         }
 
-        /*
-         * @var CommandInterface
-         */
         $instance = $reflection->newInstance();
-
         $buffer = $this->getTestCaseBuffer($instance);
 
         return $buffer;
@@ -176,7 +169,7 @@ class CommandTestCaseGenerator
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
+namespace Predis\Command;
 
 /**
  * @group commands
@@ -187,7 +180,7 @@ class $class extends PredisCommandTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getExpectedCommand(): string
+    protected function getExpectedCommand()
     {
         return '$fqn';
     }
@@ -195,7 +188,7 @@ class $class extends PredisCommandTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getExpectedId(): string
+    protected function getExpectedId()
     {
         return '$id';
     }
@@ -203,7 +196,7 @@ class $class extends PredisCommandTestCase
     /**
      * @group disconnected
      */
-    public function testFilterArguments(): void
+    public function testFilterArguments()
     {
         \$this->markTestIncomplete('This test has not been implemented yet.');
 
@@ -219,7 +212,7 @@ class $class extends PredisCommandTestCase
     /**
      * @group disconnected
      */
-    public function testParseResponse(): void
+    public function testParseResponse()
     {
         \$this->markTestIncomplete('This test has not been implemented yet.');
 
@@ -239,7 +232,7 @@ PHP;
     /**
      * @group disconnected
      */
-    public function testPrefixKeys(): void
+    public function testPrefixKeys()
     {
         \$this->markTestIncomplete('This test has not been implemented yet.');
 
@@ -255,7 +248,7 @@ PHP;
     /**
      * @group disconnected
      */
-    public function testPrefixKeysIgnoredOnEmptyArguments(): void
+    public function testPrefixKeysIgnoredOnEmptyArguments()
     {
         \$command = \$this->getCommand();
         \$command->prefixKeys('prefix:');

bin/create-pear

@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?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.
+ */
+
+// -------------------------------------------------------------------------- //
+// In order to be able to execute this script to create a PEAR package of Predis
+// both `onion` and `pear` must be available and executable in your $PATH.
+// -------------------------------------------------------------------------- //
+
+function executeWithBackup($file, $callback)
+{
+    $exception = null;
+    $backup = "$file.backup";
+
+    copy($file, $backup);
+
+    try {
+        call_user_func($callback, $file);
+    } catch (Exception $exception) {
+        // NOOP
+    }
+
+    unlink($file);
+    rename($backup, $file);
+
+    if ($exception) {
+        throw $exception;
+    }
+}
+
+function buildPackage()
+{
+    passthru('onion build && pear -q package && rm package.xml');
+}
+
+executeWithBackup(__DIR__.'/../phpunit.xml.dist', function ($file) {
+    $cfg = new SimpleXMLElement($file, null, true);
+
+    $cfg[0]['bootstrap'] = str_replace('tests/', '', $cfg[0]['bootstrap']);
+    $cfg->testsuites->testsuite->directory = str_replace('tests/', '', $cfg->testsuites->testsuite->directory);
+
+    $cfg->saveXml($file);
+
+    buildPackage();
+});

bin/create-phar

@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?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.
+ */
+
+// -------------------------------------------------------------------------- //
+// In order to be able to execute this script to create a Phar archive of Predis,
+// the Phar module must be loaded and the "phar.readonly" directive php.ini must
+// be set to "off". You can change the values in the $options array to customize
+// the creation of the Phar archive to better suit your needs.
+// -------------------------------------------------------------------------- //
+
+$options = array(
+    'name'           => 'predis',
+    'project_path'   => __DIR__ . '/../lib/',
+    'compression'    => Phar::NONE,
+    'append_version' => true,
+);
+
+function getPharFilename($options)
+{
+    $filename = $options['name'];
+
+    // NOTE: do not consider "append_version" with Phar compression do to a bug in
+    // Phar::compress() when renaming phar archives containing dots in their name.
+    if ($options['append_version'] && $options['compression'] === Phar::NONE) {
+        $versionFile = @fopen(__DIR__ . '/../VERSION', 'r');
+
+        if ($versionFile === false) {
+            throw new Exception("Could not locate the VERSION file.");
+        }
+
+        $version = trim(fgets($versionFile));
+        fclose($versionFile);
+        $filename .= "_$version";
+    }
+
+    return "$filename.phar";
+}
+
+function getPharStub($options)
+{
+    return <<<EOSTUB
+<?php
+Phar::mapPhar('predis.phar');
+spl_autoload_register(function (\$class) {
+    if (strpos(\$class, 'Predis\\\\') === 0) {
+        \$file = 'phar://predis.phar/'.strtr(\$class, '\\\', '/').'.php';
+        if (file_exists(\$file)) {
+            require \$file;
+            return true;
+        }
+    }
+});
+__HALT_COMPILER();
+EOSTUB;
+}
+
+// -------------------------------------------------------------------------- //
+
+$phar = new Phar(getPharFilename($options));
+$phar->compress($options['compression']);
+$phar->setStub(getPharStub($options));
+$phar->buildFromDirectory($options['project_path']);

bin/create-single-file

@@ -0,0 +1,663 @@
+#!/usr/bin/env php
+<?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.
+ */
+
+// -------------------------------------------------------------------------- //
+// This script can be used to automatically glue all the .php files of Predis
+// into a single monolithic script file that can be used without an autoloader,
+// just like the other previous versions of the library.
+//
+// Much of its complexity is due to the fact that we cannot simply join PHP
+// 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.
+// -------------------------------------------------------------------------- //
+
+class CommandLine
+{
+    public static function getOptions()
+    {
+        $parameters = array(
+            's:'  => 'source:',
+            'o:'  => 'output:',
+            'e:'  => 'exclude:',
+            'E:'  => 'exclude-classes:',
+        );
+
+        $getops = getopt(implode(array_keys($parameters)), $parameters);
+
+        $options = array(
+            'source'  => __DIR__ . "/../lib/",
+            'output'  => PredisFile::NS_ROOT . '.php',
+            'exclude' => array(),
+        );
+
+        foreach ($getops as $option => $value) {
+            switch ($option) {
+                case 's':
+                case 'source':
+                    $options['source'] = $value;
+                    break;
+
+                case 'o':
+                case 'output':
+                    $options['output'] = $value;
+                    break;
+
+                case 'E':
+                case 'exclude-classes':
+                    $options['exclude'] = @file($value, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: $value;
+                    break;
+
+                case 'e':
+                case 'exclude':
+                    $options['exclude'] = is_array($value) ? $value : array($value);
+                    break;
+            }
+        }
+
+        return $options;
+    }
+}
+
+class PredisFile
+{
+    const NS_ROOT = 'Predis';
+
+    private $namespaces;
+
+    public function __construct()
+    {
+        $this->namespaces = array();
+    }
+
+    public static function from($libraryPath, Array $exclude = array())
+    {
+        $nsroot = self::NS_ROOT;
+        $predisFile = new PredisFile();
+        $libIterator = new RecursiveDirectoryIterator("$libraryPath$nsroot");
+
+        foreach (new RecursiveIteratorIterator($libIterator) as $classFile)
+        {
+            if (!$classFile->isFile()) {
+                continue;
+            }
+
+            $namespace = strtr(str_replace($libraryPath, '', $classFile->getPath()), '/', '\\');
+
+            if (in_array(sprintf('%s\\%s', $namespace, $classFile->getBasename('.php')), $exclude)) {
+                continue;
+            }
+
+            $phpNamespace = $predisFile->getNamespace($namespace);
+
+            if ($phpNamespace === false) {
+                $phpNamespace = new PhpNamespace($namespace);
+                $predisFile->addNamespace($phpNamespace);
+            }
+
+            $phpClass = new PhpClass($phpNamespace, $classFile);
+        }
+
+        return $predisFile;
+    }
+
+    public function addNamespace(PhpNamespace $namespace)
+    {
+        if (isset($this->namespaces[(string)$namespace])) {
+            throw new InvalidArgumentException("Duplicated namespace");
+        }
+        $this->namespaces[(string)$namespace] = $namespace;
+    }
+
+    public function getNamespaces()
+    {
+        return $this->namespaces;
+    }
+
+    public function getNamespace($namespace)
+    {
+        if (!isset($this->namespaces[$namespace])) {
+            return false;
+        }
+
+        return $this->namespaces[$namespace];
+    }
+
+    public function getClassByFQN($classFqn)
+    {
+        if (($nsLastPos = strrpos($classFqn, '\\')) !== false) {
+            $namespace = $this->getNamespace(substr($classFqn, 0, $nsLastPos));
+            if ($namespace === false) {
+                return null;
+            }
+            $className = substr($classFqn, $nsLastPos + 1);
+
+            return $namespace->getClass($className);
+        }
+
+        return null;
+    }
+
+    private function calculateDependencyScores(&$classes, $fqn)
+    {
+        if (!isset($classes[$fqn])) {
+            $classes[$fqn] = 0;
+        }
+
+        $classes[$fqn] += 1;
+
+        if (($phpClass = $this->getClassByFQN($fqn)) === null) {
+            throw new RuntimeException(
+                "Cannot found the class $fqn which is required by other subclasses. Are you missing a file?"
+            );
+        }
+
+        foreach ($phpClass->getDependencies() as $fqn) {
+            $this->calculateDependencyScores($classes, $fqn);
+        }
+    }
+
+    private function getDependencyScores()
+    {
+        $classes = array();
+
+        foreach ($this->getNamespaces() as $phpNamespace) {
+            foreach ($phpNamespace->getClasses() as $phpClass) {
+                $this->calculateDependencyScores($classes, $phpClass->getFQN());
+            }
+        }
+
+        return $classes;
+    }
+
+    private function getOrderedNamespaces($dependencyScores)
+    {
+        $namespaces = array_fill_keys(array_unique(
+            array_map(
+                function ($fqn) { return PhpNamespace::extractName($fqn); },
+                array_keys($dependencyScores)
+            )
+        ), 0);
+
+        foreach ($dependencyScores as $classFqn => $score) {
+            $namespaces[PhpNamespace::extractName($classFqn)] += $score;
+        }
+
+        arsort($namespaces);
+
+        return array_keys($namespaces);
+    }
+
+    private function getOrderedClasses(PhpNamespace $phpNamespace, $classes)
+    {
+        $nsClassesFQNs = array_map(function ($cl) { return $cl->getFQN(); }, $phpNamespace->getClasses());
+        $nsOrderedClasses = array();
+
+        foreach ($nsClassesFQNs as $nsClassFQN) {
+            $nsOrderedClasses[$nsClassFQN] = $classes[$nsClassFQN];
+        }
+
+        arsort($nsOrderedClasses);
+
+        return array_keys($nsOrderedClasses);
+    }
+
+    public function getPhpCode()
+    {
+        $buffer = array("<?php\n\n", PhpClass::LICENSE_HEADER, "\n\n");
+        $classes = $this->getDependencyScores();
+        $namespaces = $this->getOrderedNamespaces($classes);
+
+        foreach ($namespaces as $namespace) {
+            $phpNamespace = $this->getNamespace($namespace);
+
+            // generate namespace directive
+            $buffer[] = $phpNamespace->getPhpCode();
+            $buffer[] = "\n";
+
+            // generate use directives
+            $useDirectives = $phpNamespace->getUseDirectives();
+            if (count($useDirectives) > 0) {
+                $buffer[] = $useDirectives->getPhpCode();
+                $buffer[] = "\n";
+            }
+
+            // generate classes bodies
+            $nsClasses = $this->getOrderedClasses($phpNamespace, $classes);
+            foreach ($nsClasses as $classFQN) {
+                $buffer[] = $this->getClassByFQN($classFQN)->getPhpCode();
+                $buffer[] = "\n\n";
+            }
+
+            $buffer[] = "/* " . str_repeat("-", 75) . " */";
+            $buffer[] = "\n\n";
+        }
+
+        return implode($buffer);
+    }
+
+    public function saveTo($outputFile)
+    {
+        // TODO: add more sanity checks
+        if ($outputFile === null || $outputFile === '') {
+            throw new InvalidArgumentException('You must specify a valid output file');
+        }
+        file_put_contents($outputFile, $this->getPhpCode());
+    }
+}
+
+class PhpNamespace implements IteratorAggregate
+{
+    private $namespace;
+    private $classes;
+
+    public function __construct($namespace)
+    {
+        $this->namespace = $namespace;
+        $this->classes = array();
+        $this->useDirectives = new PhpUseDirectives($this);
+    }
+
+    public static function extractName($fqn)
+    {
+        $nsSepLast = strrpos($fqn, '\\');
+        if ($nsSepLast === false) {
+            return $fqn;
+        }
+        $ns = substr($fqn, 0, $nsSepLast);
+
+        return $ns !== '' ? $ns : null;
+    }
+
+    public function addClass(PhpClass $class)
+    {
+        $this->classes[$class->getName()] = $class;
+    }
+
+    public function getClass($className)
+    {
+        if (isset($this->classes[$className])) {
+            return $this->classes[$className];
+        }
+    }
+
+    public function getClasses()
+    {
+        return array_values($this->classes);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->getClasses());
+    }
+
+    public function getUseDirectives()
+    {
+        return $this->useDirectives;
+    }
+
+    public function getPhpCode()
+    {
+        return "namespace $this->namespace;\n";
+    }
+
+    public function __toString()
+    {
+        return $this->namespace;
+    }
+}
+
+class PhpUseDirectives implements Countable, IteratorAggregate
+{
+    private $use;
+    private $aliases;
+    private $reverseAliases;
+    private $namespace;
+
+    public function __construct(PhpNamespace $namespace)
+    {
+        $this->namespace = $namespace;
+        $this->use = array();
+        $this->aliases = array();
+        $this->reverseAliases = array();
+    }
+
+    public function add($use, $as = null)
+    {
+        if (in_array($use, $this->use)) {
+            return;
+        }
+
+        $rename = null;
+        $this->use[] = $use;
+        $aliasedClassName = $as ?: PhpClass::extractName($use);
+
+        if (isset($this->aliases[$aliasedClassName])) {
+            $parentNs = $this->getParentNamespace();
+
+            if ($parentNs && false !== $pos = strrpos($parentNs, '\\')) {
+                $parentNs = substr($parentNs, $pos);
+            }
+
+            $newAlias = "{$parentNs}_{$aliasedClassName}";
+            $rename = (object) array(
+                'namespace' => $this->namespace,
+                'from' => $aliasedClassName,
+                'to' => $newAlias,
+            );
+
+            $this->aliases[$newAlias] = $use;
+            $as = $newAlias;
+        } else {
+            $this->aliases[$aliasedClassName] = $use;
+        }
+
+        if ($as !== null) {
+            $this->reverseAliases[$use] = $as;
+        }
+
+        return $rename;
+    }
+
+    public function getList()
+    {
+        return $this->use;
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->getList());
+    }
+
+    public function getPhpCode()
+    {
+        $reverseAliases = $this->reverseAliases;
+
+        $reducer = function ($str, $use) use ($reverseAliases) {
+            if (isset($reverseAliases[$use])) {
+                return $str .= "use $use as {$reverseAliases[$use]};\n";
+            } else {
+                return $str .= "use $use;\n";
+            }
+        };
+
+        return array_reduce($this->getList(), $reducer, '');
+    }
+
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    public function getParentNamespace()
+    {
+        if (false !== $pos = strrpos($this->namespace, '\\')) {
+            return substr($this->namespace, 0, $pos);
+        }
+
+        return '';
+    }
+
+    public function getFQN($className)
+    {
+        if (($nsSepFirst = strpos($className, '\\')) === false) {
+            if (isset($this->aliases[$className])) {
+                return $this->aliases[$className];
+            }
+
+            return (string)$this->getNamespace() . "\\$className";
+        }
+
+        if ($nsSepFirst != 0) {
+            throw new InvalidArgumentException("Partially qualified names are not supported");
+        }
+
+        return $className;
+    }
+
+    public function count()
+    {
+        return count($this->use);
+    }
+}
+
+class PhpClass
+{
+    const LICENSE_HEADER = <<<LICENSE
+/*
+ * 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.
+ */
+LICENSE;
+
+    private $namespace;
+    private $file;
+    private $body;
+    private $implements;
+    private $extends;
+    private $name;
+
+    public function __construct(PhpNamespace $namespace, SplFileInfo $classFile)
+    {
+        $this->namespace = $namespace;
+        $this->file = $classFile;
+        $this->implements = array();
+        $this->extends = array();
+
+        $this->extractData();
+        $namespace->addClass($this);
+    }
+
+    public static function extractName($fqn)
+    {
+        $nsSepLast = strrpos($fqn, '\\');
+        if ($nsSepLast === false) {
+            return $fqn;
+        }
+
+        return substr($fqn, $nsSepLast + 1);
+    }
+
+    private function extractData()
+    {
+        $renames = array();
+        $useDirectives = $this->getNamespace()->getUseDirectives();
+
+        $useExtractor = function ($m) use ($useDirectives, &$renames) {
+            array_shift($m);
+
+            if (isset($m[1])) {
+                $m[1] = str_replace(" as ", '', $m[1]);
+            }
+
+            if ($rename = call_user_func_array(array($useDirectives, 'add'), $m)) {
+                $renames[] = $rename;
+            }
+        };
+
+        $classBuffer = stream_get_contents(fopen($this->getFile()->getPathname(), 'r'));
+
+        $classBuffer = str_replace(self::LICENSE_HEADER, '', $classBuffer);
+
+        $classBuffer = preg_replace('/<\?php\s?\\n\s?/', '', $classBuffer);
+        $classBuffer = preg_replace('/\s?\?>\n?/ms', '', $classBuffer);
+        $classBuffer = preg_replace('/namespace\s+[\w\d_\\\\]+;\s?/', '', $classBuffer);
+        $classBuffer = preg_replace_callback('/use\s+([\w\d_\\\\]+)(\s+as\s+.*)?;\s?\n?/', $useExtractor, $classBuffer);
+
+        foreach ($renames as $rename) {
+            $classBuffer = str_replace($rename->from, $rename->to, $classBuffer);
+        }
+
+        $this->body = trim($classBuffer);
+
+        $this->extractHierarchy();
+    }
+
+    private function extractHierarchy()
+    {
+        $implements = array();
+        $extends =  array();
+
+        $extractor = function ($iterator, $callback) {
+            $className = '';
+            $iterator->seek($iterator->key() + 1);
+
+            while ($iterator->valid()) {
+                $token = $iterator->current();
+
+                if (is_string($token)) {
+                    if (preg_match('/\s?,\s?/', $token)) {
+                        $callback(trim($className));
+                        $className = '';
+                    } else if ($token == '{') {
+                        $callback(trim($className));
+                        return;
+                    }
+                }
+
+                switch ($token[0]) {
+                    case T_NS_SEPARATOR:
+                        $className .= '\\';
+                        break;
+
+                    case T_STRING:
+                        $className .= $token[1];
+                        break;
+
+                    case T_IMPLEMENTS:
+                    case T_EXTENDS:
+                        $callback(trim($className));
+                        $iterator->seek($iterator->key() - 1);
+                        return;
+                }
+
+                $iterator->next();
+            }
+        };
+
+        $tokens = token_get_all("<?php\n" . trim($this->getPhpCode()));
+        $iterator = new ArrayIterator($tokens);
+
+        while ($iterator->valid()) {
+            $token = $iterator->current();
+            if (is_string($token)) {
+                $iterator->next();
+                continue;
+            }
+
+            switch ($token[0]) {
+                case T_CLASS:
+                case T_INTERFACE:
+                    $iterator->seek($iterator->key() + 2);
+                    $tk = $iterator->current();
+                    $this->name = $tk[1];
+                    break;
+
+                case T_IMPLEMENTS:
+                    $extractor($iterator, function ($fqn) use (&$implements) {
+                        $implements[] = $fqn;
+                    });
+                    break;
+
+                case T_EXTENDS:
+                    $extractor($iterator, function ($fqn) use (&$extends) {
+                        $extends[] = $fqn;
+                    });
+                    break;
+            }
+
+            $iterator->next();
+        }
+
+        $this->implements = $this->guessFQN($implements);
+        $this->extends = $this->guessFQN($extends);
+    }
+
+    public function guessFQN($classes)
+    {
+        $useDirectives = $this->getNamespace()->getUseDirectives();
+        return array_map(array($useDirectives, 'getFQN'), $classes);
+    }
+
+    public function getImplementedInterfaces($all = false)
+    {
+        if ($all) {
+            return $this->implements;
+        }
+
+        return array_filter(
+            $this->implements,
+            function ($cn) { return strpos($cn, 'Predis\\') === 0; }
+        );
+    }
+
+    public function getExtendedClasses($all = false)
+    {
+        if ($all) {
+            return $this->extemds;
+        }
+
+        return array_filter(
+            $this->extends,
+            function ($cn) { return strpos($cn, 'Predis\\') === 0; }
+        );
+    }
+
+    public function getDependencies($all = false)
+    {
+        return array_merge(
+            $this->getImplementedInterfaces($all),
+            $this->getExtendedClasses($all)
+        );
+    }
+
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getFQN()
+    {
+        return (string)$this->getNamespace() . '\\' . $this->name;
+    }
+
+    public function getPhpCode()
+    {
+        return $this->body;
+    }
+
+    public function __toString()
+    {
+        return "class " . $this->getName() . '{ ... }';
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+$options = CommandLine::getOptions();
+$predisFile = PredisFile::from($options['source'], $options['exclude']);
+$predisFile->saveTo($options['output']);

composer.json

@@ -1,50 +1,25 @@
 {
     "name": "predis/predis",
     "type": "library",
-    "description": "A flexible and feature-complete Redis client for PHP.",
+    "description": "Flexible and feature-complete PHP client library for Redis",
     "keywords": ["nosql", "redis", "predis"],
-    "homepage": "http://github.com/predis/predis",
+    "homepage": "http://github.com/nrk/predis",
     "license": "MIT",
-    "support": {
-        "issues": "https://github.com/predis/predis/issues"
-    },
     "authors": [
         {
             "name": "Daniele Alessandri",
             "email": "suppakilla@gmail.com",
-            "homepage": "http://clorophilla.net",
-            "role": "Creator & Maintainer"
-        },
-        {
-            "name": "Till Krüss",
-            "homepage": "https://till.im",
-            "role": "Maintainer"
-        }
-    ],
-    "funding": [
-        {
-            "type": "github",
-            "url": "https://github.com/sponsors/tillkruss"
+            "homepage": "http://clorophilla.net"
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^8.0 || ~9.4.4"
+        "php": ">=5.3.2"
     },
     "suggest": {
         "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol",
         "ext-curl": "Allows access to Webdis when paired with phpiredis"
     },
     "autoload": {
-        "psr-4": {
-            "Predis\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.0-dev"
-        }
+        "psr-0": {"Predis": "lib/"}
     }
 }

examples/CustomDistributionStrategy.php

@@ -0,0 +1,89 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// Developers can customize the distribution strategy used by the client
+// to distribute keys among a cluster of servers simply by creating a class
+// that implements Predis\Distribution\DistributionStrategyInterface.
+
+use Predis\Connection\PredisCluster;
+use Predis\Cluster\Distribution\DistributionStrategyInterface;
+use Predis\Cluster\Hash\HashGeneratorInterface;
+
+class NaiveDistributionStrategy implements DistributionStrategyInterface, HashGeneratorInterface
+{
+    private $nodes;
+    private $nodesCount;
+
+    public function __construct()
+    {
+        $this->nodes = array();
+        $this->nodesCount = 0;
+    }
+
+    public function add($node, $weight = null)
+    {
+        $this->nodes[] = $node;
+        $this->nodesCount++;
+    }
+
+    public function remove($node)
+    {
+        $this->nodes = array_filter($this->nodes, function ($n) use ($node) {
+            return $n !== $node;
+        });
+
+        $this->nodesCount = count($this->nodes);
+    }
+
+    public function get($key)
+    {
+        if (0 === $count = $this->nodesCount) {
+            throw new RuntimeException('No connections');
+        }
+
+        return $this->nodes[$count > 1 ? abs($key % $count) : 0];
+    }
+
+    public function hash($value)
+    {
+        return crc32($value);
+    }
+
+    public function getHashGenerator()
+    {
+        return $this;
+    }
+}
+
+$options = array(
+    'cluster' => function () {
+        $distributor = new NaiveDistributionStrategy();
+        $cluster = new PredisCluster($distributor);
+
+        return $cluster;
+    },
+);
+
+$client = new Predis\Client($multiple_servers, $options);
+
+for ($i = 0; $i < 100; $i++) {
+    $client->set("key:$i", str_pad($i, 4, '0', 0));
+    $client->get("key:$i");
+}
+
+$server1 = $client->getClientFor('first')->info();
+$server2 = $client->getClientFor('second')->info();
+
+printf("Server '%s' has %d keys while server '%s' has %d keys.\n",
+    'first', $server1['db15']['keys'], 'second', $server2['db15']['keys']
+);

examples/DispatcherLoop.php

@@ -9,29 +9,28 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
-// This is a basic example on how to use the Predis\DispatcherLoop class.
-//
-// To see this example in action you can just use redis-cli and publish some
-// messages to the 'events' and 'control' channel, e.g.:
+/*
+This is a basic example on how to use the Predis\DispatcherLoop class.
 
-// ./redis-cli
-// PUBLISH events first
-// PUBLISH events second
-// PUBLISH events third
-// PUBLISH control terminate_dispatcher
+To see this example in action you can just use redis-cli and publish some
+messages to the 'events' and 'control' channel, e.g.:
+
+./redis-cli
+PUBLISH events first
+PUBLISH events second
+PUBLISH events third
+PUBLISH control terminate_dispatcher
+*/
 
 // Create a client and disable r/w timeout on the socket
 $client = new Predis\Client($single_server + array('read_write_timeout' => 0));
 
-// Return an initialized PubSub consumer instance from the client.
-$pubsub = $client->pubSubLoop();
+// Create a Predis\DispatcherLoop instance and attach a bunch of callbacks.
+$dispatcher = new Predis\PubSub\DispatcherLoop($client);
 
-// Create a dispatcher loop instance and attach a bunch of callbacks.
-$dispatcher = new Predis\PubSub\DispatcherLoop($pubsub);
-
-// Demonstrate how to use a callable class as a callback for the dispatcher loop.
+// Demonstrate how to use a callable class as a callback for Predis\DispatcherLoop.
 class EventsListener implements Countable
 {
     private $events;
@@ -51,7 +50,7 @@ class EventsListener implements Countable
         return $this->events;
     }
 
-    public function __invoke($payload, $dispatcher)
+    public function __invoke($payload)
     {
         $this->events[] = $payload;
     }
@@ -61,7 +60,7 @@ class EventsListener implements Countable
 $dispatcher->attachCallback('events', ($events = new EventsListener()));
 
 // Attach a function to control the dispatcher loop termination with a message.
-$dispatcher->attachCallback('control', function ($payload, $dispatcher) {
+$dispatcher->attachCallback('control', function ($payload) use ($dispatcher) {
     if ($payload === 'terminate_dispatcher') {
         $dispatcher->stop();
     }
@@ -72,8 +71,8 @@ $dispatcher->attachCallback('control', function ($payload, $dispatcher) {
 $dispatcher->run();
 
 // Display our achievements!
-echo "We received {$events->count()} messages!", PHP_EOL;
+echo "We received {$events->count()} messages!\n";
 
 // Say goodbye :-)
-$version = redis_version($client->info());
-echo "Goodbye from Redis $version!", PHP_EOL;
+$info = $client->info();
+print_r("Goodbye from Redis v{$info['redis_version']}!\n");

examples/KeyPrefixes.php

@@ -0,0 +1,37 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// Predis ships with a KeyPrefixProcessor class that is used to transparently
+// prefix each key before sending commands to Redis, even for complex commands
+// such as SORT, ZUNIONSTORE and ZINTERSTORE. Key prefixes are useful to create
+// user-level namespaces for you keyspace, thus eliminating the need for separate
+// logical databases.
+
+$client = new Predis\Client($single_server, array('prefix' => 'nrk:'));
+
+$client->mset(array('foo' => 'bar', 'lol' => 'wut'));
+var_dump($client->mget('foo', 'lol'));
+/*
+array(2) {
+  [0]=> string(3) "bar"
+  [1]=> string(3) "wut"
+}
+*/
+
+var_dump($client->keys('*'));
+/*
+array(2) {
+  [0]=> string(7) "nrk:foo"
+  [1]=> string(7) "nrk:lol"
+}
+*/

examples/MasterSlaveReplication.php

@@ -0,0 +1,52 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// Predis supports master / slave replication scenarios where write operations are
+// performed on the master server and read operations are executed against one of
+// the slaves. The behaviour of commands or EVAL scripts can be customized at will.
+// As soon as a write operation is performed, all the subsequent requests (reads
+// or writes) will be served by the master server.
+//
+// This example must be executed with the second Redis server acting as the slave
+// of the first one using the SLAVEOF command.
+//
+
+$parameters = array(
+    'tcp://127.0.0.1:6379?database=15&alias=master',
+    'tcp://127.0.0.1:6380?database=15&alias=slave',
+);
+
+$options = array('replication' => true);
+
+$client = new Predis\Client($parameters, $options);
+
+// Read operation.
+$exists = $client->exists('foo') ? 'yes' : 'no';
+$current = $client->getConnection()->getCurrent()->getParameters();
+echo "Does 'foo' exist on {$current->alias}? $exists.\n";
+
+// Write operation.
+$client->set('foo', 'bar');
+$current = $client->getConnection()->getCurrent()->getParameters();
+echo "Now 'foo' has been set to 'bar' on {$current->alias}!\n";
+
+// Read operation.
+$bar = $client->get('foo');
+$current = $client->getConnection()->getCurrent()->getParameters();
+echo "We just fetched 'foo' from {$current->alias} and its value is '$bar'.\n";
+
+/* OUTPUT:
+Does 'foo' exist on slave? yes.
+Now 'foo' has been set to 'bar' on master!
+We just fetched 'foo' from master and its value is 'bar'.
+*/

examples/MasterSlaveReplicationComplex.php

@@ -9,37 +9,36 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
-// Predis allows to set Lua scripts as read-only operations for replication.
-// This works for both EVAL and EVALSHA and also for the client-side abstraction
-// built upon them (Predis\Command\ScriptCommand). This example shows a slightly
-// more complex configuration that injects a new script command in the command
-// factory used by the client and marks it as a read-only operation so that it
-// will be executed on slaves.
+// Predis allows to set Lua scripts as read-only operations in the context of
+// replication. This works for both EVAL and EVALSHA and also for the client-side
+// abstraction built upon them (Predis\Command\ScriptedCommand). This example
+// shows a slightly more complex configuration that injects a new scripted command
+// in the server profile used by the new client instance and marks it marks it as
+// a read-only operation for replication so that it will be executed on slaves.
 
-use Predis\Command\ScriptCommand;
-use Predis\Connection\Replication\MasterSlaveReplication;
+use Predis\Command\ScriptedCommand;
+use Predis\Connection\MasterSlaveReplication;
+use Predis\Profile\ServerProfile;
 use Predis\Replication\ReplicationStrategy;
 
 // ------------------------------------------------------------------------- //
 
-// Define a new script command that returns all the fields of a variable number
-// of hashes with a single roundtrip.
+// Define a new scripted command that returns all the fields
+// of a variable number of hashes with a single roundtrip.
 
-class HashMultipleGetAll extends ScriptCommand
-{
-    const BODY = <<<LUA
+class HashMultipleGetAll extends ScriptedCommand {
+    const BODY = <<<EOS
 local hashes = {}
 for _, key in pairs(KEYS) do
     table.insert(hashes, key)
     table.insert(hashes, redis.call('hgetall', key))
 end
 return hashes
-LUA;
+EOS;
 
-    public function getScript()
-    {
+    public function getScript() {
         return self::BODY;
     }
 }
@@ -47,15 +46,18 @@ LUA;
 // ------------------------------------------------------------------------- //
 
 $parameters = array(
-    'tcp://127.0.0.1:6381?role=master&database=15',
-    'tcp://127.0.0.1:6382?role=slave&alias=slave-01&database=15',
+    'tcp://127.0.0.1:6379/?alias=master',
+    'tcp://127.0.0.1:6380/?alias=slave',
 );
 
 $options = array(
-    'commands' => array(
-        'hmgetall' => 'HashMultipleGetAll',
-    ),
-    'replication' => function () {
+    'profile' => function ($options, $option) {
+        $profile = $options->getDefault($option);
+        $profile->defineCommand('hmgetall', 'HashMultipleGetAll');
+
+        return $profile;
+    },
+    'replication' => function ($options) {
         $strategy = new ReplicationStrategy();
         $strategy->setScriptReadOnly(HashMultipleGetAll::BODY);
 
@@ -76,7 +78,7 @@ $client = new Predis\Client($parameters, $options);
 $hashes = $client->hmgetall('metavars', 'servers');
 
 $replication = $client->getConnection();
-$stillOnSlave = $replication->getCurrent() === $replication->getConnectionByAlias('slave-01');
+$stillOnSlave = $replication->getCurrent() === $replication->getConnectionById('slave');
 
-echo 'Is still on slave? ', $stillOnSlave ? 'YES!' : 'NO!', PHP_EOL;
+echo "Is still on slave? ", $stillOnSlave ? 'YES' : 'NO', "!\n";
 var_export($hashes);

examples/MonitorContext.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
-// This is a basic example on how to use the Predis\Monitor\Consumer class. You
-// can use redis-cli to send commands to the same Redis instance your client is
+// This is a basic example on how to use the Predis\MonitorContext class.
+// You can use redis-cli to send commands to the same Redis instance your client is
 // connected to, and then type "ECHO QUIT_MONITOR" in redis-cli when you want to
 // exit the monitor loop and terminate this script in a graceful way.
 
@@ -25,20 +25,20 @@ $timestamp = new DateTime();
 foreach (($monitor = $client->monitor()) as $event) {
     $timestamp->setTimestamp((int) $event->timestamp);
 
-    // If we notice a ECHO command with the message QUIT_MONITOR, we stop the
-    // monitor consumer and then break the loop.
+    // If we notice a ECHO command with the message QUIT_MONITOR, we close the
+    // monitor context and then break the loop.
     if ($event->command === 'ECHO' && $event->arguments === '"QUIT_MONITOR"') {
-        echo 'Exiting the monitor loop...', PHP_EOL;
-        $monitor->stop();
+        echo "Exiting the monitor loop...\n";
+        $monitor->closeContext();
         break;
     }
 
-    echo "* Received {$event->command} on DB {$event->database} at {$timestamp->format(DateTime::W3C)}", PHP_EOL;
+    echo "* Received {$event->command} on DB {$event->database} at {$timestamp->format(DateTime::W3C)}\n";
     if (isset($event->arguments)) {
-        echo "    Arguments: {$event->arguments}", PHP_EOL;
+        echo "    Arguments: {$event->arguments}\n";
     }
 }
 
 // Say goodbye :-)
-$version = redis_version($client->info());
-echo "Goodbye from Redis $version!", PHP_EOL;
+$info = $client->info();
+print_r("Goodbye from Redis v{$info['redis_version']}!\n");

examples/MultiBulkReplyIterators.php

@@ -0,0 +1,56 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// Operations such as LRANGE, ZRANGE and others can potentially generate replies
+// containing a huge number of items. In some corner cases, such replies might
+// end up exhausting the maximum allowed memory allocated for a PHP process.
+// Multibulk iterators can be handy because they allow you to stream multibulk
+// replies using plain old PHP iterators, making it possible to iterate them with
+// a classic `foreach` loop and avoiding to consume an excessive amount of memory.
+//
+// PS: please note that multibulk iterators are supported only by the standard
+// connection backend class (Predis\Connection\StreamConnection) and not the
+// phpiredis-based one (Predis\Connection\PhpiredisConnection).
+
+// Create a client and force the connection to use iterable multibulk responses.
+$client = new Predis\Client($single_server + array('iterable_multibulk' => true));
+
+// Prepare an hash with some fields and their respective values.
+$client->hmset('metavars', array('foo' => 'bar', 'hoge' => 'piyo', 'lol' => 'wut'));
+
+// By default multibulk iterators iterate over the reply as a list of items...
+foreach ($client->hgetall('metavars') as $index => $item) {
+    echo "[$index] $item\n";
+}
+
+/* OUTPUT:
+[0] foo
+[1] bar
+[2] hoge
+[3] piyo
+[4] lol
+[5] wut
+*/
+
+// ... but certain multibulk replies are better represented as lists of tuples.
+foreach ($client->hgetall('metavars')->asTuple() as $index => $kv) {
+    list($key, $value) = $kv;
+
+    echo "[$index] $key => $value\n";
+}
+
+/* OUTPUT:
+[0] foo => bar
+[1] hoge => piyo
+[2] lol => wut
+*/

examples/MultipleSetAndGet.php

@@ -0,0 +1,38 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// redis can set keys and their relative values in one go
+// using MSET, then the same values can be retrieved with
+// a single command using MGET.
+
+$mkv = array(
+    'usr:0001' => 'First user',
+    'usr:0002' => 'Second user',
+    'usr:0003' => 'Third user'
+);
+
+$client = new Predis\Client($single_server);
+
+$client->mset($mkv);
+$retval = $client->mget(array_keys($mkv));
+
+print_r($retval);
+
+/* OUTPUT:
+Array
+(
+    [0] => First user
+    [1] => Second user
+    [2] => Third user
+)
+*/

examples/PipelineContext.php

@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
-// When you have a whole set of consecutive commands to send to a redis server,
-// you can use a pipeline to dramatically improve performances. Pipelines can
-// greatly reduce the effects of network round-trips.
+// When you have a whole set of consecutive commands to send to
+// a redis server, you can use a pipeline to improve performances.
 
 $client = new Predis\Client($single_server);
 
-$responses = $client->pipeline(function ($pipe) {
+$replies = $client->pipeline(function ($pipe) {
+    $pipe->ping();
     $pipe->flushdb();
     $pipe->incrby('counter', 10);
     $pipe->incrby('counter', 30);
@@ -26,20 +26,22 @@ $responses = $client->pipeline(function ($pipe) {
     $pipe->mget('does_not_exist', 'counter');
 });
 
-var_export($responses);
+print_r($replies);
 
 /* OUTPUT:
-array (
-  0 => Predis\Response\Status::__set_state(array(
-    'payload' => 'OK',
-  )),
-  1 => 10,
-  2 => 40,
-  3 => true,
-  4 => '40',
-  5 => array (
-    0 => NULL,
-    1 => '40',
-  ),
+Array
+(
+    [0] => 1
+    [1] => 1
+    [2] => 10
+    [3] => 40
+    [4] => 1
+    [5] => 40
+    [6] => Array
+        (
+            [0] =>
+            [1] => 40
+        )
+
 )
 */

examples/PubSubContext.php

@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
-// Starting from Redis 2.0 clients can subscribe and listen for events published
-// on certain channels using a Publish/Subscribe (PUB/SUB) approach.
+// Redis 2.0 features new commands that allow clients to subscribe for
+// events published on certain channels (PUBSUB).
 
 // Create a client and disable r/w timeout on the socket
 $client = new Predis\Client($single_server + array('read_write_timeout' => 0));
 
-// Initialize a new pubsub consumer.
+// Initialize a new pubsub context
 $pubsub = $client->pubSubLoop();
 
 // Subscribe to your channels
@@ -30,30 +30,30 @@ $pubsub->subscribe('control_channel', 'notifications');
 foreach ($pubsub as $message) {
     switch ($message->kind) {
         case 'subscribe':
-            echo "Subscribed to {$message->channel}", PHP_EOL;
+            echo "Subscribed to {$message->channel}\n";
             break;
 
         case 'message':
             if ($message->channel == 'control_channel') {
                 if ($message->payload == 'quit_loop') {
-                    echo 'Aborting pubsub loop...', PHP_EOL;
+                    echo "Aborting pubsub loop...\n";
                     $pubsub->unsubscribe();
                 } else {
-                    echo "Received an unrecognized command: {$message->payload}.", PHP_EOL;
+                    echo "Received an unrecognized command: {$message->payload}.\n";
                 }
             } else {
-                echo "Received the following message from {$message->channel}:",
-                     PHP_EOL, "  {$message->payload}", PHP_EOL, PHP_EOL;
+                echo "Received the following message from {$message->channel}:\n",
+                     "  {$message->payload}\n\n";
             }
             break;
     }
 }
 
-// Always unset the pubsub consumer instance when you are done! The
+// Always unset the pubsub context instance when you are done! The
 // class destructor will take care of cleanups and prevent protocol
 // desynchronizations between the client and the server.
 unset($pubsub);
 
 // Say goodbye :-)
-$version = redis_version($client->info());
-echo "Goodbye from Redis $version!", PHP_EOL;
+$info = $client->info();
+print_r("Goodbye from Redis v{$info['redis_version']}!\n");

examples/RedisCollectionsIterators.php

@@ -9,31 +9,29 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
 use Predis\Collection\Iterator;
 
-// Starting with Redis 2.8, clients can iterate incrementally over collections
-// without blocking the server like it happens when a command such as KEYS is
-// executed on a Redis instance storing millions of keys. These commands are:
-//
-//   - SCAN (iterates over the keyspace)
-//   - SSCAN (iterates over members of a set)
-//   - ZSCAN (iterates over members and ranks of a sorted set)
-//   - HSCAN (iterates over fields and values of an hash).
-
-// Predis provides a specialized abstraction for each command based on standard
-// SPL iterators making it possible to easily consume SCAN-based iterations in
-// your PHP code.
+// Redis 2.8 features new commands allowing clients to incrementally
+// iterate over collections without blocking the server like it happens
+// when a command such as KEYS is executed on a Redis instance storing
+// millions of keys. These commands are SCAN (iterates over the keyspace),
+// SSCAN (iterates over members of a set), ZSCAN (iterates over members
+// and ranks of a sorted set) and HSCAN (iterates over fields and values
+// of an hash). Predis provides a specialized abstraction for each command
+// based on SPL iterators making it possible to easily consume SCAN-based
+// iterations in your PHP code.
 //
 // See http://redis.io/commands/scan for more details.
 //
 
-$client = new Predis\Client($single_server);
+// Create a client using `2.8` as a server profile (needs Redis 2.8!)
+$client = new Predis\Client($single_server, array('profile' => '2.8'));
 
 // Prepare some keys for our example
 $client->del('predis:set', 'predis:zset', 'predis:hash');
-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");

examples/ServerSideScripting.php

@@ -9,18 +9,18 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
 // This example will not work with versions of Redis < 2.6.
 //
-// Additionally to the EVAL command, the Predis\Command\ScriptCommand class can
-// be used to leverage an higher level abstraction for Lua scripting that makes
-// scripts appear just like any other command on the client-side. This is basic
-// example on how a script-based INCREX command can be defined:
+// Additionally to the EVAL command defined in the current development profile, the new
+// Predis\Command\ScriptedCommand base class can be used to build an higher abstraction
+// for our "scripted" commands so that they will appear just like any other command on
+// the client-side. This is a quick example used to implement INCREX.
 
-use Predis\Command\ScriptCommand;
+use Predis\Command\ScriptedCommand;
 
-class IncrementExistingKeysBy extends ScriptCommand
+class IncrementExistingKeysBy extends ScriptedCommand
 {
     public function getKeysCount()
     {
@@ -31,7 +31,8 @@ class IncrementExistingKeysBy extends ScriptCommand
 
     public function getScript()
     {
-        return <<<LUA
+        return
+<<<LUA
 local cmd, insert = redis.call, table.insert
 local increment, results = ARGV[1], { }
 
@@ -48,11 +49,9 @@ LUA;
     }
 }
 
-$client = new Predis\Client($single_server, array(
-    'commands' => array(
-        'increxby' => 'IncrementExistingKeysBy',
-    ),
-));
+$client = new Predis\Client($single_server);
+
+$client->getProfile()->defineCommand('increxby', 'IncrementExistingKeysBy');
 
 $client->mset('foo', 10, 'foobar', 100);
 

examples/SessionHandler.php

@@ -0,0 +1,39 @@
+<?php
+
+require 'SharedConfigurations.php';
+
+// This example demonstrates how to leverage Predis to save PHP sessions on Redis.
+//
+// The value of `session.gc_maxlifetime` in `php.ini` will be used by default as the
+// the TTL for keys holding session data on Redis, but this value can be overridden
+// when creating the session handler instance with the `gc_maxlifetime` option.
+//
+// Note that this class needs PHP >= 5.4 but can be used on PHP 5.3 if a polyfill for
+// SessionHandlerInterface (see http://www.php.net/class.sessionhandlerinterface.php)
+// is provided either by you or an external package like `symfony/http-foundation`.
+
+if (!interface_exists('SessionHandlerInterface')) {
+    die("ATTENTION: the session handler implemented by Predis needs PHP >= 5.4.0 or a polyfill ".
+        "for \SessionHandlerInterface either provided by you or an external package.\n");
+}
+
+// Instantiate a new client just like you would normally do. We'll prefix our session keys here.
+$client = new Predis\Client($single_server, array('prefix' => 'sessions:'));
+
+// Set `gc_maxlifetime` so that a session will be expired after 5 seconds since last access.
+$handler = new Predis\Session\SessionHandler($client, array('gc_maxlifetime' => 5));
+
+// Register our session handler (it uses `session_set_save_handler()` internally).
+$handler->register();
+
+// Set a fixed session ID just for the sake of our example.
+session_id('example_session_id');
+
+session_start();
+
+if (isset($_SESSION['foo'])) {
+    echo "Session has `foo` set to {$_SESSION['foo']}\n";
+} else {
+    $_SESSION['foo'] = $value = mt_rand();
+    echo "Empty session, `foo` has been set with $value\n";
+}

examples/SharedConfigurations.php

@@ -0,0 +1,33 @@
+<?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.
+ */
+
+require __DIR__.'/../autoload.php';
+
+$single_server = array(
+    'host'     => '127.0.0.1',
+    'port'     => 6379,
+    'database' => 15
+);
+
+$multiple_servers = array(
+    array(
+       'host'     => '127.0.0.1',
+       'port'     => 6379,
+       'database' => 15,
+       'alias'    => 'first',
+    ),
+    array(
+       'host'     => '127.0.0.1',
+       'port'     => 6380,
+       'database' => 15,
+       'alias'    => 'second',
+    ),
+);

examples/SimpleDebuggableConnection.php

@@ -9,12 +9,7 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
-
-// This is an example of how you can easily extend an existing connection class
-// and trace the execution of commands for debugging purposes. This can be quite
-// useful as a starting poing to understand how your application interacts with
-// Redis.
+require 'SharedConfigurations.php';
 
 use Predis\Command\CommandInterface;
 use Predis\Connection\StreamConnection;
@@ -33,10 +28,10 @@ class SimpleDebuggableConnection extends StreamConnection
 
     private function storeDebug(CommandInterface $command, $direction)
     {
-        $firtsArg = $command->getArgument(0);
+        $firtsArg  = $command->getArgument(0);
         $timestamp = round(microtime(true) - $this->tstart, 4);
 
-        $debug = $command->getId();
+        $debug  = $command->getId();
         $debug .= isset($firtsArg) ? " $firtsArg " : ' ';
         $debug .= "$direction $this";
         $debug .= " [{$timestamp}s]";
@@ -44,19 +39,19 @@ class SimpleDebuggableConnection extends StreamConnection
         $this->debugBuffer[] = $debug;
     }
 
-    public function writeRequest(CommandInterface $command)
+    public function writeCommand(CommandInterface $command)
     {
-        parent::writeRequest($command);
+        parent::writeCommand($command);
 
         $this->storeDebug($command, '->');
     }
 
     public function readResponse(CommandInterface $command)
     {
-        $response = parent::readResponse($command);
+        $reply = parent::readResponse($command);
         $this->storeDebug($command, '<-');
 
-        return $response;
+        return $reply;
     }
 
     public function getDebugBuffer()
@@ -76,17 +71,18 @@ $client->set('foo', 'bar');
 $client->get('foo');
 $client->info();
 
-var_export($client->getConnection()->getDebugBuffer());
+print_r($client->getConnection()->getDebugBuffer());
 
 /* OUTPUT:
-array (
-  0 => 'SELECT 15 -> 127.0.0.1:6379 [0.0008s]',
-  1 => 'SELECT 15 <- 127.0.0.1:6379 [0.001s]',
-  2 => 'SET foo -> 127.0.0.1:6379 [0.001s]',
-  3 => 'SET foo <- 127.0.0.1:6379 [0.0011s]',
-  4 => 'GET foo -> 127.0.0.1:6379 [0.0013s]',
-  5 => 'GET foo <- 127.0.0.1:6379 [0.0015s]',
-  6 => 'INFO -> 127.0.0.1:6379 [0.0019s]',
-  7 => 'INFO <- 127.0.0.1:6379 [0.0022s]',
+Array
+(
+    [0] => SELECT 15 -> 127.0.0.1:6379 [0.0008s]
+    [1] => SELECT 15 <- 127.0.0.1:6379 [0.0012s]
+    [2] => SET foo -> 127.0.0.1:6379 [0.0014s]
+    [3] => SET foo <- 127.0.0.1:6379 [0.0014s]
+    [4] => GET foo -> 127.0.0.1:6379 [0.0016s]
+    [5] => GET foo <- 127.0.0.1:6379 [0.0018s]
+    [6] => INFO -> 127.0.0.1:6379 [0.002s]
+    [7] => INFO <- 127.0.0.1:6379 [0.0025s]
 )
 */

examples/SimpleSetAndGet.php

@@ -0,0 +1,25 @@
+<?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.
+ */
+
+require 'SharedConfigurations.php';
+
+// simple set and get scenario
+
+$client = new Predis\Client($single_server);
+
+$client->set('library', 'predis');
+$retval = $client->get('library');
+
+var_dump($retval);
+
+/* OUTPUT
+string(6) "predis"
+*/

examples/TransactionWithCAS.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/shared.php';
+require 'SharedConfigurations.php';
 
 // This is an implementation of an atomic client-side ZPOP using the support for
 // check-and-set (CAS) operations with MULTI/EXEC transactions, as described in
@@ -19,16 +19,15 @@ require __DIR__.'/shared.php';
 //
 // ./redis-cli
 // SELECT 15
-// ZADD zset 1 a 2 b 3 c
-//
-// Then execute this script four times and see its output.
-//
+// ZADD zset 1 a
+// ZADD zset 2 b
+// ZADD zset 3 c
 
 function zpop($client, $key)
 {
     $element = null;
     $options = array(
-        'cas' => true,      // Initialize with support for CAS operations
+        'cas'   => true,    // Initialize with support for CAS operations
         'watch' => $key,    // Key that needs to be WATCHed to detect changes
         'retry' => 3,       // Number of retries on aborted transactions, after
                             // which the client bails out with an exception.
@@ -49,4 +48,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!", "\n";

examples/custom_cluster_distributor.php

@@ -1,117 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-// Developers can implement Predis\Distribution\DistributorInterface to create
-// their own distributors used by the client to distribute keys among a cluster
-// of servers.
-
-use Predis\Cluster\Distributor\DistributorInterface;
-use Predis\Cluster\Hash\HashGeneratorInterface;
-use Predis\Cluster\PredisStrategy;
-use Predis\Connection\Cluster\PredisCluster;
-
-class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
-{
-    private $nodes;
-    private $nodesCount;
-
-    public function __construct()
-    {
-        $this->nodes = array();
-        $this->nodesCount = 0;
-    }
-
-    public function add($node, $weight = null)
-    {
-        $this->nodes[] = $node;
-        ++$this->nodesCount;
-    }
-
-    public function remove($node)
-    {
-        $this->nodes = array_filter($this->nodes, function ($n) use ($node) {
-            return $n !== $node;
-        });
-
-        $this->nodesCount = count($this->nodes);
-    }
-
-    public function getSlot($hash)
-    {
-        return $this->nodesCount > 1 ? abs($hash % $this->nodesCount) : 0;
-    }
-
-    public function getBySlot($slot)
-    {
-        return isset($this->nodes[$slot]) ? $this->nodes[$slot] : null;
-    }
-
-    public function getByHash($hash)
-    {
-        if (!$this->nodesCount) {
-            throw new RuntimeException('No connections.');
-        }
-
-        $slot = $this->getSlot($hash);
-        $node = $this->getBySlot($slot);
-
-        return $node;
-    }
-
-    public function get($value)
-    {
-        $hash = $this->hash($value);
-        $node = $this->getByHash($hash);
-
-        return $node;
-    }
-
-    public function hash($value)
-    {
-        return crc32($value);
-    }
-
-    public function getHashGenerator()
-    {
-        return $this;
-    }
-}
-
-$options = array(
-    'cluster' => function () {
-        $distributor = new NaiveDistributor();
-        $strategy = new PredisStrategy($distributor);
-        $cluster = new PredisCluster($strategy);
-
-        return $cluster;
-    },
-);
-
-$client = new Predis\Client($multiple_servers, $options);
-
-for ($i = 0; $i < 100; ++$i) {
-    $client->set("key:$i", str_pad($i, 4, '0', 0));
-    $client->get("key:$i");
-}
-
-$server1 = $client->getClientBy('alias', 'first')->info();
-$server2 = $client->getClientBy('alias', 'second')->info();
-
-if (isset($server1['Keyspace'], $server2['Keyspace'])) {
-    $server1 = $server1['Keyspace'];
-    $server2 = $server2['Keyspace'];
-}
-
-printf("Server '%s' has %d keys while server '%s' has %d keys.\n",
-    'first', $server1['db15']['keys'], 'second', $server2['db15']['keys']
-);

examples/executing_redis_commands.php

@@ -1,57 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-$client = new Predis\Client($single_server);
-
-// Plain old SET and GET example...
-$client->set('library', 'predis');
-$response = $client->get('library');
-
-var_export($response); echo PHP_EOL;
-/* OUTPUT: 'predis' */
-
-// Redis has the MSET and MGET commands to set or get multiple keys in one go,
-// cases like this Predis accepts arguments for variadic commands both as a list
-// of arguments or an array containing all of the keys and/or values.
-$mkv = array(
-    'uid:0001' => '1st user',
-    'uid:0002' => '2nd user',
-    'uid:0003' => '3rd user',
-);
-
-$client->mset($mkv);
-$response = $client->mget(array_keys($mkv));
-
-var_export($response); echo PHP_EOL;
-/* OUTPUT:
-array (
-  0 => '1st user',
-  1 => '2nd user',
-  2 => '3rd user',
-) */
-
-// Predis can also send "raw" commands to Redis. The difference between sending
-// commands to Redis the usual way and the "raw" way is that in the latter case
-// their arguments are not filtered nor responses coming from Redis are parsed.
-
-$response = $client->executeRaw(array(
-    'MGET', 'uid:0001', 'uid:0002', 'uid:0003',
-));
-
-var_export($response); echo PHP_EOL;
-/* OUTPUT:
-array (
-  0 => '1st user',
-  1 => '2nd user',
-  2 => '3rd user',
-) */

examples/key_prefixing.php

@@ -1,36 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-// Predis can prefix keys found in commands arguments before sending commands to
-// Redis, even for complex commands such as SORT, ZUNIONSTORE and ZINTERSTORE.
-// Prefixing keys can be useful to create user-level namespaces for you keyspace
-// thus reducing the need for separate logical databases in certain scenarios.
-
-$client = new Predis\Client($single_server, array('prefix' => 'nrk:'));
-
-$client->mset(array('foo' => 'bar', 'lol' => 'wut'));
-var_export($client->mget('foo', 'lol'));
-/*
-array (
-  0 => 'bar',
-  1 => 'wut',
-)
-*/
-
-var_export($client->keys('*'));
-/*
-array (
-  0 => 'nrk:foo',
-  1 => 'nrk:lol',
-)
-*/

examples/replication_sentinel.php

@@ -1,58 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-// Predis supports redis-sentinel to provide high availability in master / slave
-// scenarios. The only but relevant difference with a basic replication scenario
-// is that sentinel servers can manage the master server and its slaves based on
-// their state, which means that they are able to provide an authoritative and
-// updated configuration to clients thus avoiding static configurations for the
-// replication servers and their roles.
-
-// Instead of connection parameters pointing to redis nodes, we provide a list
-// of instances of redis-sentinel. Users should always provide a timeout value
-// low enough to not hinder operations just in case a sentinel is unreachable
-// but Predis uses a default value of 100 milliseconds for sentinel parameters
-// without an explicit timeout value.
-//
-// NOTE: in real-world scenarios sentinels should be running on different hosts!
-$sentinels = array(
-    'tcp://127.0.0.1:5380?timeout=0.100',
-    'tcp://127.0.0.1:5381?timeout=0.100',
-    'tcp://127.0.0.1:5382?timeout=0.100',
-);
-
-$client = new Predis\Client($sentinels, array(
-    'replication' => 'sentinel',
-    'service' => 'mymaster',
-));
-
-// Read operation.
-$exists = $client->exists('foo') ? 'yes' : 'no';
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "Does 'foo' exist on {$current->role}? $exists.", PHP_EOL;
-
-// Write operation.
-$client->set('foo', 'bar');
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "Now 'foo' has been set to 'bar' on {$current->role}!", PHP_EOL;
-
-// Read operation.
-$bar = $client->get('foo');
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "We fetched 'foo' from {$current->role} and its value is '$bar'.", PHP_EOL;
-
-/* OUTPUT:
-Does 'foo' exist on slave-127.0.0.1:6381? yes.
-Now 'foo' has been set to 'bar' on master!
-We fetched 'foo' from master and its value is 'bar'.
-*/

examples/replication_simple.php

@@ -1,52 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-// Predis supports master / slave replication scenarios where write operations
-// are performed on the master server and read operations are executed against
-// one of the slaves. The behavior of commands or EVAL scripts can be customized
-// at will. As soon as a write operation is performed the client switches to the
-// master server for all the subsequent requests (either reads and writes).
-//
-// This example must be executed using the second Redis server configured as the
-// slave of the first one (see the "SLAVEOF" command).
-//
-
-$parameters = array(
-    'tcp://127.0.0.1:6381?role=master&database=15',
-    'tcp://127.0.0.1:6382?role=slave&database=15',
-);
-
-$options = array('replication' => 'predis');
-
-$client = new Predis\Client($parameters, $options);
-
-// Read operation.
-$exists = $client->exists('foo') ? 'yes' : 'no';
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "Does 'foo' exist on {$current->role}? $exists.", PHP_EOL;
-
-// Write operation.
-$client->set('foo', 'bar');
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "Now 'foo' has been set to 'bar' on {$current->role}!", PHP_EOL;
-
-// Read operation.
-$bar = $client->get('foo');
-$current = $client->getConnection()->getCurrent()->getParameters();
-echo "We fetched 'foo' from {$current->role} and its value is '$bar'.", PHP_EOL;
-
-/* OUTPUT:
-Does 'foo' exist on slave? yes.
-Now 'foo' has been set to 'bar' on master!
-We fetched 'foo' from master and its value is 'bar'.
-*/

examples/session_handler.php

@@ -1,52 +0,0 @@
-<?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.
- */
-
-require __DIR__.'/shared.php';
-
-// This example demonstrates how to use Predis to save PHP sessions on Redis.
-//
-// The value of `session.gc_maxlifetime` in `php.ini` will be used by default as
-// the TTL for keys holding session data but this value can be overridden when
-// creating the session handler instance using the `gc_maxlifetime` option.
-//
-// NOTE: this class requires PHP >= 5.4 but can be used on PHP 5.3 if a polyfill
-// for SessionHandlerInterface is provided either by you or an external package
-// like `symfony/http-foundation`.
-//
-// See http://www.php.net/class.sessionhandlerinterface.php for more details.
-//
-
-if (!interface_exists('SessionHandlerInterface')) {
-    die('ATTENTION: the session handler implemented by Predis requires PHP >= 5.4.0 '.
-        "or a polyfill for SessionHandlerInterface provided by an external package.\n");
-}
-
-// Instantiate a new client just like you would normally do. Using a prefix for
-// keys will effectively prefix all session keys with the specified string.
-$client = new Predis\Client($single_server, array('prefix' => 'sessions:'));
-
-// Set `gc_maxlifetime` to specify a time-to-live of 5 seconds for session keys.
-$handler = new Predis\Session\Handler($client, array('gc_maxlifetime' => 5));
-
-// Register the session handler.
-$handler->register();
-
-// We just set a fixed session ID only for the sake of our example.
-session_id('example_session_id');
-
-session_start();
-
-if (isset($_SESSION['foo'])) {
-    echo "Session has `foo` set to {$_SESSION['foo']}", PHP_EOL;
-} else {
-    $_SESSION['foo'] = $value = mt_rand();
-    echo "Empty session, `foo` has been set with $value", PHP_EOL;
-}

examples/shared.php

@@ -1,48 +0,0 @@
-<?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.
- */
-
-if (PHP_SAPI !== 'cli') {
-    die("Example scripts are meant to be executed locally via CLI.");
-}
-
-require __DIR__.'/../autoload.php';
-
-function redis_version($info)
-{
-    if (isset($info['Server']['redis_version'])) {
-        return $info['Server']['redis_version'];
-    } elseif (isset($info['redis_version'])) {
-        return $info['redis_version'];
-    } else {
-        return 'unknown version';
-    }
-}
-
-$single_server = array(
-    'host' => '127.0.0.1',
-    'port' => 6379,
-    'database' => 15,
-);
-
-$multiple_servers = array(
-    array(
-       'host' => '127.0.0.1',
-       'port' => 6379,
-       'database' => 15,
-       'alias' => 'first',
-    ),
-    array(
-       'host' => '127.0.0.1',
-       'port' => 6380,
-       'database' => 15,
-       'alias' => 'second',
-    ),
-);

lib/Predis/Autoloader.php

@@ -12,11 +12,10 @@
 namespace Predis;
 
 /**
- * Implements a lightweight PSR-0 compliant autoloader for Predis.
+ * Implements a lightweight PSR-0 compliant autoloader.
  *
  * @author Eric Naeseth <eric@thumbtack.com>
  * @author Daniele Alessandri <suppakilla@gmail.com>
- * @codeCoverageIgnore
  */
 class Autoloader
 {
@@ -30,7 +29,7 @@ class Autoloader
     public function __construct($baseDirectory = __DIR__)
     {
         $this->directory = $baseDirectory;
-        $this->prefix = __NAMESPACE__.'\\';
+        $this->prefix = __NAMESPACE__ . '\\';
         $this->prefixLength = strlen($this->prefix);
     }
 
@@ -41,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);
     }
 
     /**
@@ -56,7 +55,7 @@ class Autoloader
             $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';
 
             if (is_file($filepath)) {
-                require $filepath;
+                require($filepath);
             }
         }
     }

lib/Predis/BasicClientInterface.php

@@ -0,0 +1,31 @@
+<?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;
+
+use Predis\Command\CommandInterface;
+
+/**
+ * Defines the interface of a basic client object or abstraction that
+ * can send commands to Redis.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+interface BasicClientInterface
+{
+    /**
+     * Executes the specified Redis command.
+     *
+     * @param  CommandInterface $command A Redis command.
+     * @return mixed
+     */
+    public function executeCommand(CommandInterface $command);
+}

lib/Predis/Client.php

@@ -0,0 +1,465 @@
+<?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;
+
+use Predis\Command\CommandInterface;
+use Predis\Command\ScriptedCommand;
+use Predis\Connection\AggregatedConnectionInterface;
+use Predis\Connection\ConnectionInterface;
+use Predis\Connection\ConnectionFactoryInterface;
+use Predis\Monitor\MonitorContext;
+use Predis\Option\ClientOptions;
+use Predis\Option\ClientOptionsInterface;
+use Predis\Pipeline\PipelineContext;
+use Predis\PubSub\PubSubContext;
+use Predis\Transaction\MultiExecContext;
+
+/**
+ * Main class that exposes the most high-level interface to interact with Redis.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class Client implements ClientInterface
+{
+    const VERSION = '0.8.5';
+
+    private $options;
+    private $profile;
+    private $connection;
+
+    /**
+     * Initializes a new client with optional connection parameters and client options.
+     *
+     * @param mixed $parameters Connection parameters for one or multiple servers.
+     * @param mixed $options    Options that specify certain behaviours for the client.
+     */
+    public function __construct($parameters = null, $options = null)
+    {
+        $this->options = $this->filterOptions($options);
+        $this->profile = $this->options->profile;
+        $this->connection = $this->initializeConnection($parameters);
+    }
+
+    /**
+     * Creates an instance of Predis\Option\ClientOptions from various types of
+     * arguments (string, array, Predis\Profile\ServerProfile) or returns the
+     * passed object if it is an instance of Predis\Option\ClientOptions.
+     *
+     * @param  mixed         $options Client options.
+     * @return ClientOptions
+     */
+    protected function filterOptions($options)
+    {
+        if (!isset($options)) {
+            return new ClientOptions();
+        }
+
+        if (is_array($options)) {
+            return new ClientOptions($options);
+        }
+
+        if ($options instanceof ClientOptionsInterface) {
+            return $options;
+        }
+
+        throw new \InvalidArgumentException("Invalid type for client options");
+    }
+
+    /**
+     * Initializes one or multiple connection (cluster) objects from various
+     * types of arguments (string, array) or returns the passed object if it
+     * implements Predis\Connection\ConnectionInterface.
+     *
+     * @param  mixed               $parameters Connection parameters or instance.
+     * @return ConnectionInterface
+     */
+    protected function initializeConnection($parameters)
+    {
+        if ($parameters instanceof ConnectionInterface) {
+            return $parameters;
+        }
+
+        if (is_array($parameters) && isset($parameters[0])) {
+            $options = $this->options;
+            $replication = isset($options->replication) && $options->replication;
+            $connection = $options->{$replication ? 'replication' : 'cluster'};
+
+            return $options->connections->createAggregated($connection, $parameters);
+        }
+
+        if (is_callable($parameters)) {
+            $connection = call_user_func($parameters, $this->options);
+
+            if (!$connection instanceof ConnectionInterface) {
+                throw new \InvalidArgumentException(
+                    'Callable parameters must return instances of Predis\Connection\ConnectionInterface'
+                );
+            }
+
+            return $connection;
+        }
+
+        return $this->options->connections->create($parameters);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProfile()
+    {
+        return $this->profile;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Returns the connection factory object used by the client.
+     *
+     * @return ConnectionFactoryInterface
+     */
+    public function getConnectionFactory()
+    {
+        return $this->options->connections;
+    }
+
+    /**
+     * Returns a new instance of a client for the specified connection when the
+     * client is connected to a cluster. The new instance will use the same
+     * options of the original client.
+     *
+     * @param  string $connectionID Identifier for the connection.
+     * @return Client
+     */
+    public function getClientFor($connectionID)
+    {
+        if (!$connection = $this->getConnectionById($connectionID)) {
+            throw new \InvalidArgumentException("Invalid connection ID: '$connectionID'");
+        }
+
+        return new static($connection, $this->options);
+    }
+
+    /**
+     * Opens the connection to the server.
+     */
+    public function connect()
+    {
+        $this->connection->connect();
+    }
+
+    /**
+     * Disconnects from the server.
+     */
+    public function disconnect()
+    {
+        $this->connection->disconnect();
+    }
+
+    /**
+     * Disconnects from the server.
+     *
+     * This method is an alias of disconnect().
+     */
+    public function quit()
+    {
+        $this->disconnect();
+    }
+
+    /**
+     * Checks if the underlying connection is connected to Redis.
+     *
+     * @return bool True means that the connection is open.
+     *              False means that the connection is closed.
+     */
+    public function isConnected()
+    {
+        return $this->connection->isConnected();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Retrieves a single connection out of an aggregated connections instance.
+     *
+     * @param  string                               $connectionId Index or alias of the single connection.
+     * @return Connection\SingleConnectionInterface
+     */
+    public function getConnectionById($connectionId)
+    {
+        if (!$this->connection instanceof AggregatedConnectionInterface) {
+            throw new NotSupportedException('Retrieving connections by ID is supported only when using aggregated connections');
+        }
+
+        return $this->connection->getConnectionById($connectionId);
+    }
+
+    /**
+     * Creates a Redis command with the specified arguments and sends a request
+     * to the server.
+     *
+     * @param  string $commandID Command ID.
+     * @param  array  $arguments Arguments for the command.
+     * @return mixed
+     */
+    public function __call($commandID, $arguments)
+    {
+        $command = $this->createCommand($commandID, $arguments);
+        $response = $this->executeCommand($command);
+
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createCommand($commandID, $arguments = array())
+    {
+        return $this->profile->createCommand($commandID, $arguments);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function executeCommand(CommandInterface $command)
+    {
+        $response = $this->connection->executeCommand($command);
+
+        if ($response instanceof ResponseObjectInterface) {
+            if ($response instanceof ResponseErrorInterface) {
+                $response = $this->onResponseError($command, $response);
+            }
+
+            return $response;
+        }
+
+        return $command->parseResponse($response);
+    }
+
+    /**
+     * Handles -ERR responses returned by Redis.
+     *
+     * @param  CommandInterface       $command  The command that generated the error.
+     * @param  ResponseErrorInterface $response The error response instance.
+     * @return mixed
+     */
+    protected function onResponseError(CommandInterface $command, ResponseErrorInterface $response)
+    {
+        if ($command instanceof ScriptedCommand && $response->getErrorType() === 'NOSCRIPT') {
+            $eval = $this->createCommand('eval');
+            $eval->setRawArguments($command->getEvalArguments());
+
+            $response = $this->executeCommand($eval);
+
+            if (!$response instanceof ResponseObjectInterface) {
+                $response = $command->parseResponse($response);
+            }
+
+            return $response;
+        }
+
+        if ($this->options->exceptions) {
+            throw new ServerException($response->getMessage());
+        }
+
+        return $response;
+    }
+
+    /**
+     * Calls the specified initializer method on $this with 0, 1 or 2 arguments.
+     *
+     * TODO: Invert $argv and $initializer.
+     *
+     * @param  array  $argv        Arguments for the initializer.
+     * @param  string $initializer The initializer method.
+     * @return mixed
+     */
+    private function sharedInitializer($argv, $initializer)
+    {
+        switch (count($argv)) {
+            case 0:
+                return $this->$initializer();
+
+            case 1:
+                list($arg0) = $argv;
+
+                return is_array($arg0) ? $this->$initializer($arg0) : $this->$initializer(null, $arg0);
+
+            case 2:
+                list($arg0, $arg1) = $argv;
+
+                return $this->$initializer($arg0, $arg1);
+
+            default:
+                return $this->$initializer($this, $argv);
+        }
+    }
+
+    /**
+     * Creates a new pipeline context and returns it, or returns the results of
+     * a pipeline executed inside the optionally provided callable object.
+     *
+     * @param  mixed                 ... Options for the context, a callable object, or both.
+     * @return PipelineContext|array
+     */
+    public function pipeline(/* arguments */)
+    {
+        return $this->sharedInitializer(func_get_args(), 'initPipeline');
+    }
+
+    /**
+     * Pipeline context initializer.
+     *
+     * @param  array                 $options  Options for the context.
+     * @param  mixed                 $callable Optional callable object used to execute the context.
+     * @return PipelineContext|array
+     */
+    protected function initPipeline(Array $options = null, $callable = null)
+    {
+        $executor = isset($options['executor']) ? $options['executor'] : null;
+
+        if (is_callable($executor)) {
+            $executor = call_user_func($executor, $this, $options);
+        }
+
+        $pipeline = new PipelineContext($this, $executor);
+        $replies  = $this->pipelineExecute($pipeline, $callable);
+
+        return $replies;
+    }
+
+    /**
+     * Executes a pipeline context when a callable object is passed.
+     *
+     * @param  PipelineContext       $pipeline Pipeline context instance.
+     * @param  mixed                 $callable Optional callable object used to execute the context.
+     * @return PipelineContext|array
+     */
+    private function pipelineExecute(PipelineContext $pipeline, $callable)
+    {
+        return isset($callable) ? $pipeline->execute($callable) : $pipeline;
+    }
+
+    /**
+     * Creates a new transaction context and returns it, or returns the results of
+     * a transaction executed inside the optionally provided callable object.
+     *
+     * @deprecated You should start using the new Client::transaction() method
+     *             as it will replace Client::multiExec() in the next major
+     *             version of the library.
+     *
+     * @param  mixed                  ... Options for the context, a callable object, or both.
+     * @return MultiExecContext|array
+     */
+    public function multiExec(/* arguments */)
+    {
+        return $this->sharedInitializer(func_get_args(), 'initMultiExec');
+    }
+
+    /**
+     * Creates a new transaction context and returns it, or returns the results of
+     * a transaction executed inside the optionally provided callable object.
+     *
+     * @param  mixed                  ... Options for the context, a callable object, or both.
+     * @return MultiExecContext|array
+     */
+    public function transaction(/* arguments */)
+    {
+        return $this->sharedInitializer(func_get_args(), 'initMultiExec');
+    }
+
+    /**
+     * Transaction context initializer.
+     *
+     * @param  array                  $options  Options for the context.
+     * @param  mixed                  $callable Optional callable object used to execute the context.
+     * @return MultiExecContext|array
+     */
+    protected function initMultiExec(Array $options = null, $callable = null)
+    {
+        $transaction = new MultiExecContext($this, $options ?: array());
+
+        return isset($callable) ? $transaction->execute($callable) : $transaction;
+    }
+
+    /**
+     * Creates a new Publish / Subscribe context and returns it, or executes it
+     * inside the optionally provided callable object.
+     *
+     * @deprecated This method will change in the next major release to support
+     *             the new PUBSUB command introduced in Redis 2.8. Please use
+     *             Client::pubSubLoop() to create Predis\PubSub\PubSubContext
+     *             instances from now on.
+     *
+     * @param  mixed               ... Options for the context, a callable object, or both.
+     * @return PubSubContext|array
+     */
+    public function pubSub(/* arguments */)
+    {
+        return call_user_func_array(array($this, 'pubSubLoop'), func_get_args());
+    }
+
+    /**
+     * Creates a new Publish / Subscribe context and returns it, or executes it
+     * inside the optionally provided callable object.
+     *
+     * @param  mixed               ... Options for the context, a callable object, or both.
+     * @return PubSubContext|array
+     */
+    public function pubSubLoop(/* arguments */)
+    {
+        return $this->sharedInitializer(func_get_args(), 'initPubSub');
+    }
+
+    /**
+     * Publish / Subscribe context initializer.
+     *
+     * @param  array         $options  Options for the context.
+     * @param  mixed         $callable Optional callable object used to execute the context.
+     * @return PubSubContext
+     */
+    protected function initPubSub(Array $options = null, $callable = null)
+    {
+        $pubsub = new PubSubContext($this, $options);
+
+        if (!isset($callable)) {
+            return $pubsub;
+        }
+
+        foreach ($pubsub as $message) {
+            if (call_user_func($callable, $pubsub, $message) === false) {
+                $pubsub->closeContext();
+            }
+        }
+    }
+
+    /**
+     * Returns a new monitor context.
+     *
+     * @return MonitorContext
+     */
+    public function monitor()
+    {
+        return new MonitorContext($this);
+    }
+}

lib/Predis/ClientInterface.php

@@ -0,0 +1,66 @@
+<?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;
+
+use Predis\Connection\ConnectionInterface;
+use Predis\Option\ClientOptionsInterface;
+use Predis\Profile\ServerProfileInterface;
+
+/**
+ * Interface defining the most important parts needed to create an
+ * high-level Redis client object that can interact with other
+ * building blocks of Predis.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+interface ClientInterface extends BasicClientInterface
+{
+    /**
+     * Returns the server profile used by the client.
+     *
+     * @return ServerProfileInterface
+     */
+    public function getProfile();
+
+    /**
+     * Returns the client options specified upon initialization.
+     *
+     * @return ClientOptionsInterface
+     */
+    public function getOptions();
+
+    /**
+     * Opens the connection to the server.
+     */
+    public function connect();
+
+    /**
+     * Disconnects from the server.
+     */
+    public function disconnect();
+
+    /**
+     * Returns the underlying connection instance.
+     *
+     * @return ConnectionInterface
+     */
+    public function getConnection();
+
+    /**
+     * Creates a new instance of the specified Redis command.
+     *
+     * @param  string                   $method    The name of a Redis command.
+     * @param  array                    $arguments The arguments for the command.
+     * @return Command\CommandInterface
+     */
+    public function createCommand($method, $arguments = array());
+}

lib/Predis/Cluster/CommandHashStrategyInterface.php

@@ -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\Cluster;
+
+use Predis\Command\CommandInterface;
+
+/**
+ * Interface for classes defining the strategy used to calculate an hash
+ * out of keys extracted from supported commands.
+ *
+ * This is mostly useful to support clustering via client-side sharding.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+interface CommandHashStrategyInterface
+{
+    /**
+     * Returns the hash for the given command using the specified algorithm, or null
+     * if the command cannot be hashed.
+     *
+     * @param  CommandInterface $command Command to be hashed.
+     * @return int
+     */
+    public function getHash(CommandInterface $command);
+
+    /**
+     * Returns the hash for the given key using the specified algorithm.
+     *
+     * @param  string $key Key to be hashed.
+     * @return string
+     */
+    public function getKeyHash($key);
+}

lib/Predis/Cluster/Distribution/DistributionStrategyInterface.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Cluster\Distributor;
+namespace Predis\Cluster\Distribution;
 
 use Predis\Cluster\Hash\HashGeneratorInterface;
 
 /**
- * A distributor implements the logic to automatically distribute keys among
- * several nodes for client-side sharding.
+ * A distributor implements the logic to automatically distribute
+ * keys among several nodes for client-side sharding.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-interface DistributorInterface
+interface DistributionStrategyInterface
 {
     /**
      * Adds a node to the distributor with an optional weight.
@@ -37,41 +37,12 @@ interface DistributorInterface
     public function remove($node);
 
     /**
-     * Returns the corresponding slot of a node from the distributor using the
-     * computed hash of a key.
-     *
-     * @param mixed $hash
+     * Gets a node from the distributor using the computed hash of a key.
      *
+     * @param  mixed $key
      * @return mixed
      */
-    public function getSlot($hash);
-
-    /**
-     * Returns a node from the distributor using its assigned slot ID.
-     *
-     * @param mixed $slot
-     *
-     * @return mixed|null
-     */
-    public function getBySlot($slot);
-
-    /**
-     * Returns a node from the distributor using the computed hash of a key.
-     *
-     * @param mixed $hash
-     *
-     * @return mixed
-     */
-    public function getByHash($hash);
-
-    /**
-     * Returns a node from the distributor mapping to the specified value.
-     *
-     * @param string $value
-     *
-     * @return mixed
-     */
-    public function get($value);
+    public function get($key);
 
     /**
      * Returns the underlying hash generator instance.

lib/Predis/Cluster/Distribution/EmptyRingException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Cluster\Distributor;
+namespace Predis\Cluster\Distribution;
 
 /**
  * Exception class that identifies empty rings.

lib/Predis/Cluster/Distribution/HashRing.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Cluster\Distributor;
+namespace Predis\Cluster\Distribution;
 
 use Predis\Cluster\Hash\HashGeneratorInterface;
 
@@ -21,10 +21,10 @@ use Predis\Cluster\Hash\HashGeneratorInterface;
  * @author Daniele Alessandri <suppakilla@gmail.com>
  * @author Lorenzo Castelli <lcastelli@gmail.com>
  */
-class HashRing implements DistributorInterface, HashGeneratorInterface
+class HashRing implements DistributionStrategyInterface, HashGeneratorInterface
 {
     const DEFAULT_REPLICAS = 128;
-    const DEFAULT_WEIGHT = 100;
+    const DEFAULT_WEIGHT   = 100;
 
     private $ring;
     private $ringKeys;
@@ -35,7 +35,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
 
     /**
      * @param int   $replicas         Number of replicas in the ring.
-     * @param mixed $nodeHashCallback Callback returning a string used to calculate the hash of nodes.
+     * @param mixed $nodeHashCallback Callback returning the string used to calculate the hash of a node.
      */
     public function __construct($replicas = self::DEFAULT_REPLICAS, $nodeHashCallback = null)
     {
@@ -53,11 +53,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
     {
         // In case of collisions in the hashes of the nodes, the node added
         // last wins, thus the order in which nodes are added is significant.
-        $this->nodes[] = array(
-            'object' => $node,
-            'weight' => (int) $weight ?: $this::DEFAULT_WEIGHT,
-        );
-
+        $this->nodes[] = array('object' => $node, 'weight' => (int) $weight ?: $this::DEFAULT_WEIGHT);
         $this->reset();
     }
 
@@ -74,7 +70,6 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
             if ($this->nodes[$i]['object'] === $node) {
                 array_splice($this->nodes, $i, 1);
                 $this->reset();
-
                 break;
             }
         }
@@ -128,7 +123,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
         }
 
         if (!$this->nodes) {
-            throw new EmptyRingException('Cannot initialize an empty hashring.');
+            throw new EmptyRingException('Cannot initialize empty hashring');
         }
 
         $this->ring = array();
@@ -160,8 +155,8 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
         $nodeHash = $this->getNodeHash($nodeObject);
         $replicas = (int) round($weightRatio * $totalNodes * $replicas);
 
-        for ($i = 0; $i < $replicas; ++$i) {
-            $key = $this->hash("$nodeHash:$i");
+        for ($i = 0; $i < $replicas; $i++) {
+            $key = crc32("$nodeHash:$i");
             $ring[$key] = $nodeObject;
         }
     }
@@ -171,7 +166,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
      */
     protected function getNodeHash($nodeObject)
     {
-        if (!isset($this->nodeHashCallback)) {
+        if ($this->nodeHashCallback === null) {
             return (string) $nodeObject;
         }
 
@@ -179,7 +174,10 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Calculates the hash for the specified value.
+     *
+     * @param  string $value Input value.
+     * @return int
      */
     public function hash($value)
     {
@@ -189,41 +187,31 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
     /**
      * {@inheritdoc}
      */
-    public function getByHash($hash)
+    public function get($key)
     {
-        return $this->ring[$this->getSlot($hash)];
+        return $this->ring[$this->getNodeKey($key)];
     }
 
     /**
-     * {@inheritdoc}
+     * Calculates the corrisponding key of a node distributed in the hashring.
+     *
+     * @param  int $key Computed hash of a key.
+     * @return int
      */
-    public function getBySlot($slot)
+    private function getNodeKey($key)
     {
         $this->initialize();
-
-        if (isset($this->ring[$slot])) {
-            return $this->ring[$slot];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSlot($hash)
-    {
-        $this->initialize();
-
         $ringKeys = $this->ringKeys;
         $upper = $this->ringKeysCount - 1;
         $lower = 0;
 
         while ($lower <= $upper) {
             $index = ($lower + $upper) >> 1;
-            $item = $ringKeys[$index];
+            $item  = $ringKeys[$index];
 
-            if ($item > $hash) {
+            if ($item > $key) {
                 $upper = $index - 1;
-            } elseif ($item < $hash) {
+            } elseif ($item < $key) {
                 $lower = $index + 1;
             } else {
                 return $item;
@@ -233,23 +221,12 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
         return $ringKeys[$this->wrapAroundStrategy($upper, $lower, $this->ringKeysCount)];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get($value)
-    {
-        $hash = $this->hash($value);
-
-        return $this->getByHash($hash);
-    }
-
     /**
      * Implements a strategy to deal with wrap-around errors during binary searches.
      *
-     * @param int $upper
-     * @param int $lower
-     * @param int $ringKeysCount
-     *
+     * @param  int $upper
+     * @param  int $lower
+     * @param  int $ringKeysCount
      * @return int
      */
     protected function wrapAroundStrategy($upper, $lower, $ringKeysCount)

lib/Predis/Cluster/Distribution/KetamaPureRing.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Cluster\Distributor;
+namespace Predis\Cluster\Distribution;
 
 /**
  * This class implements an hashring-based distributor that uses the same
@@ -19,12 +19,12 @@ namespace Predis\Cluster\Distributor;
  * @author Daniele Alessandri <suppakilla@gmail.com>
  * @author Lorenzo Castelli <lcastelli@gmail.com>
  */
-class KetamaRing extends HashRing
+class KetamaPureRing extends HashRing
 {
     const DEFAULT_REPLICAS = 160;
 
     /**
-     * @param mixed $nodeHashCallback Callback returning a string used to calculate the hash of nodes.
+     * @param mixed $nodeHashCallback Callback returning the string used to calculate the hash of a node.
      */
     public function __construct($nodeHashCallback = null)
     {
@@ -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) {
@@ -64,7 +64,7 @@ class KetamaRing extends HashRing
      */
     protected function wrapAroundStrategy($upper, $lower, $ringKeysCount)
     {
-        // Binary search for the first item in ringkeys with a value greater
+        // Binary search for the first item in _ringkeys with a value greater
         // or equal to the key. If no such item exists, return the first item.
         return $lower < $ringKeysCount ? $lower : 0;
     }

lib/Predis/Cluster/Hash/CRC16HashGenerator.php

@@ -12,11 +12,11 @@
 namespace Predis\Cluster\Hash;
 
 /**
- * Hash generator implementing the CRC-CCITT-16 algorithm used by redis-cluster.
+ * This class implements the CRC-CCITT-16 algorithm used by redis-cluster.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class CRC16 implements HashGeneratorInterface
+class CRC16HashGenerator implements HashGeneratorInterface
 {
     private static $CCITT_16 = array(
         0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
@@ -61,11 +61,9 @@ class CRC16 implements HashGeneratorInterface
         // CRC-CCITT-16 algorithm
         $crc = 0;
         $CCITT_16 = self::$CCITT_16;
-
-        $value = (string) $value;
         $strlen = strlen($value);
 
-        for ($i = 0; $i < $strlen; ++$i) {
+        for ($i = 0; $i < $strlen; $i++) {
             $crc = (($crc << 8) ^ $CCITT_16[($crc >> 8) ^ ord($value[$i])]) & 0xFFFF;
         }
 

lib/Predis/Cluster/Hash/HashGeneratorInterface.php

@@ -12,18 +12,17 @@
 namespace Predis\Cluster\Hash;
 
 /**
- * An hash generator implements the logic used to calculate the hash of a key to
- * distribute operations among Redis nodes.
+ * A generator of node keys implements the logic used to calculate the hash of
+ * a key to distribute the respective operations among nodes.
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface HashGeneratorInterface
 {
     /**
-     * Generates an hash from a string to be used for distribution.
-     *
-     * @param string $value String value.
+     * Generates an hash that is used by the distributor algorithm
      *
+     * @param  string $value Value used to generate the hash.
      * @return int
      */
     public function hash($value);

lib/Predis/Cluster/PredisClusterHashStrategy.php

@@ -0,0 +1,389 @@
+<?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\Cluster;
+
+use Predis\Cluster\Hash\HashGeneratorInterface;
+use Predis\Command\CommandInterface;
+use Predis\Command\ScriptedCommand;
+
+/**
+ * Default class used by Predis for client-side sharding to calculate
+ * hashes out of keys of supported commands.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class PredisClusterHashStrategy implements CommandHashStrategyInterface
+{
+    private $commands;
+    private $hashGenerator;
+
+    /**
+     * @param HashGeneratorInterface $hashGenerator Hash generator instance.
+     */
+    public function __construct(HashGeneratorInterface $hashGenerator)
+    {
+        $this->commands = $this->getDefaultCommands();
+        $this->hashGenerator = $hashGenerator;
+    }
+
+    /**
+     * Returns the default map of supported commands with their handlers.
+     *
+     * @return array
+     */
+    protected function getDefaultCommands()
+    {
+        $keyIsFirstArgument = array($this, 'getKeyFromFirstArgument');
+        $keysAreAllArguments = array($this, 'getKeyFromAllArguments');
+
+        return array(
+            /* commands operating on the key space */
+            'EXISTS'                => $keyIsFirstArgument,
+            'DEL'                   => $keysAreAllArguments,
+            'TYPE'                  => $keyIsFirstArgument,
+            'EXPIRE'                => $keyIsFirstArgument,
+            'EXPIREAT'              => $keyIsFirstArgument,
+            'PERSIST'               => $keyIsFirstArgument,
+            'PEXPIRE'               => $keyIsFirstArgument,
+            'PEXPIREAT'             => $keyIsFirstArgument,
+            'TTL'                   => $keyIsFirstArgument,
+            'PTTL'                  => $keyIsFirstArgument,
+            'SORT'                  => $keyIsFirstArgument, // TODO
+            'DUMP'                  => $keyIsFirstArgument,
+            'RESTORE'               => $keyIsFirstArgument,
+
+            /* commands operating on string values */
+            'APPEND'                => $keyIsFirstArgument,
+            'DECR'                  => $keyIsFirstArgument,
+            'DECRBY'                => $keyIsFirstArgument,
+            'GET'                   => $keyIsFirstArgument,
+            'GETBIT'                => $keyIsFirstArgument,
+            'MGET'                  => $keysAreAllArguments,
+            'SET'                   => $keyIsFirstArgument,
+            'GETRANGE'              => $keyIsFirstArgument,
+            'GETSET'                => $keyIsFirstArgument,
+            'INCR'                  => $keyIsFirstArgument,
+            'INCRBY'                => $keyIsFirstArgument,
+            'SETBIT'                => $keyIsFirstArgument,
+            'SETEX'                 => $keyIsFirstArgument,
+            'MSET'                  => array($this, 'getKeyFromInterleavedArguments'),
+            'MSETNX'                => array($this, 'getKeyFromInterleavedArguments'),
+            'SETNX'                 => $keyIsFirstArgument,
+            'SETRANGE'              => $keyIsFirstArgument,
+            'STRLEN'                => $keyIsFirstArgument,
+            'SUBSTR'                => $keyIsFirstArgument,
+            'BITOP'                 => array($this, 'getKeyFromBitOp'),
+            'BITCOUNT'              => $keyIsFirstArgument,
+
+            /* commands operating on lists */
+            'LINSERT'               => $keyIsFirstArgument,
+            'LINDEX'                => $keyIsFirstArgument,
+            'LLEN'                  => $keyIsFirstArgument,
+            'LPOP'                  => $keyIsFirstArgument,
+            'RPOP'                  => $keyIsFirstArgument,
+            'RPOPLPUSH'             => $keysAreAllArguments,
+            'BLPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
+            'BRPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
+            'BRPOPLPUSH'            => array($this, 'getKeyFromBlockingListCommands'),
+            'LPUSH'                 => $keyIsFirstArgument,
+            'LPUSHX'                => $keyIsFirstArgument,
+            'RPUSH'                 => $keyIsFirstArgument,
+            'RPUSHX'                => $keyIsFirstArgument,
+            'LRANGE'                => $keyIsFirstArgument,
+            'LREM'                  => $keyIsFirstArgument,
+            'LSET'                  => $keyIsFirstArgument,
+            'LTRIM'                 => $keyIsFirstArgument,
+
+            /* commands operating on sets */
+            'SADD'                  => $keyIsFirstArgument,
+            'SCARD'                 => $keyIsFirstArgument,
+            'SDIFF'                 => $keysAreAllArguments,
+            'SDIFFSTORE'            => $keysAreAllArguments,
+            'SINTER'                => $keysAreAllArguments,
+            'SINTERSTORE'           => $keysAreAllArguments,
+            'SUNION'                => $keysAreAllArguments,
+            'SUNIONSTORE'           => $keysAreAllArguments,
+            'SISMEMBER'             => $keyIsFirstArgument,
+            'SMEMBERS'              => $keyIsFirstArgument,
+            'SSCAN'                 => $keyIsFirstArgument,
+            'SPOP'                  => $keyIsFirstArgument,
+            'SRANDMEMBER'           => $keyIsFirstArgument,
+            'SREM'                  => $keyIsFirstArgument,
+
+            /* commands operating on sorted sets */
+            'ZADD'                  => $keyIsFirstArgument,
+            'ZCARD'                 => $keyIsFirstArgument,
+            'ZCOUNT'                => $keyIsFirstArgument,
+            'ZINCRBY'               => $keyIsFirstArgument,
+            'ZINTERSTORE'           => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZRANGE'                => $keyIsFirstArgument,
+            'ZRANGEBYSCORE'         => $keyIsFirstArgument,
+            'ZRANK'                 => $keyIsFirstArgument,
+            'ZREM'                  => $keyIsFirstArgument,
+            'ZREMRANGEBYRANK'       => $keyIsFirstArgument,
+            'ZREMRANGEBYSCORE'      => $keyIsFirstArgument,
+            'ZREVRANGE'             => $keyIsFirstArgument,
+            'ZREVRANGEBYSCORE'      => $keyIsFirstArgument,
+            'ZREVRANK'              => $keyIsFirstArgument,
+            'ZSCORE'                => $keyIsFirstArgument,
+            'ZUNIONSTORE'           => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZSCAN'                 => $keyIsFirstArgument,
+
+            /* commands operating on hashes */
+            'HDEL'                  => $keyIsFirstArgument,
+            'HEXISTS'               => $keyIsFirstArgument,
+            'HGET'                  => $keyIsFirstArgument,
+            'HGETALL'               => $keyIsFirstArgument,
+            'HMGET'                 => $keyIsFirstArgument,
+            'HMSET'                 => $keyIsFirstArgument,
+            'HINCRBY'               => $keyIsFirstArgument,
+            'HINCRBYFLOAT'          => $keyIsFirstArgument,
+            'HKEYS'                 => $keyIsFirstArgument,
+            'HLEN'                  => $keyIsFirstArgument,
+            'HSET'                  => $keyIsFirstArgument,
+            'HSETNX'                => $keyIsFirstArgument,
+            'HVALS'                 => $keyIsFirstArgument,
+            'HSCAN'                 => $keyIsFirstArgument,
+
+            /* scripting */
+            'EVAL'                  => array($this, 'getKeyFromScriptingCommands'),
+            'EVALSHA'               => array($this, 'getKeyFromScriptingCommands'),
+        );
+    }
+
+    /**
+     * Returns the list of IDs for the supported commands.
+     *
+     * @return array
+     */
+    public function getSupportedCommands()
+    {
+        return array_keys($this->commands);
+    }
+
+    /**
+     * Sets an handler for the specified command ID.
+     *
+     * The signature of the callback must have a single parameter
+     * of type Predis\Command\CommandInterface.
+     *
+     * When the callback argument is omitted or NULL, the previously
+     * associated handler for the specified command ID is removed.
+     *
+     * @param string $commandId The ID of the command to be handled.
+     * @param mixed  $callback  A valid callable object or NULL.
+     */
+    public function setCommandHandler($commandId, $callback = null)
+    {
+        $commandId = strtoupper($commandId);
+
+        if (!isset($callback)) {
+            unset($this->commands[$commandId]);
+
+            return;
+        }
+
+        if (!is_callable($callback)) {
+            throw new \InvalidArgumentException("Callback must be a valid callable object or NULL");
+        }
+
+        $this->commands[$commandId] = $callback;
+    }
+
+    /**
+     * Extracts the key from the first argument of a command instance.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromFirstArgument(CommandInterface $command)
+    {
+        return $command->getArgument(0);
+    }
+
+    /**
+     * Extracts the key from a command with multiple keys only when all keys
+     * in the arguments array produce the same hash.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromAllArguments(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if ($this->checkSameHashForKeys($arguments)) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from a command with multiple keys only when all keys
+     * in the arguments array produce the same hash.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromInterleavedArguments(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $keys = array();
+
+        for ($i = 0; $i < count($arguments); $i += 2) {
+            $keys[] = $arguments[$i];
+        }
+
+        if ($this->checkSameHashForKeys($keys)) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from BLPOP and BRPOP commands.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromBlockingListCommands(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if ($this->checkSameHashForKeys(array_slice($arguments, 0, count($arguments) - 1))) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from BITOP command.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromBitOp(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if ($this->checkSameHashForKeys(array_slice($arguments, 1, count($arguments)))) {
+            return $arguments[1];
+        }
+    }
+
+    /**
+     * Extracts the key from ZINTERSTORE and ZUNIONSTORE commands.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromZsetAggregationCommands(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $keys = array_merge(array($arguments[0]), array_slice($arguments, 2, $arguments[1]));
+
+        if ($this->checkSameHashForKeys($keys)) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from EVAL and EVALSHA commands.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromScriptingCommands(CommandInterface $command)
+    {
+        if ($command instanceof ScriptedCommand) {
+            $keys = $command->getKeys();
+        } else {
+            $keys = array_slice($args = $command->getArguments(), 2, $args[1]);
+        }
+
+        if ($keys && $this->checkSameHashForKeys($keys)) {
+            return $keys[0];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHash(CommandInterface $command)
+    {
+        $hash = $command->getHash();
+
+        if (!isset($hash) && isset($this->commands[$cmdID = $command->getId()])) {
+            $key = call_user_func($this->commands[$cmdID], $command);
+
+            if (isset($key)) {
+                $hash = $this->getKeyHash($key);
+                $command->setHash($hash);
+            }
+        }
+
+        return $hash;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getKeyHash($key)
+    {
+        $key = $this->extractKeyTag($key);
+        $hash = $this->hashGenerator->hash($key);
+
+        return $hash;
+    }
+
+    /**
+     * Checks if the specified array of keys will generate the same hash.
+     *
+     * @param  array $keys Array of keys.
+     * @return bool
+     */
+    protected function checkSameHashForKeys(Array $keys)
+    {
+        if (!$count = count($keys)) {
+            return false;
+        }
+
+        $currentKey = $this->extractKeyTag($keys[0]);
+
+        for ($i = 1; $i < $count; $i++) {
+            $nextKey = $this->extractKeyTag($keys[$i]);
+
+            if ($currentKey !== $nextKey) {
+                return false;
+            }
+
+            $currentKey = $nextKey;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns only the hashable part of a key (delimited by "{...}"), or the
+     * whole key if a key tag is not found in the string.
+     *
+     * @param  string $key A key.
+     * @return string
+     */
+    protected function extractKeyTag($key)
+    {
+        if (false !== $start = strpos($key, '{')) {
+            if (false !== $end = strpos($key, '}', $start)) {
+                $key = substr($key, ++$start, $end - $start);
+            }
+        }
+
+        return $key;
+    }
+}

lib/Predis/Cluster/RedisClusterHashStrategy.php

@@ -0,0 +1,292 @@
+<?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\Cluster;
+
+use Predis\Cluster\Hash\CRC16HashGenerator;
+use Predis\Command\CommandInterface;
+use Predis\Command\ScriptedCommand;
+
+/**
+ * Default class used by Predis to calculate hashes out of keys of
+ * commands supported by redis-cluster.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class RedisClusterHashStrategy implements CommandHashStrategyInterface
+{
+    private $commands;
+    private $hashGenerator;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->commands = $this->getDefaultCommands();
+        $this->hashGenerator = new CRC16HashGenerator();
+    }
+
+    /**
+     * Returns the default map of supported commands with their handlers.
+     *
+     * @return array
+     */
+    protected function getDefaultCommands()
+    {
+        $keyIsFirstArgument = array($this, 'getKeyFromFirstArgument');
+
+        return array(
+            /* commands operating on the key space */
+            'EXISTS'                => $keyIsFirstArgument,
+            'DEL'                   => array($this, 'getKeyFromAllArguments'),
+            'TYPE'                  => $keyIsFirstArgument,
+            'EXPIRE'                => $keyIsFirstArgument,
+            'EXPIREAT'              => $keyIsFirstArgument,
+            'PERSIST'               => $keyIsFirstArgument,
+            'PEXPIRE'               => $keyIsFirstArgument,
+            'PEXPIREAT'             => $keyIsFirstArgument,
+            'TTL'                   => $keyIsFirstArgument,
+            'PTTL'                  => $keyIsFirstArgument,
+            'SORT'                  => $keyIsFirstArgument, // TODO
+
+            /* commands operating on string values */
+            'APPEND'                => $keyIsFirstArgument,
+            'DECR'                  => $keyIsFirstArgument,
+            'DECRBY'                => $keyIsFirstArgument,
+            'GET'                   => $keyIsFirstArgument,
+            'GETBIT'                => $keyIsFirstArgument,
+            'MGET'                  => array($this, 'getKeyFromAllArguments'),
+            'SET'                   => $keyIsFirstArgument,
+            'GETRANGE'              => $keyIsFirstArgument,
+            'GETSET'                => $keyIsFirstArgument,
+            'INCR'                  => $keyIsFirstArgument,
+            'INCRBY'                => $keyIsFirstArgument,
+            'SETBIT'                => $keyIsFirstArgument,
+            'SETEX'                 => $keyIsFirstArgument,
+            'MSET'                  => array($this, 'getKeyFromInterleavedArguments'),
+            'MSETNX'                => array($this, 'getKeyFromInterleavedArguments'),
+            'SETNX'                 => $keyIsFirstArgument,
+            'SETRANGE'              => $keyIsFirstArgument,
+            'STRLEN'                => $keyIsFirstArgument,
+            'SUBSTR'                => $keyIsFirstArgument,
+            'BITCOUNT'              => $keyIsFirstArgument,
+
+            /* commands operating on lists */
+            'LINSERT'               => $keyIsFirstArgument,
+            'LINDEX'                => $keyIsFirstArgument,
+            'LLEN'                  => $keyIsFirstArgument,
+            'LPOP'                  => $keyIsFirstArgument,
+            'RPOP'                  => $keyIsFirstArgument,
+            'BLPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
+            'BRPOP'                 => array($this, 'getKeyFromBlockingListCommands'),
+            'LPUSH'                 => $keyIsFirstArgument,
+            'LPUSHX'                => $keyIsFirstArgument,
+            'RPUSH'                 => $keyIsFirstArgument,
+            'RPUSHX'                => $keyIsFirstArgument,
+            'LRANGE'                => $keyIsFirstArgument,
+            'LREM'                  => $keyIsFirstArgument,
+            'LSET'                  => $keyIsFirstArgument,
+            'LTRIM'                 => $keyIsFirstArgument,
+
+            /* commands operating on sets */
+            'SADD'                  => $keyIsFirstArgument,
+            'SCARD'                 => $keyIsFirstArgument,
+            'SISMEMBER'             => $keyIsFirstArgument,
+            'SMEMBERS'              => $keyIsFirstArgument,
+            'SSCAN'                 => $keyIsFirstArgument,
+            'SPOP'                  => $keyIsFirstArgument,
+            'SRANDMEMBER'           => $keyIsFirstArgument,
+            'SREM'                  => $keyIsFirstArgument,
+
+            /* commands operating on sorted sets */
+            'ZADD'                  => $keyIsFirstArgument,
+            'ZCARD'                 => $keyIsFirstArgument,
+            'ZCOUNT'                => $keyIsFirstArgument,
+            'ZINCRBY'               => $keyIsFirstArgument,
+            'ZRANGE'                => $keyIsFirstArgument,
+            'ZRANGEBYSCORE'         => $keyIsFirstArgument,
+            'ZRANK'                 => $keyIsFirstArgument,
+            'ZREM'                  => $keyIsFirstArgument,
+            'ZREMRANGEBYRANK'       => $keyIsFirstArgument,
+            'ZREMRANGEBYSCORE'      => $keyIsFirstArgument,
+            'ZREVRANGE'             => $keyIsFirstArgument,
+            'ZREVRANGEBYSCORE'      => $keyIsFirstArgument,
+            'ZREVRANK'              => $keyIsFirstArgument,
+            'ZSCORE'                => $keyIsFirstArgument,
+            'ZSCAN'                 => $keyIsFirstArgument,
+
+            /* commands operating on hashes */
+            'HDEL'                  => $keyIsFirstArgument,
+            'HEXISTS'               => $keyIsFirstArgument,
+            'HGET'                  => $keyIsFirstArgument,
+            'HGETALL'               => $keyIsFirstArgument,
+            'HMGET'                 => $keyIsFirstArgument,
+            'HMSET'                 => $keyIsFirstArgument,
+            'HINCRBY'               => $keyIsFirstArgument,
+            'HINCRBYFLOAT'          => $keyIsFirstArgument,
+            'HKEYS'                 => $keyIsFirstArgument,
+            'HLEN'                  => $keyIsFirstArgument,
+            'HSET'                  => $keyIsFirstArgument,
+            'HSETNX'                => $keyIsFirstArgument,
+            'HVALS'                 => $keyIsFirstArgument,
+            'HSCAN'                 => $keyIsFirstArgument,
+
+            /* scripting */
+            'EVAL'                  => array($this, 'getKeyFromScriptingCommands'),
+            'EVALSHA'               => array($this, 'getKeyFromScriptingCommands'),
+        );
+    }
+
+    /**
+     * Returns the list of IDs for the supported commands.
+     *
+     * @return array
+     */
+    public function getSupportedCommands()
+    {
+        return array_keys($this->commands);
+    }
+
+    /**
+     * Sets an handler for the specified command ID.
+     *
+     * The signature of the callback must have a single parameter
+     * of type Predis\Command\CommandInterface.
+     *
+     * When the callback argument is omitted or NULL, the previously
+     * associated handler for the specified command ID is removed.
+     *
+     * @param string $commandId The ID of the command to be handled.
+     * @param mixed  $callback  A valid callable object or NULL.
+     */
+    public function setCommandHandler($commandId, $callback = null)
+    {
+        $commandId = strtoupper($commandId);
+
+        if (!isset($callback)) {
+            unset($this->commands[$commandId]);
+
+            return;
+        }
+
+        if (!is_callable($callback)) {
+            throw new \InvalidArgumentException("Callback must be a valid callable object or NULL");
+        }
+
+        $this->commands[$commandId] = $callback;
+    }
+
+    /**
+     * Extracts the key from the first argument of a command instance.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromFirstArgument(CommandInterface $command)
+    {
+        return $command->getArgument(0);
+    }
+
+    /**
+     * Extracts the key from a command that can accept multiple keys ensuring
+     * that only one key is actually specified to comply with redis-cluster.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromAllArguments(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if (count($arguments) === 1) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from a command that can accept multiple keys ensuring
+     * that only one key is actually specified to comply with redis-cluster.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromInterleavedArguments(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if (count($arguments) === 2) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from BLPOP and BRPOP commands ensuring that only one key
+     * is actually specified to comply with redis-cluster.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromBlockingListCommands(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+
+        if (count($arguments) === 2) {
+            return $arguments[0];
+        }
+    }
+
+    /**
+     * Extracts the key from EVAL and EVALSHA commands.
+     *
+     * @param  CommandInterface $command Command instance.
+     * @return string
+     */
+    protected function getKeyFromScriptingCommands(CommandInterface $command)
+    {
+        if ($command instanceof ScriptedCommand) {
+            $keys = $command->getKeys();
+        } else {
+            $keys = array_slice($args = $command->getArguments(), 2, $args[1]);
+        }
+
+        if (count($keys) === 1) {
+            return $keys[0];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHash(CommandInterface $command)
+    {
+        $hash = $command->getHash();
+
+        if (!isset($hash) && isset($this->commands[$cmdID = $command->getId()])) {
+            $key = call_user_func($this->commands[$cmdID], $command);
+
+            if (isset($key)) {
+                $hash = $this->hashGenerator->hash($key);
+                $command->setHash($hash);
+            }
+        }
+
+        return $hash;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getKeyHash($key)
+    {
+        return $this->hashGenerator->hash($key);
+    }
+}

lib/Predis/Collection/Iterator/CursorBasedIterator.php

@@ -11,23 +11,24 @@
 
 namespace Predis\Collection\Iterator;
 
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
 
 /**
- * Provides the base implementation for a fully-rewindable PHP iterator that can
- * incrementally iterate over cursor-based collections stored on Redis using the
- * commands in the `SCAN` family.
+ * Provides the base implementation for a fully-rewindable PHP iterator
+ * that can incrementally iterate over cursor-based collections stored
+ * on Redis using commands in the `SCAN` family.
  *
- * Given their incremental nature with multiple fetches, these kind of iterators
- * offer limited guarantees about the returned elements because the collection
- * can change several times during the iteration process.
+ * Given their incremental nature with multiple fetches, these kind of
+ * iterators offer limited guarantees about the returned elements because
+ * the collection can change several times during the iteration process.
  *
  * @see http://redis.io/commands/scan
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class CursorBasedIterator implements \Iterator
+abstract class CursorBasedIterator implements Iterator
 {
     protected $client;
     protected $match;
@@ -43,7 +44,7 @@ abstract class CursorBasedIterator implements \Iterator
     /**
      * @param ClientInterface $client Client connected to Redis.
      * @param string          $match  Pattern to match during the server-side iteration.
-     * @param int             $count  Hint used by Redis to compute the number of results per iteration.
+     * @param int             $count  Hints used by Redis to compute the number of results per iteration.
      */
     public function __construct(ClientInterface $client, $match = null, $count = null)
     {
@@ -55,18 +56,17 @@ abstract class CursorBasedIterator implements \Iterator
     }
 
     /**
-     * Ensures that the client supports the specified Redis command required to
-     * fetch elements from the server to perform the iteration.
+     * Ensures that the client instance supports the specified Redis
+     * command required to fetch elements from the server to perform
+     * the iteration.
      *
      * @param ClientInterface $client    Client connected to Redis.
      * @param string          $commandID Command ID.
-     *
-     * @throws NotSupportedException
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getCommandFactory()->supports($commandID)) {
-            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
+        if (!$client->getProfile()->supportsCommand($commandID)) {
+            throw new NotSupportedException("The specified server profile does not support the `$commandID` command.");
         }
     }
 
@@ -92,7 +92,7 @@ abstract class CursorBasedIterator implements \Iterator
     {
         $options = array();
 
-        if (strlen(strval($this->match)) > 0) {
+        if (strlen($this->match) > 0) {
             $options['MATCH'] = $this->match;
         }
 
@@ -104,16 +104,16 @@ abstract class CursorBasedIterator implements \Iterator
     }
 
     /**
-     * Fetches a new set of elements from the remote collection, effectively
-     * advancing the iteration process.
+     * Fetches a new set of elements from the remote collection,
+     * effectively advancing the iteration process.
      *
      * @return array
      */
     abstract protected function executeCommand();
 
     /**
-     * Populates the local buffer of elements fetched from the server during
-     * the iteration.
+     * Populates the local buffer of elements fetched from the
+     * server during the iteration.
      */
     protected function fetch()
     {
@@ -132,14 +132,13 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function extractNext()
     {
-        ++$this->position;
+        $this->position++;
         $this->current = array_shift($this->elements);
     }
 
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -149,7 +148,6 @@ abstract class CursorBasedIterator implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -158,7 +156,6 @@ abstract class CursorBasedIterator implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -167,28 +164,24 @@ abstract class CursorBasedIterator implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function next()
     {
-        tryFetch: {
-            if (!$this->elements && $this->fetchmore) {
-                $this->fetch();
-            }
+        if (!$this->elements && $this->fetchmore) {
+            $this->fetch();
+        }
 
-            if ($this->elements) {
-                $this->extractNext();
-            } elseif ($this->cursor) {
-                goto tryFetch;
-            } else {
-                $this->valid = false;
-            }
+        if ($this->elements) {
+            $this->extractNext();
+        } elseif ($this->cursor) {
+            $this->next();
+        } else {
+            $this->valid = false;
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;

lib/Predis/Collection/Iterator/HashKey.php

@@ -14,11 +14,11 @@ namespace Predis\Collection\Iterator;
 use Predis\ClientInterface;
 
 /**
- * Abstracts the iteration of fields and values of an hash by leveraging the
- * HSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
+ * Abstracts the iteration of fields and values of an hash
+ * by leveraging the 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
@@ -51,8 +51,6 @@ class HashKey extends CursorBasedIterator
     protected function extractNext()
     {
         $this->position = key($this->elements);
-        $this->current = current($this->elements);
-
-        unset($this->elements[$this->position]);
+        $this->current = array_shift($this->elements);
     }
 }

lib/Predis/Collection/Iterator/Keyspace.php

@@ -14,11 +14,11 @@ namespace Predis\Collection\Iterator;
 use Predis\ClientInterface;
 
 /**
- * Abstracts the iteration of the keyspace on a Redis instance by leveraging the
- * SCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
+ * Abstracts the iteration of the keyspace on a Redis instance
+ * by leveraging the 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

lib/Predis/Collection/Iterator/ListKey.php

@@ -11,6 +11,8 @@
 
 namespace Predis\Collection\Iterator;
 
+use InvalidArgumentException;
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
 
@@ -25,10 +27,9 @@ 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;
@@ -44,15 +45,13 @@ class ListKey implements \Iterator
      * @param ClientInterface $client Client connected to Redis.
      * @param string          $key    Redis list key.
      * @param int             $count  Number of items retrieved on each fetch operation.
-     *
-     * @throws \InvalidArgumentException
      */
     public function __construct(ClientInterface $client, $key, $count = 10)
     {
         $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;
@@ -63,18 +62,17 @@ class ListKey implements \Iterator
     }
 
     /**
-     * Ensures that the client instance supports the specified Redis command
-     * required to fetch elements from the server to perform the iteration.
+     * Ensures that the client instance supports the specified Redis
+     * command required to fetch elements from the server to perform
+     * the iteration.
      *
      * @param ClientInterface $client    Client connected to Redis.
      * @param string          $commandID Command ID.
-     *
-     * @throws NotSupportedException
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getCommandFactory()->supports($commandID)) {
-            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
+        if (!$client->getProfile()->supportsCommand($commandID)) {
+            throw new NotSupportedException("The specified server profile does not support the `$commandID` command.");
         }
     }
 
@@ -91,8 +89,8 @@ class ListKey implements \Iterator
     }
 
     /**
-     * Fetches a new set of elements from the remote collection, effectively
-     * advancing the iteration process.
+     * Fetches a new set of elements from the remote collection,
+     * effectively advancing the iteration process.
      *
      * @return array
      */
@@ -102,8 +100,8 @@ class ListKey implements \Iterator
     }
 
     /**
-     * Populates the local buffer of elements fetched from the server during the
-     * iteration.
+     * Populates the local buffer of elements fetched from the
+     * server during the iteration.
      */
     protected function fetch()
     {
@@ -121,14 +119,13 @@ class ListKey implements \Iterator
      */
     protected function extractNext()
     {
-        ++$this->position;
+        $this->position++;
         $this->current = array_shift($this->elements);
     }
 
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -138,7 +135,6 @@ class ListKey implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -147,7 +143,6 @@ class ListKey implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -156,7 +151,6 @@ class ListKey implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function next()
     {
         if (!$this->elements && $this->fetchmore) {
@@ -173,7 +167,6 @@ class ListKey implements \Iterator
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;

lib/Predis/Collection/Iterator/SetKey.php

@@ -14,11 +14,11 @@ namespace Predis\Collection\Iterator;
 use Predis\ClientInterface;
 
 /**
- * Abstracts the iteration of members stored in a set by leveraging the SSCAN
- * command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
+ * Abstracts the iteration of members stored in a set by
+ * leveraging the SSCAN 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

lib/Predis/Collection/Iterator/SortedSetKey.php

@@ -14,11 +14,11 @@ namespace Predis\Collection\Iterator;
 use Predis\ClientInterface;
 
 /**
- * Abstracts the iteration of members stored in a sorted set by leveraging the
- * ZSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
+ * Abstracts the iteration of members stored in a sorted set
+ * by leveraging the 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
@@ -50,9 +50,9 @@ class SortedSetKey extends CursorBasedIterator
      */
     protected function extractNext()
     {
-        $this->position = key($this->elements);
-        $this->current = current($this->elements);
+        $element = array_shift($this->elements);
 
-        unset($this->elements[$this->position]);
+        $this->position = $element[0];
+        $this->current = $element[1];
     }
 }

lib/Predis/Command/AbstractCommand.php

@@ -0,0 +1,158 @@
+<?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;
+
+/**
+ * Base class for Redis commands.
+ *
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+abstract class AbstractCommand implements CommandInterface
+{
+    private $hash;
+    private $arguments = array();
+
+    /**
+     * Returns a filtered array of the arguments.
+     *
+     * @param  array $arguments List of arguments.
+     * @return array
+     */
+    protected function filterArguments(Array $arguments)
+    {
+        return $arguments;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(Array $arguments)
+    {
+        $this->arguments = $this->filterArguments($arguments);
+        unset($this->hash);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setRawArguments(Array $arguments)
+    {
+        $this->arguments = $arguments;
+        unset($this->hash);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArgument($index)
+    {
+        if (isset($this->arguments[$index])) {
+            return $this->arguments[$index];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setHash($hash)
+    {
+        $this->hash = $hash;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHash()
+    {
+        if (isset($this->hash)) {
+            return $this->hash;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return $data;
+    }
+
+    /**
+     * Helper function used to reduce a list of arguments to a string.
+     *
+     * @param  string $accumulator Temporary string.
+     * @param  string $argument    Current argument.
+     * @return string
+     */
+    protected function toStringArgumentReducer($accumulator, $argument)
+    {
+        if (strlen($argument) > 32) {
+            $argument = substr($argument, 0, 32) . '[...]';
+        }
+
+        $accumulator .= " $argument";
+
+        return $accumulator;
+    }
+
+    /**
+     * Returns a partial string representation of the command with its arguments.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return array_reduce(
+            $this->getArguments(),
+            array($this, 'toStringArgumentReducer'),
+            $this->getId()
+        );
+    }
+
+    /**
+     * Normalizes the arguments array passed to a Redis command.
+     *
+     * @param  array $arguments Arguments for a command.
+     * @return array
+     */
+    public static function normalizeArguments(Array $arguments)
+    {
+        if (count($arguments) === 1 && is_array($arguments[0])) {
+            return $arguments[0];
+        }
+
+        return $arguments;
+    }
+
+    /**
+     * Normalizes the arguments array passed to a variadic Redis command.
+     *
+     * @param  array $arguments Arguments for a command.
+     * @return array
+     */
+    public static function normalizeVariadic(Array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            return array_merge(array($arguments[0]), $arguments[1]);
+        }
+
+        return $arguments;
+    }
+}

lib/Predis/Command/CommandInterface.php

@@ -13,46 +13,44 @@ namespace Predis\Command;
 
 /**
  * Defines an abstraction representing a Redis command.
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface CommandInterface
 {
     /**
-     * Returns the ID of the Redis command. By convention, command identifiers
-     * must always be uppercase.
+     * Gets the ID of a Redis command.
      *
      * @return string
      */
     public function getId();
 
     /**
-     * Assign the specified slot to the command for clustering distribution.
+     * Set the hash for the command.
      *
-     * @param int $slot Slot ID.
+     * @param int $hash Calculated hash.
      */
-    public function setSlot($slot);
+    public function setHash($hash);
 
     /**
-     * Returns the assigned slot of the command for clustering distribution.
+     * Returns the hash of the command.
      *
-     * @return int|null
+     * @return int
      */
-    public function getSlot();
+    public function getHash();
 
     /**
      * Sets the arguments for the command.
      *
      * @param array $arguments List of arguments.
      */
-    public function setArguments(array $arguments);
+    public function setArguments(Array $arguments);
 
     /**
      * Sets the raw arguments for the command without processing them.
      *
      * @param array $arguments List of arguments.
      */
-    public function setRawArguments(array $arguments);
+    public function setRawArguments(Array $arguments);
 
     /**
      * Gets the arguments of the command.
@@ -64,17 +62,15 @@ interface CommandInterface
     /**
      * Gets the argument of the command at the specified index.
      *
-     * @param int $index Index of the desired argument.
-     *
-     * @return mixed|null
+     * @param  int   $index Index of the desired argument.
+     * @return mixed
      */
     public function getArgument($index);
 
     /**
-     * Parses a raw response and returns a PHP object.
-     *
-     * @param string|array|null $data Binary string containing the whole response.
+     * Parses a reply buffer and returns a PHP object.
      *
+     * @param  string $data Binary string containing the whole reply.
      * @return mixed
      */
     public function parseResponse($data);

lib/Predis/Command/ConnectionAuth.php

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

lib/Predis/Command/ConnectionEcho.php

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

lib/Predis/Command/ConnectionPing.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/ping
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PING extends RedisCommand
+class ConnectionPing extends AbstractCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class PING extends RedisCommand
     {
         return 'PING';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return $data === 'PONG' ? true : false;
+    }
 }

lib/Predis/Command/ConnectionQuit.php

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

lib/Predis/Command/ConnectionSelect.php

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

lib/Predis/Command/HashDelete.php

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

lib/Predis/Command/HashExists.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hexists
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HEXISTS extends RedisCommand
+class HashExists extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class HEXISTS extends RedisCommand
     {
         return 'HEXISTS';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/HashGet.php

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

lib/Predis/Command/HashGetAll.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hgetall
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HGETALL extends RedisCommand
+class HashGetAll extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -35,7 +32,7 @@ class HGETALL extends RedisCommand
     {
         $result = array();
 
-        for ($i = 0; $i < count($data); ++$i) {
+        for ($i = 0; $i < count($data); $i++) {
             $result[$data[$i]] = $data[++$i];
         }
 

lib/Predis/Command/HashGetMultiple.php

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

lib/Predis/Command/HashIncrementBy.php

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

lib/Predis/Command/HashIncrementByFloat.php

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

lib/Predis/Command/HashKeys.php

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

lib/Predis/Command/HashLength.php

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

lib/Predis/Command/HashScan.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hscan
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSCAN extends RedisCommand
+class HashScan extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -31,21 +28,20 @@ class HSCAN extends RedisCommand
     /**
      * {@inheritdoc}
      */
-    public function setArguments(array $arguments)
+    protected function filterArguments(Array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        parent::setArguments($arguments);
+        return $arguments;
     }
 
     /**
      * Returns a list of options and modifiers compatible with Redis.
      *
-     * @param array $options List of options.
-     *
+     * @param  array $options List of options.
      * @return array
      */
     protected function prepareOptions($options)
@@ -72,10 +68,11 @@ class HSCAN extends RedisCommand
     public function parseResponse($data)
     {
         if (is_array($data)) {
+            $data[0] = (int) $data[0];
             $fields = $data[1];
             $result = array();
 
-            for ($i = 0; $i < count($fields); ++$i) {
+            for ($i = 0; $i < count($fields); $i++) {
                 $result[$fields[$i]] = $fields[++$i];
             }
 

lib/Predis/Command/HashSet.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hset
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSET extends RedisCommand
+class HashSet extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class HSET extends RedisCommand
     {
         return 'HSET';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/HashSetMultiple.php

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

lib/Predis/Command/HashSetPreserve.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/hsetnx
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class HSETNX extends RedisCommand
+class HashSetPreserve extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class HSETNX extends RedisCommand
     {
         return 'HSETNX';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/HashValues.php

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

lib/Predis/Command/KeyDelete.php

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

lib/Predis/Command/KeyDump.php

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

lib/Predis/Command/KeyExists.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/exists
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXISTS extends RedisCommand
+class KeyExists extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class EXISTS extends RedisCommand
     {
         return 'EXISTS';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/KeyExpire.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/expire
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXPIRE extends RedisCommand
+class KeyExpire extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class EXPIRE extends RedisCommand
     {
         return 'EXPIRE';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/KeyExpireAt.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/expireat
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EXPIREAT extends RedisCommand
+class KeyExpireAt extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class EXPIREAT extends RedisCommand
     {
         return 'EXPIREAT';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/KeyKeys.php

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

lib/Predis/Command/KeyKeysV12x.php

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

lib/Predis/Command/KeyMove.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/move
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class MOVE extends RedisCommand
+class KeyMove extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class MOVE extends RedisCommand
     {
         return 'MOVE';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/KeyPersist.php

@@ -9,16 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Redis;
-
-use Predis\Command\Command as RedisCommand;
+namespace Predis\Command;
 
 /**
  * @link http://redis.io/commands/persist
- *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PERSIST extends RedisCommand
+class KeyPersist extends PrefixableCommand
 {
     /**
      * {@inheritdoc}
@@ -27,4 +24,12 @@ class PERSIST extends RedisCommand
     {
         return 'PERSIST';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        return (bool) $data;
+    }
 }

lib/Predis/Command/KeyPreciseExpire.php

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