diff --git a/src/Client.php b/src/Client.php
index 11248850..e764060e 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -12,8 +12,10 @@
 
 namespace Predis;
 
-use Traversable;
+use ArrayIterator;
 
+use InvalidArgumentException;
+use IteratorAggregate;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
 use Predis\Command\ScriptCommand;
@@ -29,10 +31,8 @@ use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
 use Predis\Transaction\MultiExec as MultiExecTransaction;
-use IteratorAggregate;
 use ReturnTypeWillChange;
-use ArrayIterator;
-use InvalidArgumentException;
+use Traversable;
 
 /**
  * Client class used for connecting and executing commands on Redis.
diff --git a/src/Cluster/ClusterStrategy.php b/src/Cluster/ClusterStrategy.php
index 509f4834..60ba57c0 100644
--- a/src/Cluster/ClusterStrategy.php
+++ b/src/Cluster/ClusterStrategy.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Cluster;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Command\ScriptCommand;
-use InvalidArgumentException;
 
 /**
  * Common class implementing the logic needed to support clustering strategies.
diff --git a/src/Cluster/SlotMap.php b/src/Cluster/SlotMap.php
index 3dae34cb..f6900499 100644
--- a/src/Cluster/SlotMap.php
+++ b/src/Cluster/SlotMap.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Cluster;
 use ArrayAccess;
-use IteratorAggregate;
-use Countable;
-use ReturnTypeWillChange;
 use ArrayIterator;
+use Countable;
+use IteratorAggregate;
 use OutOfBoundsException;
+use ReturnTypeWillChange;
 
 /**
  * Slot map for redis-cluster.
diff --git a/src/Collection/Iterator/CursorBasedIterator.php b/src/Collection/Iterator/CursorBasedIterator.php
index 28aed560..575ce100 100644
--- a/src/Collection/Iterator/CursorBasedIterator.php
+++ b/src/Collection/Iterator/CursorBasedIterator.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Collection\Iterator;
 
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
-use Iterator;
 use ReturnTypeWillChange;
 
 /**
diff --git a/src/Collection/Iterator/ListKey.php b/src/Collection/Iterator/ListKey.php
index 28616900..9f4a21ca 100644
--- a/src/Collection/Iterator/ListKey.php
+++ b/src/Collection/Iterator/ListKey.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Collection\Iterator;
 
+use InvalidArgumentException;
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
-use Iterator;
 use ReturnTypeWillChange;
-use InvalidArgumentException;
 
 /**
  * Abstracts the iteration of items stored in a list by leveraging the LRANGE
diff --git a/src/Command/Factory.php b/src/Command/Factory.php
index 0c3e0b33..75433392 100644
--- a/src/Command/Factory.php
+++ b/src/Command/Factory.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Command;
 
+use InvalidArgumentException;
 use Predis\ClientException;
 use Predis\Command\Processor\ProcessorInterface;
-use InvalidArgumentException;
 
 /**
  * Base command factory class.
diff --git a/src/Command/Processor/KeyPrefixProcessor.php b/src/Command/Processor/KeyPrefixProcessor.php
index 6acdb409..7c683091 100644
--- a/src/Command/Processor/KeyPrefixProcessor.php
+++ b/src/Command/Processor/KeyPrefixProcessor.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Command\Processor;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Command\PrefixableCommandInterface;
-use InvalidArgumentException;
 
 /**
  * Command processor capable of prefixing keys stored in the arguments of Redis
diff --git a/src/Command/Processor/ProcessorChain.php b/src/Command/Processor/ProcessorChain.php
index 24caa345..8ecfc4d9 100644
--- a/src/Command/Processor/ProcessorChain.php
+++ b/src/Command/Processor/ProcessorChain.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Command\Processor;
 
-use Predis\Command\CommandInterface;
 use ArrayAccess;
 use ArrayIterator;
 use InvalidArgumentException;
+use Predis\Command\CommandInterface;
 use ReturnTypeWillChange;
 use Traversable;
 
diff --git a/src/Command/Redis/LMPOP.php b/src/Command/Redis/LMPOP.php
index 5965d546..db04fd10 100644
--- a/src/Command/Redis/LMPOP.php
+++ b/src/Command/Redis/LMPOP.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Command\Redis;
 
+use \Predis\Command\Traits\Keys;
 use Predis\Command\Command as RedisCommand;
 use Predis\Command\Traits\Count;
-use \Predis\Command\Traits\Keys;
 use Predis\Command\Traits\LeftRight;
 
 class LMPOP extends RedisCommand
diff --git a/src/Command/Redis/ZMPOP.php b/src/Command/Redis/ZMPOP.php
index c2b13d91..4adc0cca 100644
--- a/src/Command/Redis/ZMPOP.php
+++ b/src/Command/Redis/ZMPOP.php
@@ -14,8 +14,8 @@ namespace Predis\Command\Redis;
 
 use Predis\Command\Command as RedisCommand;
 use Predis\Command\Traits\Count;
-use Predis\Command\Traits\MinMaxModifier;
 use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\MinMaxModifier;
 
 /**
  * @see https://redis.io/commands/zmpop/
diff --git a/src/CommunicationException.php b/src/CommunicationException.php
index b80e3194..eaede45e 100644
--- a/src/CommunicationException.php
+++ b/src/CommunicationException.php
@@ -12,8 +12,8 @@
 
 namespace Predis;
 
-use Predis\Connection\NodeConnectionInterface;
 use Exception;
+use Predis\Connection\NodeConnectionInterface;
 
 /**
  * Base exception class for network-related errors.
diff --git a/src/Configuration/Option/CRC16.php b/src/Configuration/Option/CRC16.php
index 5f7d5256..b1714492 100644
--- a/src/Configuration/Option/CRC16.php
+++ b/src/Configuration/Option/CRC16.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Configuration\Option;
 
+use InvalidArgumentException;
 use Predis\Cluster\Hash;
 use Predis\Configuration\OptionInterface;
 use Predis\Configuration\OptionsInterface;
-use InvalidArgumentException;
 
 /**
  * Configures an hash generator used by the redis-cluster connection backend.
diff --git a/src/Configuration/Option/Commands.php b/src/Configuration/Option/Commands.php
index e2e237a4..3d87d540 100644
--- a/src/Configuration/Option/Commands.php
+++ b/src/Configuration/Option/Commands.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Configuration\Option;
 
+use InvalidArgumentException;
 use Predis\Command\FactoryInterface;
 use Predis\Command\RawFactory;
 use Predis\Command\RedisFactory;
 use Predis\Configuration\OptionInterface;
 use Predis\Configuration\OptionsInterface;
-use InvalidArgumentException;
 
 /**
  * Configures a connection factory to be used by the client.
diff --git a/src/Configuration/Option/Connections.php b/src/Configuration/Option/Connections.php
index 2ef642b0..b13ea6e1 100644
--- a/src/Configuration/Option/Connections.php
+++ b/src/Configuration/Option/Connections.php
@@ -12,13 +12,13 @@
 
 namespace Predis\Configuration\Option;
 
+use InvalidArgumentException;
 use Predis\Configuration\OptionInterface;
 use Predis\Configuration\OptionsInterface;
 use Predis\Connection\Factory;
 use Predis\Connection\FactoryInterface;
-use Predis\Connection\PhpiredisStreamConnection;
 use Predis\Connection\PhpiredisSocketConnection;
-use InvalidArgumentException;
+use Predis\Connection\PhpiredisStreamConnection;
 
 /**
  * Configures a new connection factory instance.
diff --git a/src/Connection/AbstractConnection.php b/src/Connection/AbstractConnection.php
index bdfeef24..8f0b6900 100644
--- a/src/Connection/AbstractConnection.php
+++ b/src/Connection/AbstractConnection.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\CommunicationException;
 use Predis\Protocol\ProtocolException;
-use InvalidArgumentException;
 
 /**
  * Base class with the common logic used by connection classes to communicate
diff --git a/src/Connection/Cluster/PredisCluster.php b/src/Connection/Cluster/PredisCluster.php
index 5a5f9c93..84d33601 100644
--- a/src/Connection/Cluster/PredisCluster.php
+++ b/src/Connection/Cluster/PredisCluster.php
@@ -12,15 +12,15 @@
 
 namespace Predis\Connection\Cluster;
 
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
 use Predis\Cluster\PredisStrategy;
 use Predis\Cluster\StrategyInterface;
 use Predis\Command\CommandInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
-use IteratorAggregate;
-use Countable;
 use ReturnTypeWillChange;
-use ArrayIterator;
 
 /**
  * Abstraction for a cluster of aggregate connections to various Redis servers
diff --git a/src/Connection/Cluster/RedisCluster.php b/src/Connection/Cluster/RedisCluster.php
index 9a9a24f5..772e0dc6 100644
--- a/src/Connection/Cluster/RedisCluster.php
+++ b/src/Connection/Cluster/RedisCluster.php
@@ -12,6 +12,10 @@
 
 namespace Predis\Connection\Cluster;
 
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use OutOfBoundsException;
 use Predis\ClientException;
 use Predis\Cluster\RedisStrategy as RedisClusterStrategy;
 use Predis\Cluster\SlotMap;
@@ -22,15 +26,11 @@ use Predis\Connection\ConnectionException;
 use Predis\Connection\FactoryInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
+use Predis\Response\Error as ErrorResponse;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
-use Predis\Response\Error as ErrorResponse;
-use IteratorAggregate;
-use Countable;
-use Throwable;
 use ReturnTypeWillChange;
-use ArrayIterator;
-use OutOfBoundsException;
+use Throwable;
 
 /**
  * Abstraction for a Redis-backed cluster of nodes (Redis >= 3.0.0).
diff --git a/src/Connection/CompositeStreamConnection.php b/src/Connection/CompositeStreamConnection.php
index ea5a1a80..ad69cbc1 100644
--- a/src/Connection/CompositeStreamConnection.php
+++ b/src/Connection/CompositeStreamConnection.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Protocol\ProtocolProcessorInterface;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
-use InvalidArgumentException;
 
 /**
  * Connection abstraction to Redis servers based on PHP's stream that uses an
diff --git a/src/Connection/Factory.php b/src/Connection/Factory.php
index 378b3bb5..111e6bb1 100644
--- a/src/Connection/Factory.php
+++ b/src/Connection/Factory.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\RawCommand;
 use ReflectionClass;
 use UnexpectedValueException;
-use InvalidArgumentException;
 
 /**
  * Standard connection factory for creating connections to Redis nodes.
diff --git a/src/Connection/PhpiredisSocketConnection.php b/src/Connection/PhpiredisSocketConnection.php
index f3c1b16b..26a9b4af 100644
--- a/src/Connection/PhpiredisSocketConnection.php
+++ b/src/Connection/PhpiredisSocketConnection.php
@@ -12,13 +12,13 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\Status as StatusResponse;
-use InvalidArgumentException;
-use Closure;
 
 /**
  * This class provides the implementation of a Predis connection that uses the
diff --git a/src/Connection/PhpiredisStreamConnection.php b/src/Connection/PhpiredisStreamConnection.php
index 4ea880ab..5443d69d 100644
--- a/src/Connection/PhpiredisStreamConnection.php
+++ b/src/Connection/PhpiredisStreamConnection.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Status as StatusResponse;
-use InvalidArgumentException;
-use Closure;
 
 /**
  * This class provides the implementation of a Predis connection that uses PHP's
diff --git a/src/Connection/Replication/MasterSlaveReplication.php b/src/Connection/Replication/MasterSlaveReplication.php
index fd797f3e..d94c2adf 100644
--- a/src/Connection/Replication/MasterSlaveReplication.php
+++ b/src/Connection/Replication/MasterSlaveReplication.php
@@ -12,6 +12,7 @@
 
 namespace Predis\Connection\Replication;
 
+use InvalidArgumentException;
 use Predis\ClientException;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
@@ -21,7 +22,6 @@ use Predis\Connection\NodeConnectionInterface;
 use Predis\Replication\MissingMasterException;
 use Predis\Replication\ReplicationStrategy;
 use Predis\Response\ErrorInterface as ResponseErrorInterface;
-use InvalidArgumentException;
 
 /**
  * Aggregate connection handling replication of Redis nodes configured in a
diff --git a/src/Connection/Replication/SentinelReplication.php b/src/Connection/Replication/SentinelReplication.php
index b1428c56..feba381f 100644
--- a/src/Connection/Replication/SentinelReplication.php
+++ b/src/Connection/Replication/SentinelReplication.php
@@ -12,6 +12,7 @@
 
 namespace Predis\Connection\Replication;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
 use Predis\CommunicationException;
@@ -24,7 +25,6 @@ use Predis\Replication\RoleException;
 use Predis\Response\Error;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
-use InvalidArgumentException;
 
 /**
  * @author Daniele Alessandri <suppakilla@gmail.com>
diff --git a/src/Connection/StreamConnection.php b/src/Connection/StreamConnection.php
index cfd393a4..d68845c4 100644
--- a/src/Connection/StreamConnection.php
+++ b/src/Connection/StreamConnection.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\Status as StatusResponse;
-use InvalidArgumentException;
 
 /**
  * Standard connection to Redis servers implemented on top of PHP's streams.
diff --git a/src/Connection/WebdisConnection.php b/src/Connection/WebdisConnection.php
index b30ba5a5..17c3a421 100644
--- a/src/Connection/WebdisConnection.php
+++ b/src/Connection/WebdisConnection.php
@@ -12,13 +12,13 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Protocol\ProtocolException;
 use Predis\Response\Error as ErrorResponse;
 use Predis\Response\Status as StatusResponse;
-use Closure;
-use InvalidArgumentException;
 
 /**
  * This class implements a Predis connection that actually talks with Webdis
diff --git a/src/Monitor/Consumer.php b/src/Monitor/Consumer.php
index 8f95b293..d7f0954e 100644
--- a/src/Monitor/Consumer.php
+++ b/src/Monitor/Consumer.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Monitor;
 
+use Iterator;
 use Predis\ClientInterface;
 use Predis\Connection\Cluster\ClusterInterface;
 use Predis\NotSupportedException;
-use Iterator;
 use ReturnTypeWillChange;
 
 /**
diff --git a/src/Pipeline/Pipeline.php b/src/Pipeline/Pipeline.php
index f001036d..6326418d 100644
--- a/src/Pipeline/Pipeline.php
+++ b/src/Pipeline/Pipeline.php
@@ -12,6 +12,8 @@
 
 namespace Predis\Pipeline;
 
+use Exception;
+use InvalidArgumentException;
 use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
@@ -21,8 +23,6 @@ use Predis\Connection\Replication\ReplicationInterface;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
-use InvalidArgumentException;
-use Exception;
 use SplQueue;
 
 /**
diff --git a/src/Response/Iterator/MultiBulkIterator.php b/src/Response/Iterator/MultiBulkIterator.php
index 0ad284b5..cbc74a12 100644
--- a/src/Response/Iterator/MultiBulkIterator.php
+++ b/src/Response/Iterator/MultiBulkIterator.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Response\Iterator;
 
-use Predis\Response\ResponseInterface;
-use Iterator;
 use Countable;
+use Iterator;
+use Predis\Response\ResponseInterface;
 use ReturnTypeWillChange;
 
 /**
diff --git a/src/Response/Iterator/MultiBulkTuple.php b/src/Response/Iterator/MultiBulkTuple.php
index 08050278..45e22b6b 100644
--- a/src/Response/Iterator/MultiBulkTuple.php
+++ b/src/Response/Iterator/MultiBulkTuple.php
@@ -11,10 +11,10 @@
  */
 
 namespace Predis\Response\Iterator;
+use InvalidArgumentException;
 use OuterIterator;
 use ReturnTypeWillChange;
 use UnexpectedValueException;
-use InvalidArgumentException;
 
 /**
  * Outer iterator consuming streamable multibulk responses by yielding tuples of
diff --git a/src/Session/Handler.php b/src/Session/Handler.php
index 358058f5..6a0f935a 100644
--- a/src/Session/Handler.php
+++ b/src/Session/Handler.php
@@ -13,8 +13,8 @@
 namespace Predis\Session;
 
 use Predis\ClientInterface;
-use SessionHandlerInterface;
 use ReturnTypeWillChange;
+use SessionHandlerInterface;
 
 /**
  * Session handler class that relies on Predis\Client to store PHP's sessions
diff --git a/src/Transaction/MultiExec.php b/src/Transaction/MultiExec.php
index c39f55ce..420aa8b0 100644
--- a/src/Transaction/MultiExec.php
+++ b/src/Transaction/MultiExec.php
@@ -12,6 +12,8 @@
 
 namespace Predis\Transaction;
 
+use Exception;
+use InvalidArgumentException;
 use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
@@ -24,8 +26,6 @@ use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
 use Predis\Response\Status as StatusResponse;
 use SplQueue;
-use Exception;
-use InvalidArgumentException;
 
 /**
  * Client-side abstraction of a Redis transaction based on MULTI / EXEC.
diff --git a/tests/PHPUnit/PredisCommandTestCase.php b/tests/PHPUnit/PredisCommandTestCase.php
index 218006b2..26b7b52c 100644
--- a/tests/PHPUnit/PredisCommandTestCase.php
+++ b/tests/PHPUnit/PredisCommandTestCase.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Command\Redis;
 
-use PredisTestCase;
 use Predis\Client;
 use Predis\Command;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/PHPUnit/PredisConnectionTestCase.php b/tests/PHPUnit/PredisConnectionTestCase.php
index 9fc4099d..f96d2756 100644
--- a/tests/PHPUnit/PredisConnectionTestCase.php
+++ b/tests/PHPUnit/PredisConnectionTestCase.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 
 /**
  * @group realm-connection
diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php
index 9e5e3085..2dc0f54d 100644
--- a/tests/Predis/ClientTest.php
+++ b/tests/Predis/ClientTest.php
@@ -12,16 +12,16 @@
 
 namespace Predis;
 
-use PredisTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use Predis\Connection\ParametersInterface;
-use Predis\Command\Factory as CommandFactory;
-use Predis\Connection\NodeConnectionInterface;
-use Predis\Command\Processor\KeyPrefixProcessor;
-use Predis\Connection\Replication\MasterSlaveReplication;
-use stdClass;
-use ReflectionProperty;
 use Iterator;
+use PHPUnit\Framework\MockObject\MockObject;
+use Predis\Command\Factory as CommandFactory;
+use Predis\Command\Processor\KeyPrefixProcessor;
+use Predis\Connection\NodeConnectionInterface;
+use Predis\Connection\ParametersInterface;
+use Predis\Connection\Replication\MasterSlaveReplication;
+use PredisTestCase;
+use ReflectionProperty;
+use stdClass;
 
 /**
  *
diff --git a/tests/Predis/Cluster/PredisStrategyTest.php b/tests/Predis/Cluster/PredisStrategyTest.php
index a698365f..3b69eb0b 100644
--- a/tests/Predis/Cluster/PredisStrategyTest.php
+++ b/tests/Predis/Cluster/PredisStrategyTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Cluster;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Cluster/RedisStrategyTest.php b/tests/Predis/Cluster/RedisStrategyTest.php
index f3e2661b..bebecab3 100644
--- a/tests/Predis/Cluster/RedisStrategyTest.php
+++ b/tests/Predis/Cluster/RedisStrategyTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Cluster;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php b/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
index e0cbc361..171952c9 100644
--- a/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
+++ b/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
@@ -12,10 +12,10 @@
 
 namespace Predis\Command\Processor;
 
-use PredisTestCase;
-use Predis\Command\RawCommand;
-use Predis\Command\CommandInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use Predis\Command\CommandInterface;
+use Predis\Command\RawCommand;
+use PredisTestCase;
 use stdClass;
 
 /**
diff --git a/tests/Predis/Command/Processor/ProcessorChainTest.php b/tests/Predis/Command/Processor/ProcessorChainTest.php
index f81209d3..a0f97596 100644
--- a/tests/Predis/Command/Processor/ProcessorChainTest.php
+++ b/tests/Predis/Command/Processor/ProcessorChainTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Processor;
 
-use PredisTestCase;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 use stdClass;
 
 /**
diff --git a/tests/Predis/Command/ScriptCommandTest.php b/tests/Predis/Command/ScriptCommandTest.php
index 2d189518..293f7645 100644
--- a/tests/Predis/Command/ScriptCommandTest.php
+++ b/tests/Predis/Command/ScriptCommandTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
+use PredisTestCase;
 
 /**
  * @group realm-scripting
diff --git a/tests/Predis/Command/Traits/CountTest.php b/tests/Predis/Command/Traits/CountTest.php
index e1d4081d..bae54be0 100644
--- a/tests/Predis/Command/Traits/CountTest.php
+++ b/tests/Predis/Command/Traits/CountTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Traits;
 
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 use UnexpectedValueException;
 
 class CountTest extends PredisTestCase
diff --git a/tests/Predis/Command/Traits/LeftRightTest.php b/tests/Predis/Command/Traits/LeftRightTest.php
index 863e6753..3a0b0b61 100644
--- a/tests/Predis/Command/Traits/LeftRightTest.php
+++ b/tests/Predis/Command/Traits/LeftRightTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Traits;
 
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 use UnexpectedValueException;
 
 class LeftRightTest extends PredisTestCase
diff --git a/tests/Predis/Command/Traits/LimitTest.php b/tests/Predis/Command/Traits/LimitTest.php
index 365a19d5..7746c998 100644
--- a/tests/Predis/Command/Traits/LimitTest.php
+++ b/tests/Predis/Command/Traits/LimitTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Traits;
 
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 use UnexpectedValueException;
 
 class LimitTest extends PredisTestCase
diff --git a/tests/Predis/Command/Traits/MinMaxModifierTest.php b/tests/Predis/Command/Traits/MinMaxModifierTest.php
index 2e0f4317..5998a1b8 100644
--- a/tests/Predis/Command/Traits/MinMaxModifierTest.php
+++ b/tests/Predis/Command/Traits/MinMaxModifierTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Traits;
 
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 use UnexpectedValueException;
 
 class MinMaxModifierTest extends PredisTestCase
diff --git a/tests/Predis/Command/Traits/TimeoutTest.php b/tests/Predis/Command/Traits/TimeoutTest.php
index 29f9be26..77632747 100644
--- a/tests/Predis/Command/Traits/TimeoutTest.php
+++ b/tests/Predis/Command/Traits/TimeoutTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Command\Traits;
 
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 use UnexpectedValueException;
 
 class TimeoutTest extends PredisTestCase
diff --git a/tests/Predis/Command/Traits/To/ServerToTest.php b/tests/Predis/Command/Traits/To/ServerToTest.php
index f6cfe288..3a17458a 100644
--- a/tests/Predis/Command/Traits/To/ServerToTest.php
+++ b/tests/Predis/Command/Traits/To/ServerToTest.php
@@ -13,8 +13,8 @@
 namespace Predis\Command\Traits\To;
 
 use Predis\Command\Argument\Server\To;
-use PredisTestCase;
 use Predis\Command\Command as RedisCommand;
+use PredisTestCase;
 
 class ServerToTest extends PredisTestCase
 {
diff --git a/tests/Predis/CommunicationExceptionTest.php b/tests/Predis/CommunicationExceptionTest.php
index c18aadc7..2612fd29 100644
--- a/tests/Predis/CommunicationExceptionTest.php
+++ b/tests/Predis/CommunicationExceptionTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis;
 
-use PredisTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
 use Exception;
+use PHPUnit\Framework\MockObject\MockObject;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Configuration/Option/AggregateTest.php b/tests/Predis/Configuration/Option/AggregateTest.php
index cdd24348..ac985f1d 100644
--- a/tests/Predis/Configuration/Option/AggregateTest.php
+++ b/tests/Predis/Configuration/Option/AggregateTest.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Configuration\Option;
 
+use function PHPSTORM_META\expectedArguments;
 use PHPUnit\Framework\MockObject\MockObject;
-use PredisTestCase;
 use Predis\Configuration\OptionsInterface;
 
-use function PHPSTORM_META\expectedArguments;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Configuration/Option/CRC16Test.php b/tests/Predis/Configuration/Option/CRC16Test.php
index d9b2a6d6..9b9a3f4d 100644
--- a/tests/Predis/Configuration/Option/CRC16Test.php
+++ b/tests/Predis/Configuration/Option/CRC16Test.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Configuration/Option/ClusterTest.php b/tests/Predis/Configuration/Option/ClusterTest.php
index abbd8b7f..d1792ea3 100644
--- a/tests/Predis/Configuration/Option/ClusterTest.php
+++ b/tests/Predis/Configuration/Option/ClusterTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Configuration/Option/CommandsTest.php b/tests/Predis/Configuration/Option/CommandsTest.php
index 20637f3e..0e17eaef 100644
--- a/tests/Predis/Configuration/Option/CommandsTest.php
+++ b/tests/Predis/Configuration/Option/CommandsTest.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use Predis\Configuration\OptionsInterface;
 use Predis\Command\Processor\KeyPrefixProcessor;
 use Predis\Command\RedisFactory;
+use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 use stdClass;
 
 /**
diff --git a/tests/Predis/Configuration/Option/ConnectionsTest.php b/tests/Predis/Configuration/Option/ConnectionsTest.php
index 7d7fc6a3..40890b89 100644
--- a/tests/Predis/Configuration/Option/ConnectionsTest.php
+++ b/tests/Predis/Configuration/Option/ConnectionsTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 use stdClass;
 
 /**
diff --git a/tests/Predis/Configuration/Option/ExceptionsTest.php b/tests/Predis/Configuration/Option/ExceptionsTest.php
index bd447500..4556038f 100644
--- a/tests/Predis/Configuration/Option/ExceptionsTest.php
+++ b/tests/Predis/Configuration/Option/ExceptionsTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 use stdClass;
 
 /**
diff --git a/tests/Predis/Configuration/Option/PrefixTest.php b/tests/Predis/Configuration/Option/PrefixTest.php
index 4f2e494b..d3df5709 100644
--- a/tests/Predis/Configuration/Option/PrefixTest.php
+++ b/tests/Predis/Configuration/Option/PrefixTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Configuration/Option/ReplicationTest.php b/tests/Predis/Configuration/Option/ReplicationTest.php
index 8381e0b1..cb0c7ac5 100644
--- a/tests/Predis/Configuration/Option/ReplicationTest.php
+++ b/tests/Predis/Configuration/Option/ReplicationTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Configuration\Option;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Configuration\OptionsInterface;
+use PredisTestCase;
 use ReflectionProperty;
 
 /**
diff --git a/tests/Predis/Configuration/OptionsTest.php b/tests/Predis/Configuration/OptionsTest.php
index 97ae6537..8a80459c 100644
--- a/tests/Predis/Configuration/OptionsTest.php
+++ b/tests/Predis/Configuration/OptionsTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Configuration;
 
+use Exception;
 use PredisTestCase;
 use stdClass;
-use Exception;
 
 /**
  * @todo Use mock objects to test the inner workings of the Options class.
diff --git a/tests/Predis/Connection/Cluster/RedisClusterTest.php b/tests/Predis/Connection/Cluster/RedisClusterTest.php
index 1fd28304..038f89c3 100644
--- a/tests/Predis/Connection/Cluster/RedisClusterTest.php
+++ b/tests/Predis/Connection/Cluster/RedisClusterTest.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Connection\Cluster;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Cluster;
 use Predis\Command;
 use Predis\Connection;
 use Predis\Response;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Connection/ConnectionExceptionTest.php b/tests/Predis/Connection/ConnectionExceptionTest.php
index 68933209..9e5534e2 100644
--- a/tests/Predis/Connection/ConnectionExceptionTest.php
+++ b/tests/Predis/Connection/ConnectionExceptionTest.php
@@ -14,8 +14,8 @@ namespace Predis\Connection;
 
 require_once __DIR__ . '/../CommunicationExceptionTest.php';
 
-use Predis\CommunicationExceptionTest;
 use Exception;
+use Predis\CommunicationExceptionTest;
 
 /**
  *
diff --git a/tests/Predis/Connection/FactoryTest.php b/tests/Predis/Connection/FactoryTest.php
index aa5550ff..e0e86ca8 100644
--- a/tests/Predis/Connection/FactoryTest.php
+++ b/tests/Predis/Connection/FactoryTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Connection\Cluster\ClusterInterface;
+use PredisTestCase;
 use ReflectionObject;
 use stdClass;
 
diff --git a/tests/Predis/Connection/Replication/MasterSlaveReplicationTest.php b/tests/Predis/Connection/Replication/MasterSlaveReplicationTest.php
index d955c52a..04264415 100644
--- a/tests/Predis/Connection/Replication/MasterSlaveReplicationTest.php
+++ b/tests/Predis/Connection/Replication/MasterSlaveReplicationTest.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Connection\Replication;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command;
 use Predis\Connection;
 use Predis\Replication\ReplicationStrategy;
 use Predis\Response;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Connection/Replication/SentinelReplicationTest.php b/tests/Predis/Connection/Replication/SentinelReplicationTest.php
index 9083a8b9..a89fb60d 100644
--- a/tests/Predis/Connection/Replication/SentinelReplicationTest.php
+++ b/tests/Predis/Connection/Replication/SentinelReplicationTest.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Connection\Replication;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command;
 use Predis\Connection;
 use Predis\Replication;
 use Predis\Response;
+use PredisTestCase;
 use ReflectionProperty;
 
 /**
diff --git a/tests/Predis/Monitor/ConsumerTest.php b/tests/Predis/Monitor/ConsumerTest.php
index 1493923b..4fb8b2f5 100644
--- a/tests/Predis/Monitor/ConsumerTest.php
+++ b/tests/Predis/Monitor/ConsumerTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Monitor;
 
-use PredisTestCase;
 use Predis\Client;
 use Predis\Monitor\Consumer as MonitorConsumer;
+use PredisTestCase;
 
 /**
  * @group realm-monitor
diff --git a/tests/Predis/Pipeline/PipelineTest.php b/tests/Predis/Pipeline/PipelineTest.php
index 72411204..eba3986b 100644
--- a/tests/Predis/Pipeline/PipelineTest.php
+++ b/tests/Predis/Pipeline/PipelineTest.php
@@ -12,6 +12,8 @@
 
 namespace Predis\Pipeline;
 
+use Exception;
+use InvalidArgumentException;
 use Predis\Client;
 use Predis\ClientException;
 use Predis\ClientInterface;
@@ -19,8 +21,6 @@ use Predis\Command\CommandInterface;
 use Predis\Response;
 use PredisTestCase;
 use stdClass;
-use Exception;
-use InvalidArgumentException;
 
 /**
  *
diff --git a/tests/Predis/Protocol/ProtocolExceptionTest.php b/tests/Predis/Protocol/ProtocolExceptionTest.php
index 30c97379..825cb16d 100644
--- a/tests/Predis/Protocol/ProtocolExceptionTest.php
+++ b/tests/Predis/Protocol/ProtocolExceptionTest.php
@@ -14,10 +14,10 @@ namespace Predis\Protocol;
 
 require_once __DIR__ . '/../CommunicationExceptionTest.php';
 
+use Exception;
 use Predis\CommunicationException;
 use Predis\CommunicationExceptionTest;
 use Predis\Connection\NodeConnectionInterface;
-use Exception;
 
 /**
  *
diff --git a/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php b/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php
index 8c9d3f58..8bb00cd4 100644
--- a/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php
+++ b/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Protocol\Text;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command\CommandInterface;
 use Predis\Connection\CompositeConnectionInterface;
 use Predis\Protocol\RequestSerializerInterface;
 use Predis\Protocol\ResponseReaderInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Protocol/Text/ProtocolProcessorTest.php b/tests/Predis/Protocol/Text/ProtocolProcessorTest.php
index bfc0d528..aa9475b1 100644
--- a/tests/Predis/Protocol/Text/ProtocolProcessorTest.php
+++ b/tests/Predis/Protocol/Text/ProtocolProcessorTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Protocol\Text;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Protocol/Text/RequestSerializerTest.php b/tests/Predis/Protocol/Text/RequestSerializerTest.php
index d9f4614e..b0074a12 100644
--- a/tests/Predis/Protocol/Text/RequestSerializerTest.php
+++ b/tests/Predis/Protocol/Text/RequestSerializerTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Protocol\Text;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Protocol/Text/ResponseReaderTest.php b/tests/Predis/Protocol/Text/ResponseReaderTest.php
index 1a72c75f..71028db3 100644
--- a/tests/Predis/Protocol/Text/ResponseReaderTest.php
+++ b/tests/Predis/Protocol/Text/ResponseReaderTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Protocol\Text;
 
-use PredisTestCase;
 use Predis\Protocol\Text\Handler\ResponseHandlerInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/PubSub/ConsumerTest.php b/tests/Predis/PubSub/ConsumerTest.php
index 2787cafa..6c68877c 100644
--- a/tests/Predis/PubSub/ConsumerTest.php
+++ b/tests/Predis/PubSub/ConsumerTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\PubSub;
 
-use PredisTestCase;
 use Predis\Client;
 use Predis\PubSub\Consumer as PubSubConsumer;
+use PredisTestCase;
 
 /**
  * @group realm-pubsub
diff --git a/tests/Predis/PubSub/DispatcherLoopTest.php b/tests/Predis/PubSub/DispatcherLoopTest.php
index 4aa7d676..d41b4cea 100644
--- a/tests/Predis/PubSub/DispatcherLoopTest.php
+++ b/tests/Predis/PubSub/DispatcherLoopTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\PubSub;
 
-use PredisTestCase;
 use Predis\Client;
+use PredisTestCase;
 
 /**
  * @group realm-pubsub
diff --git a/tests/Predis/Replication/ReplicationStrategyTest.php b/tests/Predis/Replication/ReplicationStrategyTest.php
index d7e65a2f..a88aedcf 100644
--- a/tests/Predis/Replication/ReplicationStrategyTest.php
+++ b/tests/Predis/Replication/ReplicationStrategyTest.php
@@ -12,9 +12,9 @@
 
 namespace Predis\Replication;
 
-use PredisTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Command\CommandInterface;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Response/Iterator/MultiBulkTest.php b/tests/Predis/Response/Iterator/MultiBulkTest.php
index 4ce761be..24381d8e 100644
--- a/tests/Predis/Response/Iterator/MultiBulkTest.php
+++ b/tests/Predis/Response/Iterator/MultiBulkTest.php
@@ -12,11 +12,11 @@
 
 namespace Predis\Response\Iterator;
 
-use PredisTestCase;
 use Predis\Client;
 use Predis\ClientInterface;
 use Predis\Connection\CompositeStreamConnection;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
+use PredisTestCase;
 
 /**
  * @group realm-iterators
diff --git a/tests/Predis/Response/Iterator/MultiBulkTupleTest.php b/tests/Predis/Response/Iterator/MultiBulkTupleTest.php
index 4af597f8..eb6348d8 100644
--- a/tests/Predis/Response/Iterator/MultiBulkTupleTest.php
+++ b/tests/Predis/Response/Iterator/MultiBulkTupleTest.php
@@ -12,12 +12,12 @@
 
 namespace Predis\Response\Iterator;
 
-use PredisTestCase;
 use Predis\Client;
 use Predis\ClientInterface;
-use Predis\Connection\NodeConnectionInterface;
 use Predis\Connection\CompositeStreamConnection;
+use Predis\Connection\NodeConnectionInterface;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
+use PredisTestCase;
 
 /**
  * @group realm-iterators
diff --git a/tests/Predis/Transaction/AbortedMultiExecExceptionTest.php b/tests/Predis/Transaction/AbortedMultiExecExceptionTest.php
index 19f6a06f..d45da33b 100644
--- a/tests/Predis/Transaction/AbortedMultiExecExceptionTest.php
+++ b/tests/Predis/Transaction/AbortedMultiExecExceptionTest.php
@@ -12,8 +12,8 @@
 
 namespace Predis\Transaction;
 
-use PredisTestCase;
 use Predis\Client;
+use PredisTestCase;
 
 /**
  *
diff --git a/tests/Predis/Transaction/MultiExecTest.php b/tests/Predis/Transaction/MultiExecTest.php
index 1f7050f8..507b2d8a 100644
--- a/tests/Predis/Transaction/MultiExecTest.php
+++ b/tests/Predis/Transaction/MultiExecTest.php
@@ -12,15 +12,15 @@
 
 namespace Predis\Transaction;
 
+use Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use Predis\Client;
 use Predis\ClientInterface;
-use PredisTestCase;
-use Predis\Response;
 use Predis\Command\CommandInterface;
 use Predis\Connection\NodeConnectionInterface;
+use Predis\Response;
+use PredisTestCase;
 use RuntimeException;
-use Exception;
 
 /**
  * @group realm-transaction