Run php-cs-fixer with new configuration.

src/Client.php

@@ -16,8 +16,8 @@ use Predis\Command\RawCommand;
 use Predis\Command\ScriptCommand;
 use Predis\Configuration\Options;
 use Predis\Configuration\OptionsInterface;
-use Predis\Connection\ConnectionInterface;
 use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ParametersInterface;
 use Predis\Monitor\Consumer as MonitorConsumer;
 use Predis\Pipeline\Pipeline;
@@ -64,9 +64,9 @@ class Client implements ClientInterface
      *
      * @param mixed $options Client options.
      *
+     * @throws \InvalidArgumentException
      * @return OptionsInterface
      *
-     * @throws \InvalidArgumentException
      */
     protected function createOptions($options)
     {
@@ -96,9 +96,9 @@ class Client implements ClientInterface
      *
      * @param mixed $parameters Connection parameters or connection instance.
      *
+     * @throws \InvalidArgumentException
      * @return ConnectionInterface
      *
-     * @throws \InvalidArgumentException
      */
     protected function createConnection($parameters)
     {
@@ -189,9 +189,9 @@ class Client implements ClientInterface
      *
      * @param string $connectionID Identifier of a connection.
      *
+     * @throws \InvalidArgumentException
      * @return Client
      *
-     * @throws \InvalidArgumentException
      */
     public function getClientFor($connectionID)
     {
@@ -253,9 +253,9 @@ class Client implements ClientInterface
      *
      * @param string $connectionID Index or alias of the single connection.
      *
+     * @throws NotSupportedException
      * @return Connection\NodeConnectionInterface
      *
-     * @throws NotSupportedException
      */
     public function getConnectionById($connectionID)
     {
@@ -342,9 +342,9 @@ class Client implements ClientInterface
      * @param CommandInterface       $command  Redis command that generated the error.
      * @param ErrorResponseInterface $response Instance of the error response.
      *
+     * @throws ServerException
      * @return mixed
      *
-     * @throws ServerException
      */
     protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
     {

src/Cluster/RedisStrategy.php

@@ -11,9 +11,9 @@
 
 namespace Predis\Cluster;
 
-use Predis\NotSupportedException;
-use Predis\Cluster\Hash\HashGeneratorInterface;
 use Predis\Cluster\Hash\CRC16;
+use Predis\Cluster\Hash\HashGeneratorInterface;
+use Predis\NotSupportedException;
 
 /**
  * Default class used by Predis to calculate hashes out of keys of

src/Command/ZSetReverseRangeByLex.php

@@ -3,6 +3,8 @@
 /*
  * 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.
  */

src/Connection/AbstractConnection.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\CommunicationException;
 use Predis\Command\CommandInterface;
+use Predis\CommunicationException;
 use Predis\Protocol\ProtocolException;
 
 /**
@@ -51,9 +51,9 @@ abstract class AbstractConnection implements NodeConnectionInterface
      *
      * @param ParametersInterface $parameters Initialization parameters for the connection.
      *
+     * @throws \InvalidArgumentException
      * @return ParametersInterface
      *
-     * @throws \InvalidArgumentException
      */
     protected function assertParameters(ParametersInterface $parameters)
     {

src/Connection/Aggregate/PredisCluster.php

@@ -11,11 +11,11 @@
 
 namespace Predis\Connection\Aggregate;
 
-use Predis\NotSupportedException;
 use Predis\Cluster\PredisStrategy;
 use Predis\Cluster\StrategyInterface;
 use Predis\Command\CommandInterface;
 use Predis\Connection\NodeConnectionInterface;
+use Predis\NotSupportedException;
 
 /**
  * Abstraction for a cluster of aggregate connections to various Redis servers

src/Connection/Aggregate/RedisCluster.php

@@ -11,13 +11,13 @@
 
 namespace Predis\Connection\Aggregate;
 
-use Predis\NotSupportedException;
-use Predis\Cluster\StrategyInterface;
 use Predis\Cluster\RedisStrategy as RedisClusterStrategy;
+use Predis\Cluster\StrategyInterface;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
-use Predis\Connection\NodeConnectionInterface;
 use Predis\Connection\FactoryInterface;
+use Predis\Connection\NodeConnectionInterface;
+use Predis\NotSupportedException;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 
 /**
@@ -313,9 +313,9 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      *
      * @param int $slot Slot index.
      *
+     * @throws \OutOfBoundsException
      * @return NodeConnectionInterface
      *
-     * @throws \OutOfBoundsException
      */
     public function getConnectionBySlot($slot)
     {

src/Connection/Factory.php

@@ -34,9 +34,9 @@ class Factory implements FactoryInterface
      *
      * @param mixed $initializer FQN of a connection class or a callable for lazy initialization.
      *
+     * @throws \InvalidArgumentException
      * @return mixed
      *
-     * @throws \InvalidArgumentException
      */
     protected function checkInitializer($initializer)
     {

src/Connection/Parameters.php

@@ -69,9 +69,9 @@ class Parameters implements ParametersInterface
      *
      * @param string $uri URI string.
      *
+     * @throws \InvalidArgumentException
      * @return array
      *
-     * @throws \InvalidArgumentException
      */
     public static function parse($uri)
     {
@@ -111,9 +111,9 @@ class Parameters implements ParametersInterface
      *
      * @param string $uri URI string.
      *
+     * @throws \InvalidArgumentException
      * @return array
      *
-     * @throws \InvalidArgumentException
      */
     public static function parseIANA($uri)
     {

src/Connection/PhpiredisSocketConnection.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\NotSupportedException;
 use Predis\Command\CommandInterface;
+use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Status as StatusResponse;
 

src/Connection/PhpiredisStreamConnection.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\NotSupportedException;
 use Predis\Command\CommandInterface;
+use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Status as StatusResponse;
 

src/Connection/WebdisConnection.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Connection;
 
-use Predis\NotSupportedException;
 use Predis\Command\CommandInterface;
+use Predis\NotSupportedException;
 use Predis\Protocol\ProtocolException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Status as StatusResponse;
@@ -219,9 +219,9 @@ class WebdisConnection implements NodeConnectionInterface
      *
      * @param CommandInterface $command Command instance.
      *
+     * @throws NotSupportedException
      * @return string
      *
-     * @throws NotSupportedException
      */
     protected function getCommandId(CommandInterface $command)
     {

src/Monitor/Consumer.php

@@ -12,8 +12,8 @@
 namespace Predis\Monitor;
 
 use Predis\ClientInterface;
-use Predis\NotSupportedException;
 use Predis\Connection\AggregateConnectionInterface;
+use Predis\NotSupportedException;
 
 /**
  * Redis MONITOR consumer.

src/Pipeline/ConnectionErrorProof.php

@@ -11,11 +11,11 @@
 
 namespace Predis\Pipeline;
 
-use Predis\NotSupportedException;
 use Predis\CommunicationException;
+use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\NodeConnectionInterface;
-use Predis\Connection\Aggregate\ClusterInterface;
+use Predis\NotSupportedException;
 
 /**
  * Command pipeline that does not throw exceptions on connection errors, but

src/Pipeline/Pipeline.php

@@ -15,8 +15,8 @@ use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Command\CommandInterface;
-use Predis\Connection\ConnectionInterface;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Connection\ConnectionInterface;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
@@ -192,10 +192,10 @@ class Pipeline implements ClientContextInterface
      *
      * @param mixed $callable Optional callback for execution.
      *
-     * @return array
-     *
      * @throws \Exception
      * @throws \InvalidArgumentException
+     * @return array
+     *
      */
     public function execute($callable = null)
     {

src/Profile/Factory.php

@@ -83,9 +83,9 @@ final class Factory
      *
      * @param string $version Profile version or alias.
      *
+     * @throws ClientException
      * @return ProfileInterface
      *
-     * @throws ClientException
      */
     public static function get($version)
     {

src/Protocol/Text/Handler/StreamableMultiBulkResponse.php

@@ -13,8 +13,8 @@ namespace Predis\Protocol\Text\Handler;
 
 use Predis\CommunicationException;
 use Predis\Connection\CompositeConnectionInterface;
-use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
 use Predis\Protocol\ProtocolException;
+use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
 
 /**
  * Handler for the multibulk response type in the standard Redis wire protocol.

src/Protocol/Text/ProtocolProcessor.php

@@ -11,14 +11,14 @@
 
 namespace Predis\Protocol\Text;
 
-use Predis\CommunicationException;
 use Predis\Command\CommandInterface;
+use Predis\CommunicationException;
 use Predis\Connection\CompositeConnectionInterface;
 use Predis\Protocol\ProtocolException;
 use Predis\Protocol\ProtocolProcessorInterface;
-use Predis\Response\Status as StatusResponse;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
+use Predis\Response\Status as StatusResponse;
 
 /**
  * Protocol processor for the standard Redis wire protocol.

src/PubSub/Consumer.php

@@ -14,8 +14,8 @@ namespace Predis\PubSub;
 use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Command\Command;
-use Predis\NotSupportedException;
 use Predis\Connection\AggregateConnectionInterface;
+use Predis\NotSupportedException;
 
 /**
  * PUB/SUB consumer abstraction.

src/Replication/ReplicationStrategy.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Replication;
 
-use Predis\NotSupportedException;
 use Predis\Command\CommandInterface;
+use Predis\NotSupportedException;
 
 /**
  * Defines a strategy for master/slave replication.
@@ -41,9 +41,9 @@ class ReplicationStrategy
      *
      * @param CommandInterface $command Command instance.
      *
+     * @throws NotSupportedException
      * @return bool
      *
-     * @throws NotSupportedException
      */
     public function isReadOperation(CommandInterface $command)
     {

src/Transaction/MultiExec.php

@@ -14,14 +14,14 @@ namespace Predis\Transaction;
 use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
+use Predis\Command\CommandInterface;
 use Predis\CommunicationException;
+use Predis\Connection\AggregateConnectionInterface;
 use Predis\NotSupportedException;
+use Predis\Protocol\ProtocolException;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
 use Predis\Response\Status as StatusResponse;
-use Predis\Command\CommandInterface;
-use Predis\Connection\AggregateConnectionInterface;
-use Predis\Protocol\ProtocolException;
 
 /**
  * Client-side abstraction of a Redis transaction based on MULTI / EXEC.
@@ -168,9 +168,9 @@ class MultiExec implements ClientContextInterface
      * @param string $commandID Command ID.
      * @param array  $arguments Arguments for the command.
      *
+     * @throws ServerException
      * @return mixed
      *
-     * @throws ServerException
      */
     protected function call($commandID, array $arguments = array())
     {
@@ -190,10 +190,10 @@ class MultiExec implements ClientContextInterface
      *
      * @param CommandInterface $command Command instance.
      *
-     * @return $this|mixed
-     *
      * @throws AbortedMultiExecException
      * @throws CommunicationException
+     * @return $this|mixed
+     *
      */
     public function executeCommand(CommandInterface $command)
     {
@@ -221,10 +221,10 @@ class MultiExec implements ClientContextInterface
      *
      * @param string|array $keys One or more keys.
      *
-     * @return mixed
-     *
      * @throws NotSupportedException
      * @throws ClientException
+     * @return mixed
+     *
      */
     public function watch($keys)
     {
@@ -262,9 +262,9 @@ class MultiExec implements ClientContextInterface
     /**
      * Executes UNWATCH.
      *
+     * @throws NotSupportedException
      * @return MultiExec
      *
-     * @throws NotSupportedException
      */
     public function unwatch()
     {
@@ -350,11 +350,11 @@ class MultiExec implements ClientContextInterface
      *
      * @param mixed $callable Optional callback for execution.
      *
-     * @return array
-     *
      * @throws CommunicationException
      * @throws AbortedMultiExecException
      * @throws ServerException
+     * @return array
+     *
      */
     public function execute($callable = null)
     {