diff --git a/bin/create-single-file.php b/bin/create-single-file.php
index f2c0ad6c..f27d0017 100755
--- a/bin/create-single-file.php
+++ b/bin/create-single-file.php
@@ -80,7 +80,7 @@ class PredisFile
         $this->namespaces = array();
     }
 
-    public static function from($libraryPath, Array $exclude = array())
+    public static function from($libraryPath, array $exclude = array())
     {
         $nsroot = self::NS_ROOT;
         $predisFile = new PredisFile();
diff --git a/bin/generate-command-test.php b/bin/generate-command-test.php
index 51ccde3e..bfaf1a4c 100755
--- a/bin/generate-command-test.php
+++ b/bin/generate-command-test.php
@@ -40,7 +40,7 @@ class CommandTestCaseGenerator
 {
     private $options;
 
-    public function __construct(Array $options)
+    public function __construct(array $options)
     {
         if (!isset($options['class'])) {
             throw new RuntimeException("Missing 'class' option.");
diff --git a/lib/Predis/Client.php b/lib/Predis/Client.php
index b6c1967c..c50e145c 100644
--- a/lib/Predis/Client.php
+++ b/lib/Predis/Client.php
@@ -369,7 +369,7 @@ class Client implements ClientInterface
      * @param mixed $callable Optional callable used to execute the context.
      * @return PipelineContext|array
      */
-    protected function createPipeline(Array $options = null, $callable = null)
+    protected function createPipeline(array $options = null, $callable = null)
     {
         $executor = isset($options['executor']) ? $options['executor'] : null;
 
@@ -405,7 +405,7 @@ class Client implements ClientInterface
      * @param mixed $callable Optional callable used to execute the context.
      * @return Transaction\MultiExec|array
      */
-    protected function createTransaction(Array $options = null, $callable = null)
+    protected function createTransaction(array $options = null, $callable = null)
     {
         $transaction = new Transaction\MultiExec($this, $options);
 
@@ -435,7 +435,7 @@ class Client implements ClientInterface
      * @param mixed $callable Optional callable used to execute the context.
      * @return PubSub\Consumer|NULL
      */
-    protected function createPubSub(Array $options = null, $callable = null)
+    protected function createPubSub(array $options = null, $callable = null)
     {
         $pubsub = new PubSub\Consumer($this, $options);
 
diff --git a/lib/Predis/Cluster/PredisStrategy.php b/lib/Predis/Cluster/PredisStrategy.php
index 95119464..1a27bef8 100644
--- a/lib/Predis/Cluster/PredisStrategy.php
+++ b/lib/Predis/Cluster/PredisStrategy.php
@@ -347,7 +347,7 @@ class PredisStrategy implements StrategyInterface
      * @param array $keys Array of keys.
      * @return Boolean
      */
-    protected function checkSameHashForKeys(Array $keys)
+    protected function checkSameHashForKeys(array $keys)
     {
         if (!$count = count($keys)) {
             return false;
diff --git a/lib/Predis/Command/AbstractCommand.php b/lib/Predis/Command/AbstractCommand.php
index 0584a9b2..1a0ee5c3 100644
--- a/lib/Predis/Command/AbstractCommand.php
+++ b/lib/Predis/Command/AbstractCommand.php
@@ -27,7 +27,7 @@ abstract class AbstractCommand implements CommandInterface
      * @param array $arguments List of arguments.
      * @return array
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return $arguments;
     }
@@ -35,7 +35,7 @@ abstract class AbstractCommand implements CommandInterface
     /**
      * {@inheritdoc}
      */
-    public function setArguments(Array $arguments)
+    public function setArguments(array $arguments)
     {
         $this->arguments = $this->filterArguments($arguments);
         unset($this->hash);
@@ -46,7 +46,7 @@ abstract class AbstractCommand implements CommandInterface
      *
      * @param array $arguments List of arguments.
      */
-    public function setRawArguments(Array $arguments)
+    public function setRawArguments(array $arguments)
     {
         $this->arguments = $arguments;
         unset($this->hash);
@@ -136,7 +136,7 @@ abstract class AbstractCommand implements CommandInterface
      * @param array $arguments Arguments for a command.
      * @return array
      */
-    public static function normalizeArguments(Array $arguments)
+    public static function normalizeArguments(array $arguments)
     {
         if (count($arguments) === 1 && is_array($arguments[0])) {
             return $arguments[0];
@@ -151,7 +151,7 @@ abstract class AbstractCommand implements CommandInterface
      * @param array $arguments Arguments for a command.
      * @return array
      */
-    public static function normalizeVariadic(Array $arguments)
+    public static function normalizeVariadic(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             return array_merge(array($arguments[0]), $arguments[1]);
diff --git a/lib/Predis/Command/CommandInterface.php b/lib/Predis/Command/CommandInterface.php
index 0be8c81c..708ce53d 100644
--- a/lib/Predis/Command/CommandInterface.php
+++ b/lib/Predis/Command/CommandInterface.php
@@ -43,14 +43,14 @@ interface CommandInterface
      *
      * @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.
diff --git a/lib/Predis/Command/HashDelete.php b/lib/Predis/Command/HashDelete.php
index 95846786..4ccc99bf 100644
--- a/lib/Predis/Command/HashDelete.php
+++ b/lib/Predis/Command/HashDelete.php
@@ -28,7 +28,7 @@ class HashDelete extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/HashGetMultiple.php b/lib/Predis/Command/HashGetMultiple.php
index d5334898..ed4468da 100644
--- a/lib/Predis/Command/HashGetMultiple.php
+++ b/lib/Predis/Command/HashGetMultiple.php
@@ -28,7 +28,7 @@ class HashGetMultiple extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/HashScan.php b/lib/Predis/Command/HashScan.php
index 0ca20886..febe74d5 100644
--- a/lib/Predis/Command/HashScan.php
+++ b/lib/Predis/Command/HashScan.php
@@ -28,7 +28,7 @@ class HashScan extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
diff --git a/lib/Predis/Command/HashSetMultiple.php b/lib/Predis/Command/HashSetMultiple.php
index f84485fc..b51ea66f 100644
--- a/lib/Predis/Command/HashSetMultiple.php
+++ b/lib/Predis/Command/HashSetMultiple.php
@@ -28,7 +28,7 @@ class HashSetMultiple extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $flattenedKVs = array($arguments[0]);
diff --git a/lib/Predis/Command/KeyDelete.php b/lib/Predis/Command/KeyDelete.php
index 4e43141c..04ff83a8 100644
--- a/lib/Predis/Command/KeyDelete.php
+++ b/lib/Predis/Command/KeyDelete.php
@@ -28,7 +28,7 @@ class KeyDelete extends AbstractCommand implements PrefixableCommandInterface
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeArguments($arguments);
     }
diff --git a/lib/Predis/Command/KeyScan.php b/lib/Predis/Command/KeyScan.php
index 79953cba..cc27baa6 100644
--- a/lib/Predis/Command/KeyScan.php
+++ b/lib/Predis/Command/KeyScan.php
@@ -28,7 +28,7 @@ class KeyScan extends AbstractCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $options = $this->prepareOptions(array_pop($arguments));
diff --git a/lib/Predis/Command/KeySort.php b/lib/Predis/Command/KeySort.php
index 549469a8..7d2058d2 100644
--- a/lib/Predis/Command/KeySort.php
+++ b/lib/Predis/Command/KeySort.php
@@ -28,7 +28,7 @@ class KeySort extends AbstractCommand implements PrefixableCommandInterface
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 1) {
             return $arguments;
diff --git a/lib/Predis/Command/ListPopFirstBlocking.php b/lib/Predis/Command/ListPopFirstBlocking.php
index 0ada4675..ad29f03d 100644
--- a/lib/Predis/Command/ListPopFirstBlocking.php
+++ b/lib/Predis/Command/ListPopFirstBlocking.php
@@ -28,7 +28,7 @@ class ListPopFirstBlocking extends AbstractCommand implements PrefixableCommandI
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[0])) {
             list($arguments, $timeout) = $arguments;
diff --git a/lib/Predis/Command/ListPushTail.php b/lib/Predis/Command/ListPushTail.php
index 6a0f2e0b..094cec1e 100644
--- a/lib/Predis/Command/ListPushTail.php
+++ b/lib/Predis/Command/ListPushTail.php
@@ -28,7 +28,7 @@ class ListPushTail extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/PubSubSubscribe.php b/lib/Predis/Command/PubSubSubscribe.php
index eb8be650..29e8de99 100644
--- a/lib/Predis/Command/PubSubSubscribe.php
+++ b/lib/Predis/Command/PubSubSubscribe.php
@@ -28,7 +28,7 @@ class PubSubSubscribe extends AbstractCommand implements PrefixableCommandInterf
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeArguments($arguments);
     }
diff --git a/lib/Predis/Command/PubSubUnsubscribe.php b/lib/Predis/Command/PubSubUnsubscribe.php
index ba70fe4d..f384e130 100644
--- a/lib/Predis/Command/PubSubUnsubscribe.php
+++ b/lib/Predis/Command/PubSubUnsubscribe.php
@@ -28,7 +28,7 @@ class PubSubUnsubscribe extends AbstractCommand implements PrefixableCommandInte
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeArguments($arguments);
     }
diff --git a/lib/Predis/Command/ScriptedCommand.php b/lib/Predis/Command/ScriptedCommand.php
index 9c0065c5..1858998f 100644
--- a/lib/Predis/Command/ScriptedCommand.php
+++ b/lib/Predis/Command/ScriptedCommand.php
@@ -54,7 +54,7 @@ abstract class ScriptedCommand extends ServerEvalSHA
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (($numkeys = $this->getKeysCount()) && $numkeys < 0) {
             $numkeys = count($arguments) + $numkeys;
diff --git a/lib/Predis/Command/ServerSlaveOf.php b/lib/Predis/Command/ServerSlaveOf.php
index 94f9f696..83b7d3a5 100644
--- a/lib/Predis/Command/ServerSlaveOf.php
+++ b/lib/Predis/Command/ServerSlaveOf.php
@@ -28,7 +28,7 @@ class ServerSlaveOf extends AbstractCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 0 || $arguments[0] === 'NO ONE') {
             return array('NO', 'ONE');
diff --git a/lib/Predis/Command/SetAdd.php b/lib/Predis/Command/SetAdd.php
index f03e02bd..c9246b7c 100644
--- a/lib/Predis/Command/SetAdd.php
+++ b/lib/Predis/Command/SetAdd.php
@@ -28,7 +28,7 @@ class SetAdd extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/SetIntersection.php b/lib/Predis/Command/SetIntersection.php
index c6590d23..54f1afec 100644
--- a/lib/Predis/Command/SetIntersection.php
+++ b/lib/Predis/Command/SetIntersection.php
@@ -28,7 +28,7 @@ class SetIntersection extends AbstractCommand implements PrefixableCommandInterf
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeArguments($arguments);
     }
diff --git a/lib/Predis/Command/SetIntersectionStore.php b/lib/Predis/Command/SetIntersectionStore.php
index 4e764e0d..60b55879 100644
--- a/lib/Predis/Command/SetIntersectionStore.php
+++ b/lib/Predis/Command/SetIntersectionStore.php
@@ -28,7 +28,7 @@ class SetIntersectionStore extends AbstractCommand implements PrefixableCommandI
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             return array_merge(array($arguments[0]), $arguments[1]);
diff --git a/lib/Predis/Command/SetRemove.php b/lib/Predis/Command/SetRemove.php
index f7cb5772..002d8f96 100644
--- a/lib/Predis/Command/SetRemove.php
+++ b/lib/Predis/Command/SetRemove.php
@@ -28,7 +28,7 @@ class SetRemove extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/SetScan.php b/lib/Predis/Command/SetScan.php
index 9efa80b8..602b2b82 100644
--- a/lib/Predis/Command/SetScan.php
+++ b/lib/Predis/Command/SetScan.php
@@ -28,7 +28,7 @@ class SetScan extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
diff --git a/lib/Predis/Command/StringBitOp.php b/lib/Predis/Command/StringBitOp.php
index 0236bb17..512ffed4 100644
--- a/lib/Predis/Command/StringBitOp.php
+++ b/lib/Predis/Command/StringBitOp.php
@@ -28,7 +28,7 @@ class StringBitOp extends AbstractCommand implements PrefixableCommandInterface
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             list($operation, $destination, ) = $arguments;
diff --git a/lib/Predis/Command/StringGetMultiple.php b/lib/Predis/Command/StringGetMultiple.php
index 71d91872..bb1a777c 100644
--- a/lib/Predis/Command/StringGetMultiple.php
+++ b/lib/Predis/Command/StringGetMultiple.php
@@ -28,7 +28,7 @@ class StringGetMultiple extends AbstractCommand implements PrefixableCommandInte
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeArguments($arguments);
     }
diff --git a/lib/Predis/Command/StringSetMultiple.php b/lib/Predis/Command/StringSetMultiple.php
index cda5157e..c81c2c6e 100644
--- a/lib/Predis/Command/StringSetMultiple.php
+++ b/lib/Predis/Command/StringSetMultiple.php
@@ -28,7 +28,7 @@ class StringSetMultiple extends AbstractCommand implements PrefixableCommandInte
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 1 && is_array($arguments[0])) {
             $flattenedKVs = array();
diff --git a/lib/Predis/Command/TransactionWatch.php b/lib/Predis/Command/TransactionWatch.php
index a1dd9a2a..69b24bbc 100644
--- a/lib/Predis/Command/TransactionWatch.php
+++ b/lib/Predis/Command/TransactionWatch.php
@@ -28,7 +28,7 @@ class TransactionWatch extends AbstractCommand implements PrefixableCommandInter
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (isset($arguments[0]) && is_array($arguments[0])) {
             return $arguments[0];
diff --git a/lib/Predis/Command/ZSetAdd.php b/lib/Predis/Command/ZSetAdd.php
index e0b1c53b..a4befb25 100644
--- a/lib/Predis/Command/ZSetAdd.php
+++ b/lib/Predis/Command/ZSetAdd.php
@@ -28,7 +28,7 @@ class ZSetAdd extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $flattened = array($arguments[0]);
diff --git a/lib/Predis/Command/ZSetRange.php b/lib/Predis/Command/ZSetRange.php
index 7403873a..e64e5e10 100644
--- a/lib/Predis/Command/ZSetRange.php
+++ b/lib/Predis/Command/ZSetRange.php
@@ -28,7 +28,7 @@ class ZSetRange extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 4) {
             $lastType = gettype($arguments[3]);
diff --git a/lib/Predis/Command/ZSetRemove.php b/lib/Predis/Command/ZSetRemove.php
index ae7208d8..b1b77ce4 100644
--- a/lib/Predis/Command/ZSetRemove.php
+++ b/lib/Predis/Command/ZSetRemove.php
@@ -28,7 +28,7 @@ class ZSetRemove extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         return self::normalizeVariadic($arguments);
     }
diff --git a/lib/Predis/Command/ZSetScan.php b/lib/Predis/Command/ZSetScan.php
index fad09c15..7d84a8c6 100644
--- a/lib/Predis/Command/ZSetScan.php
+++ b/lib/Predis/Command/ZSetScan.php
@@ -28,7 +28,7 @@ class ZSetScan extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
diff --git a/lib/Predis/Command/ZSetUnionStore.php b/lib/Predis/Command/ZSetUnionStore.php
index ba971766..da559893 100644
--- a/lib/Predis/Command/ZSetUnionStore.php
+++ b/lib/Predis/Command/ZSetUnionStore.php
@@ -28,7 +28,7 @@ class ZSetUnionStore extends PrefixableCommand
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(Array $arguments)
+    protected function filterArguments(array $arguments)
     {
         $options = array();
         $argc = count($arguments);
diff --git a/lib/Predis/Connection/ConnectionFactory.php b/lib/Predis/Connection/ConnectionFactory.php
index 6587b0f6..56c5232c 100644
--- a/lib/Predis/Connection/ConnectionFactory.php
+++ b/lib/Predis/Connection/ConnectionFactory.php
@@ -128,7 +128,7 @@ class ConnectionFactory implements ConnectionFactoryInterface
     /**
      * {@inheritdoc}
      */
-    public function aggregate(AggregatedConnectionInterface $connection, Array $parameters)
+    public function aggregate(AggregatedConnectionInterface $connection, array $parameters)
     {
         foreach ($parameters as $node) {
             $connection->add($node instanceof SingleConnectionInterface ? $node : $this->create($node));
diff --git a/lib/Predis/Connection/ConnectionFactoryInterface.php b/lib/Predis/Connection/ConnectionFactoryInterface.php
index e5ded18a..93762264 100644
--- a/lib/Predis/Connection/ConnectionFactoryInterface.php
+++ b/lib/Predis/Connection/ConnectionFactoryInterface.php
@@ -48,5 +48,5 @@ interface ConnectionFactoryInterface
      * @param AggregatedConnectionInterface $cluster Instance of an aggregated connection class.
      * @param array $parameters List of parameters for each connection object.
      */
-    public function aggregate(AggregatedConnectionInterface $cluster, Array $parameters);
+    public function aggregate(AggregatedConnectionInterface $cluster, array $parameters);
 }
diff --git a/lib/Predis/Connection/ConnectionParameters.php b/lib/Predis/Connection/ConnectionParameters.php
index 8cbbe2b8..e67c6009 100644
--- a/lib/Predis/Connection/ConnectionParameters.php
+++ b/lib/Predis/Connection/ConnectionParameters.php
@@ -137,7 +137,7 @@ class ConnectionParameters implements ConnectionParametersInterface
      * @param array $parameters Connection parameters.
      * @return array
      */
-    private function filter(Array $parameters)
+    private function filter(array $parameters)
     {
         if ($parameters) {
             $casters = array_intersect_key($this->getValueCasters(), $parameters);
diff --git a/lib/Predis/Pipeline/MultiExecExecutor.php b/lib/Predis/Pipeline/MultiExecExecutor.php
index 51765846..01d7988a 100644
--- a/lib/Predis/Pipeline/MultiExecExecutor.php
+++ b/lib/Predis/Pipeline/MultiExecExecutor.php
@@ -96,10 +96,10 @@ class MultiExecExecutor implements PipelineExecutorInterface
      * Consumes an array response returned by EXEC.
      *
      * @param SplQueue $commands Pipelined commands
-     * @param Array $responses Responses returned by EXEC.
+     * @param array $responses Responses returned by EXEC.
      * @return array
      */
-    protected function consumeArrayResponse(SplQueue $commands, Array &$responses)
+    protected function consumeArrayResponse(SplQueue $commands, array &$responses)
     {
         $size = count($commands);
         $values = array();
diff --git a/lib/Predis/Profile/ServerProfile.php b/lib/Predis/Profile/ServerProfile.php
index 227db8b1..7f2fc60c 100644
--- a/lib/Predis/Profile/ServerProfile.php
+++ b/lib/Predis/Profile/ServerProfile.php
@@ -128,7 +128,7 @@ abstract class ServerProfile implements ServerProfileInterface, CommandProcessin
     /**
      * {@inheritdoc}
      */
-    public function supportsCommands(Array $commands)
+    public function supportsCommands(array $commands)
     {
         foreach ($commands as $command) {
             if (!$this->supportsCommand($command)) {
diff --git a/lib/Predis/Profile/ServerProfileInterface.php b/lib/Predis/Profile/ServerProfileInterface.php
index 39477cbb..0329723c 100644
--- a/lib/Predis/Profile/ServerProfileInterface.php
+++ b/lib/Predis/Profile/ServerProfileInterface.php
@@ -43,7 +43,7 @@ interface ServerProfileInterface
      * @param array $commands List of command IDs.
      * @return string
      */
-    public function supportsCommands(Array $commands);
+    public function supportsCommands(array $commands);
 
     /**
      * Creates a new command instance.
diff --git a/lib/Predis/PubSub/Consumer.php b/lib/Predis/PubSub/Consumer.php
index 07e60bd4..f5a7bf6c 100644
--- a/lib/Predis/PubSub/Consumer.php
+++ b/lib/Predis/PubSub/Consumer.php
@@ -31,7 +31,7 @@ class Consumer extends AbstractConsumer
      * @param ClientInterface $client Client instance used by the consumer.
      * @param array $options Options for the consumer initialization.
      */
-    public function __construct(ClientInterface $client, Array $options = null)
+    public function __construct(ClientInterface $client, array $options = null)
     {
         $this->checkCapabilities($client);
         $this->options = $options ?: array();
diff --git a/lib/Predis/Session/Handler.php b/lib/Predis/Session/Handler.php
index a4dc115a..fcf399c0 100644
--- a/lib/Predis/Session/Handler.php
+++ b/lib/Predis/Session/Handler.php
@@ -33,7 +33,7 @@ class Handler implements SessionHandlerInterface
      * @param ClientInterface $client Fully initialized client instance.
      * @param array $options Session handler options.
      */
-    public function __construct(ClientInterface $client, Array $options = array())
+    public function __construct(ClientInterface $client, array $options = array())
     {
         $this->client = $client;
         $this->ttl = (int) (isset($options['gc_maxlifetime']) ? $options['gc_maxlifetime'] : ini_get('session.gc_maxlifetime'));
diff --git a/lib/Predis/Transaction/MultiExec.php b/lib/Predis/Transaction/MultiExec.php
index 5049ddf3..8bf7757b 100644
--- a/lib/Predis/Transaction/MultiExec.php
+++ b/lib/Predis/Transaction/MultiExec.php
@@ -48,7 +48,7 @@ class MultiExec implements BasicClientInterface, ExecutableContextInterface
      * @param ClientInterface $client Client instance used by the transaction.
      * @param array $options Initialization options.
      */
-    public function __construct(ClientInterface $client, Array $options = null)
+    public function __construct(ClientInterface $client, array $options = null)
     {
         $this->checkCapabilities($client);
         $this->options = $options ?: array();
diff --git a/tests/PHPUnit/CommandTestCase.php b/tests/PHPUnit/CommandTestCase.php
index 8cf693d2..39c87cb7 100644
--- a/tests/PHPUnit/CommandTestCase.php
+++ b/tests/PHPUnit/CommandTestCase.php
@@ -119,7 +119,7 @@ abstract class CommandTestCase extends StandardTestCase
      * @param array $arguments Arguments for the command.
      * @return CommandInterface
      */
-    protected function getCommandWithArgumentsArray(Array $arguments)
+    protected function getCommandWithArgumentsArray(array $arguments)
     {
         $command = $this->getCommand();
         $command->setArguments($arguments);
@@ -140,10 +140,10 @@ abstract class CommandTestCase extends StandardTestCase
     /**
      * Asserts that two arrays have the same values, even if with different order.
      *
-     * @param Array $expected Expected array.
-     * @param Array $actual Actual array.
+     * @param array $expected Expected array.
+     * @param array $actual Actual array.
      */
-    protected function assertSameValues(Array $expected, Array $actual)
+    protected function assertSameValues(array $expected, array $actual)
     {
         $this->assertThat($expected, new \ArrayHasSameValuesConstraint($actual));
     }
diff --git a/tests/PHPUnit/ConnectionTestCase.php b/tests/PHPUnit/ConnectionTestCase.php
index 33f3995c..e673f582 100644
--- a/tests/PHPUnit/ConnectionTestCase.php
+++ b/tests/PHPUnit/ConnectionTestCase.php
@@ -309,7 +309,7 @@ abstract class ConnectionTestCase extends StandardTestCase
     /**
      * Returns a named array with the default connection parameters and their values.
      *
-     * @return Array Default connection parameters.
+     * @return array Default connection parameters.
      */
     protected function getDefaultParametersArray()
     {
@@ -355,5 +355,5 @@ abstract class ConnectionTestCase extends StandardTestCase
      * @param array $parameters Additional connection parameters.
      * @return StreamConnection
      */
-    protected abstract function getConnection(&$profile = null, $initialize = false, Array $parameters = array());
+    protected abstract function getConnection(&$profile = null, $initialize = false, array $parameters = array());
 }
diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php
index c7f42112..66a9f1db 100644
--- a/tests/Predis/ClientTest.php
+++ b/tests/Predis/ClientTest.php
@@ -786,7 +786,7 @@ class ClientTest extends StandardTestCase
     /**
      * Returns a named array with the default connection parameters and their values.
      *
-     * @return Array Default connection parameters.
+     * @return array Default connection parameters.
      */
     protected function getDefaultParametersArray()
     {
@@ -801,7 +801,7 @@ class ClientTest extends StandardTestCase
     /**
      * Returns a named array with the default client options and their values.
      *
-     * @return Array Default connection parameters.
+     * @return array Default connection parameters.
      */
     protected function getDefaultOptionsArray()
     {
@@ -814,10 +814,10 @@ class ClientTest extends StandardTestCase
      * Returns a named array with the default connection parameters merged with
      * the specified additional parameters.
      *
-     * @param Array $additional Additional connection parameters.
-     * @return Array Connection parameters.
+     * @param array $additional Additional connection parameters.
+     * @return array Connection parameters.
      */
-    protected function getParametersArray(Array $additional)
+    protected function getParametersArray(array $additional)
     {
         return array_merge($this->getDefaultParametersArray(), $additional);
     }
@@ -825,10 +825,10 @@ class ClientTest extends StandardTestCase
     /**
      * Returns an URI string representation of the specified connection parameters.
      *
-     * @param Array $parameters Array of connection parameters.
+     * @param array $parameters Array of connection parameters.
      * @return String URI string.
      */
-    protected function getParametersString(Array $parameters)
+    protected function getParametersString(array $parameters)
     {
         $defaults = $this->getDefaultParametersArray();
 
diff --git a/tests/Predis/Connection/ComposableStreamConnectionTest.php b/tests/Predis/Connection/ComposableStreamConnectionTest.php
index 8ca95fa6..fde10dc6 100644
--- a/tests/Predis/Connection/ComposableStreamConnectionTest.php
+++ b/tests/Predis/Connection/ComposableStreamConnectionTest.php
@@ -107,7 +107,7 @@ class ComposableStreamConnectionTest extends ConnectionTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getConnection(&$profile = null, $initialize = false, Array $parameters = array())
+    protected function getConnection(&$profile = null, $initialize = false, array $parameters = array())
     {
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
diff --git a/tests/Predis/Connection/ConnectionFactoryTest.php b/tests/Predis/Connection/ConnectionFactoryTest.php
index e975bb03..68f9169d 100644
--- a/tests/Predis/Connection/ConnectionFactoryTest.php
+++ b/tests/Predis/Connection/ConnectionFactoryTest.php
@@ -374,7 +374,7 @@ class ConnectionFactoryTest extends StandardTestCase
     /**
      * Returns a mocked Predis\Connection\SingleConnectionInterface.
      *
-     * @return Array Mock instance and class name
+     * @return array Mock instance and class name
      */
     protected function getMockConnectionClass()
     {
diff --git a/tests/Predis/Connection/ConnectionParametersTest.php b/tests/Predis/Connection/ConnectionParametersTest.php
index d0b9d43e..50c271fa 100644
--- a/tests/Predis/Connection/ConnectionParametersTest.php
+++ b/tests/Predis/Connection/ConnectionParametersTest.php
@@ -208,7 +208,7 @@ class ParametersTest extends StandardTestCase
     /**
      * Returns a named array with the default connection parameters and their values.
      *
-     * @return Array Default connection parameters.
+     * @return array Default connection parameters.
      */
     protected function getDefaultParametersArray()
     {
@@ -224,10 +224,10 @@ class ParametersTest extends StandardTestCase
      * Returns a named array with the default connection parameters merged with
      * the specified additional parameters.
      *
-     * @param Array $additional Additional connection parameters.
-     * @return Array Connection parameters.
+     * @param array $additional Additional connection parameters.
+     * @return array Connection parameters.
      */
-    protected function getParametersArray(Array $additional)
+    protected function getParametersArray(array $additional)
     {
         return array_merge($this->getDefaultParametersArray(), $additional);
     }
@@ -235,10 +235,10 @@ class ParametersTest extends StandardTestCase
     /**
      * Returns an URI string representation of the specified connection parameters.
      *
-     * @param Array $parameters Array of connection parameters.
+     * @param array $parameters array of connection parameters.
      * @return String URI string.
      */
-    protected function getParametersString(Array $parameters)
+    protected function getParametersString(array $parameters)
     {
         $defaults = $this->getDefaultParametersArray();
 
diff --git a/tests/Predis/Connection/PhpiredisConnectionTest.php b/tests/Predis/Connection/PhpiredisConnectionTest.php
index 8f388dcb..c6ccd234 100644
--- a/tests/Predis/Connection/PhpiredisConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisConnectionTest.php
@@ -113,7 +113,7 @@ class PhpiredisConnectionTest extends ConnectionTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getConnection(&$profile = null, $initialize = false, Array $parameters = array())
+    protected function getConnection(&$profile = null, $initialize = false, array $parameters = array())
     {
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
diff --git a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
index f12a5df7..85ae6a89 100644
--- a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
@@ -132,7 +132,7 @@ class PhpiredisStreamConnectionTest extends ConnectionTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getConnection(&$profile = null, $initialize = false, Array $parameters = array())
+    protected function getConnection(&$profile = null, $initialize = false, array $parameters = array())
     {
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
diff --git a/tests/Predis/Connection/StreamConnectionTest.php b/tests/Predis/Connection/StreamConnectionTest.php
index 9c7bf2eb..b147c7bd 100644
--- a/tests/Predis/Connection/StreamConnectionTest.php
+++ b/tests/Predis/Connection/StreamConnectionTest.php
@@ -110,7 +110,7 @@ class StreamConnectionTest extends ConnectionTestCase
     /**
      * {@inheritdoc}
      */
-    protected function getConnection(&$profile = null, $initialize = false, Array $parameters = array())
+    protected function getConnection(&$profile = null, $initialize = false, array $parameters = array())
     {
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
diff --git a/tests/Predis/Connection/WebdisConnectionTest.php b/tests/Predis/Connection/WebdisConnectionTest.php
index 4eccf563..98864373 100644
--- a/tests/Predis/Connection/WebdisConnectionTest.php
+++ b/tests/Predis/Connection/WebdisConnectionTest.php
@@ -156,7 +156,7 @@ class WebdisConnectionTest extends StandardTestCase
     /**
      * Returns a named array with the default connection parameters and their values.
      *
-     * @return Array Default connection parameters.
+     * @return array Default connection parameters.
      */
     protected function getDefaultParametersArray()
     {
@@ -198,7 +198,7 @@ class WebdisConnectionTest extends StandardTestCase
      * @param array $parameters Additional connection parameters.
      * @return WebdisConnection
      */
-    protected function getConnection(&$profile = null, Array $parameters = array())
+    protected function getConnection(&$profile = null, array $parameters = array())
     {
         $parameters = $this->getParameters($parameters);
         $profile = $this->getProfile();
diff --git a/tests/Predis/Pipeline/PipelineContextTest.php b/tests/Predis/Pipeline/PipelineContextTest.php
index 1b475aa9..95609026 100644
--- a/tests/Predis/Pipeline/PipelineContextTest.php
+++ b/tests/Predis/Pipeline/PipelineContextTest.php
@@ -393,7 +393,7 @@ class PipelineContextTest extends StandardTestCase
      * @return array Additional client options.
      * @return Client New client instance.
      */
-    protected function getClient(Array $parameters = array(), Array $options = array())
+    protected function getClient(array $parameters = array(), array $options = array())
     {
         $parameters = array_merge(array(
             'scheme' => 'tcp',
diff --git a/tests/Predis/Transaction/MultiExecTest.php b/tests/Predis/Transaction/MultiExecTest.php
index 56060f71..4dd850bf 100644
--- a/tests/Predis/Transaction/MultiExecTest.php
+++ b/tests/Predis/Transaction/MultiExecTest.php
@@ -760,7 +760,7 @@ class MultiExecTest extends StandardTestCase
      * @param array Additional client options.
      * @return Client client instance.
      */
-    protected function getClient(Array $parameters = array(), Array $options = array())
+    protected function getClient(array $parameters = array(), array $options = array())
     {
         $parameters = array_merge(array(
             'scheme' => 'tcp',