diff --git a/README.PhpRedis.txt b/README.PhpRedis.txt
index 176536c..178458c 100644
--- a/README.PhpRedis.txt
+++ b/README.PhpRedis.txt
@@ -26,7 +26,7 @@ This mode needs the following settings:
 
 Modify the host as follow:
     // Sentinels instances list with hostname:port format.
-    $settings['redis.connection']['host']      = array('1.2.3.4:5000','1.2.3.5:5000','1.2.3.6:5000');
+    $settings['redis.connection']['host']      = ['1.2.3.4:5000','1.2.3.5:5000','1.2.3.6:5000'];
 
 Add the new instance setting:
 
diff --git a/redis.install b/redis.install
index fec3863..3730606 100644
--- a/redis.install
+++ b/redis.install
@@ -15,25 +15,25 @@ function redis_requirements($phase) {
   // This module is configured via settings.php file. Using any other phase
   // than runtime to proceed to some consistency checks is useless.
   if ('runtime' !== $phase) {
-    return array();
+    return [];
   }
 
-  $requirements = array();
+  $requirements = [];
 
   if (ClientFactory::hasClient()) {
-    $requirements['redis'] = array(
+    $requirements['redis'] = [
       'title'       => "Redis",
-      'value'       => t("Connected, using the <em>@name</em> client.", array('@name' => ClientFactory::getClientName())),
+      'value'       => t("Connected, using the <em>@name</em> client.", ['@name' => ClientFactory::getClientName()]),
       'severity'    => REQUIREMENT_OK,
-    );
+    ];
   }
   else {
-    $requirements['redis'] = array(
+    $requirements['redis'] = [
       'title'       => "Redis",
       'value'       => t("Not connected."),
       'severity'    => REQUIREMENT_WARNING,
       'description' => t("No Redis client connected, this module is useless thereof. Ensure that you enabled module using it or disable it."),
-    );
+    ];
   }
 
   return $requirements;
diff --git a/redis.module b/redis.module
index 8e1b095..a4d7db8 100644
--- a/redis.module
+++ b/redis.module
@@ -18,7 +18,7 @@ function redis_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.redis':
       if (ClientFactory::hasClient()) {
-        $messages = '<p><strong>' . t("Current connected client uses the <em>@name</em> library.", array('@name' => ClientFactory::getClientName())) . '</strong></p>';
+        $messages = '<p><strong>' . t("Current connected client uses the <em>@name</em> library.", ['@name' => ClientFactory::getClientName()]) . '</strong></p>';
       }
       else {
         $messages = '<p><strong>' . t('No redis connection configured.') . '</strong></p>';
diff --git a/src/Cache/CacheBase.php b/src/Cache/CacheBase.php
index 2de9335..aeafb48 100644
--- a/src/Cache/CacheBase.php
+++ b/src/Cache/CacheBase.php
@@ -122,7 +122,7 @@ abstract class CacheBase implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function get($cid, $allow_invalid = FALSE) {
-    $cids = array($cid);
+    $cids = [$cid];
     $cache = $this->getMultiple($cids, $allow_invalid);
     return reset($cache);
   }
@@ -132,7 +132,7 @@ abstract class CacheBase implements CacheBackendInterface {
    */
   public function setMultiple(array $items) {
     foreach ($items as $cid => $item) {
-      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : array());
+      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : [];
     }
   }
 
@@ -298,14 +298,14 @@ abstract class CacheBase implements CacheBackendInterface {
     // invalidateAll().
     $tags[] = $this->getTagForBin();
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($tags)', 'Cache Tags must be strings.');
-    $hash = array(
+    $hash = [
       'cid' => $cid,
       'created' => round(microtime(TRUE), 3),
       'expire' => $expire,
       'tags' => implode(' ', $tags),
       'valid' => 1,
       'checksum' => $this->checksumProvider->getCurrentChecksum($tags),
-    );
+    ];
 
     // Let Redis handle the data types itself.
     if (!is_string($data)) {
diff --git a/src/Cache/PhpRedis.php b/src/Cache/PhpRedis.php
index 3692035..cb30d60 100644
--- a/src/Cache/PhpRedis.php
+++ b/src/Cache/PhpRedis.php
@@ -41,10 +41,10 @@ class PhpRedis extends CacheBase {
       return [];
     }
 
-    $return = array();
+    $return = [];
 
     // Build the list of keys to fetch.
-    $keys = array_map(array($this, 'getKey'), $cids);
+    $keys = array_map([$this, 'getKey'], $cids);
 
     // Optimize for the common case when only a single cache entry needs to
     // be fetched, no pipeline is needed then.
@@ -80,7 +80,7 @@ class PhpRedis extends CacheBase {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
 
     $ttl = $this->getExpiration($expire);
 
@@ -103,7 +103,7 @@ class PhpRedis extends CacheBase {
    * {@inheritdoc}
    */
   public function deleteMultiple(array $cids) {
-    $keys = array_map(array($this, 'getKey'), $cids);
+    $keys = array_map([$this, 'getKey'], $cids);
     $this->client->del($keys);
   }
 
diff --git a/src/Cache/Predis.php b/src/Cache/Predis.php
index 7fde6c7..6ccd781 100644
--- a/src/Cache/Predis.php
+++ b/src/Cache/Predis.php
@@ -41,10 +41,10 @@ class Predis extends CacheBase {
       return [];
     }
 
-    $return = array();
+    $return = [];
 
     // Build the list of keys to fetch.
-    $keys = array_map(array($this, 'getKey'), $cids);
+    $keys = array_map([$this, 'getKey'], $cids);
 
     // Optimize for the common case when only a single cache entry needs to
     // be fetched, no pipeline is needed then.
@@ -80,7 +80,7 @@ class Predis extends CacheBase {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
 
     $ttl = $this->getExpiration($expire);
 
@@ -104,7 +104,7 @@ class Predis extends CacheBase {
    */
   public function deleteMultiple(array $cids) {
     if (!empty($cids)) {
-      $keys = array_map(array($this, 'getKey'), $cids);
+      $keys = array_map([$this, 'getKey'], $cids);
       $this->client->del($keys);
     }
   }
diff --git a/src/Cache/RedisCacheTagsChecksum.php b/src/Cache/RedisCacheTagsChecksum.php
index b03c697..9992a2f 100644
--- a/src/Cache/RedisCacheTagsChecksum.php
+++ b/src/Cache/RedisCacheTagsChecksum.php
@@ -19,7 +19,7 @@ class RedisCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTagsInv
    *
    * @var array
    */
-  protected $tagCache = array();
+  protected $tagCache = [];
 
   /**
    * A list of tags that have already been invalidated in this request.
@@ -28,7 +28,7 @@ class RedisCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTagsInv
    *
    * @var array
    */
-  protected $invalidatedTags = array();
+  protected $invalidatedTags = [];
 
   /**
    * {@inheritdoc}
@@ -113,7 +113,7 @@ class RedisCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTagsInv
 
     $fetch = array_values(array_diff($tags, array_keys($this->tagCache)));
     if ($fetch) {
-      $keys = array_map(array($this, 'getTagKey'), $fetch);
+      $keys = array_map([$this, 'getTagKey'], $fetch);
       foreach ($this->client->mget($keys) as $index => $invalidations) {
         $this->tagCache[$fetch[$index]] = $invalidations ?: 0;
       }
@@ -130,8 +130,8 @@ class RedisCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTagsInv
    * {@inheritdoc}
    */
   public function reset() {
-    $this->tagCache = array();
-    $this->invalidatedTags = array();
+    $this->tagCache = [];
+    $this->invalidatedTags = [];
   }
 
   /**
diff --git a/src/Client/PhpRedis.php b/src/Client/PhpRedis.php
index 0389d29..147d2c7 100644
--- a/src/Client/PhpRedis.php
+++ b/src/Client/PhpRedis.php
@@ -66,7 +66,7 @@ class PhpRedis implements ClientInterface {
    * @return mixed
    *   An array with ip & port of the Master instance or NULL.
    */
-  protected function askForMaster(\Redis $client, array $sentinels = array(), $password = NULL) {
+  protected function askForMaster(\Redis $client, array $sentinels = [], $password = NULL) {
 
     $ip_port = NULL;
     $settings = Settings::get('redis.connection', []);
diff --git a/src/Client/Predis.php b/src/Client/Predis.php
index e20ea88..747d73a 100644
--- a/src/Client/Predis.php
+++ b/src/Client/Predis.php
@@ -45,7 +45,7 @@ class Predis implements ClientInterface {
         }
       }
 
-      $options = array('replication' => true);
+      $options = ['replication' => true];
       $client = new Client($parameters, $options);
     }
     else {
diff --git a/src/ClientFactory.php b/src/ClientFactory.php
index 449b721..cf45446 100644
--- a/src/ClientFactory.php
+++ b/src/ClientFactory.php
@@ -100,7 +100,7 @@ class ClientFactory {
   {
     if (!isset(self::$_clientInterface))
     {
-      $settings = Settings::get('redis.connection', array());
+      $settings = Settings::get('redis.connection', [];
       if (!empty($settings['interface']))
       {
         $className = self::getClass(self::REDIS_IMPL_CLIENT, $settings['interface']);
@@ -144,13 +144,13 @@ class ClientFactory {
    */
   public static function getClient() {
     if (!isset(self::$_client)) {
-      $settings = Settings::get('redis.connection', array());
-      $settings += array(
+      $settings = Settings::get('redis.connection', [];
+      $settings += [
         'host' => self::REDIS_DEFAULT_HOST,
         'port' => self::REDIS_DEFAULT_PORT,
         'base' => self::REDIS_DEFAULT_BASE,
         'password' => self::REDIS_DEFAULT_PASSWORD,
-      );
+      ];
 
       // If using replication, lets create the client appropriately.
       if (isset($settings['replication']) && $settings['replication'] === TRUE) {
diff --git a/src/Lock/PhpRedis.php b/src/Lock/PhpRedis.php
index 4bf1cc9..2f53e62 100644
--- a/src/Lock/PhpRedis.php
+++ b/src/Lock/PhpRedis.php
@@ -25,7 +25,7 @@ class PhpRedis extends LockBackendAbstract {
     $this->client = $factory->getClient();
     // __destruct() is causing problems with garbage collections, register a
     // shutdown function instead.
-    drupal_register_shutdown_function(array($this, 'releaseAll'));
+    drupal_register_shutdown_function([$this, 'releaseAll']);
   }
 
   /**
diff --git a/src/Lock/Predis.php b/src/Lock/Predis.php
index 0f31181..bede5d9 100644
--- a/src/Lock/Predis.php
+++ b/src/Lock/Predis.php
@@ -25,7 +25,7 @@ class Predis extends LockBackendAbstract {
     $this->client = $factory->getClient();
     // __destruct() is causing problems with garbage collections, register a
     // shutdown function instead.
-    drupal_register_shutdown_function(array($this, 'releaseAll'));
+    drupal_register_shutdown_function([$this, 'releaseAll']);
   }
 
   /**
diff --git a/tests/src/Kernel/RedisCacheTest.php b/tests/src/Kernel/RedisCacheTest.php
index f2abe1b..8668be3 100644
--- a/tests/src/Kernel/RedisCacheTest.php
+++ b/tests/src/Kernel/RedisCacheTest.php
@@ -21,7 +21,7 @@ class RedisCacheTest extends GenericCacheBackendUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'redis');
+  public static $modules = ['system', 'redis'];
 
   public function register(ContainerBuilder $container) {
     self::setUpSettings();
diff --git a/tests/src/Kernel/RedisFloodTest.php b/tests/src/Kernel/RedisFloodTest.php
index 7cab117..62dd416 100644
--- a/tests/src/Kernel/RedisFloodTest.php
+++ b/tests/src/Kernel/RedisFloodTest.php
@@ -20,7 +20,7 @@ class RedisFloodTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array( 'redis');
+  public static $modules = ['redis'];
 
   /**
    * Test flood control.
diff --git a/tests/src/Kernel/RedisQueueTest.php b/tests/src/Kernel/RedisQueueTest.php
index 5bbbd24..137cb98 100644
--- a/tests/src/Kernel/RedisQueueTest.php
+++ b/tests/src/Kernel/RedisQueueTest.php
@@ -20,7 +20,7 @@ class RedisQueueTest extends CoreQueueTest {
    *
    * @var array
    */
-  public static $modules = array('redis');
+  public static $modules = ['redis'];
 
   /**
    * Tests Redis non-blocking queue.
