monospice / laravel-redis-sentinel-drivers

src/Manager/VersionedRedisSentinelManager.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     protected function resolveConnection($name = null)
     {
         $name = $name ?: 'default';
-        $options = Arr::get($this->config, 'options', [ ]);
+        $options = Arr::get($this->config, 'options', []);
 
         if (isset($this->config[$name])) {
             return $this->connector()->connect($this->config[$name], $options);

src/Configuration/HostNormalizer.php

Spacing +6 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
      */
     public static function normalizeConnection(array $connection)
     {
-        $normal = [ ];
+        $normal = [];
 
         if (array_key_exists('options', $connection)) {
             $normal['options'] = $connection['options'];
@@ -117,7 +117,7 @@ 
             return static::normalizeHostString($host);
         }
 
-        return [ $host ];
+        return [$host];
     }
 
     /**
@@ -132,8 +132,8 @@ 
      */
     protected static function normalizeHostArray(array $hostArray)
     {
-        if (! array_key_exists('host', $hostArray)) {
-            return [ $hostArray ];
+        if (!array_key_exists('host', $hostArray)) {
+            return [$hostArray];
         }
 
         $port = Arr::get($hostArray, 'port', 26379);
@@ -155,7 +155,7 @@ 
      */
     protected static function normalizeHostString($hostString, $port = 26379)
     {
-        $hosts = [ ];
+        $hosts = [];
 
         foreach (explode(',', $hostString) as $host) {
             $host = trim($host);
@@ -163,7 +163,7 @@ 
             if (Str::contains($host, ':')) {
                 $hosts[] = $host;
             } else {
-                $hosts[] = [ 'host' => $host, 'port' => $port ];
+                $hosts[] = ['host' => $host, 'port' => $port];
             }
         }
 

src/Connectors/PredisConnector.php

Spacing +2 added lines, -2 removed lines

@@ -44,11 +44,11 @@
      * @return PredisConnection The Sentinel connection containing a configured
      * Predis Client
      */
-    public function connect(array $server, array $options = [ ])
+    public function connect(array $server, array $options = [])
     {
         // Merge the global options shared by all Sentinel connections with
         // connection-specific options
-        $clientOpts = array_merge($options, Arr::pull($server, 'options', [ ]));
+        $clientOpts = array_merge($options, Arr::pull($server, 'options', []));
 
         // Automatically set "replication" to "sentinel". This is the Sentinel
         // driver, after all.

src/Connections/PredisConnection.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      * @param Client $client          The Redis client to wrap.
      * @param array  $sentinelOptions Sentinel-specific connection options.
      */
-    public function __construct(Client $client, array $sentinelOptions = [ ])
+    public function __construct(Client $client, array $sentinelOptions = [])
     {
         parent::__construct($client);
 
@@ -56,7 +56,7 @@ 
         foreach ($sentinelOptions as $option => $value) {
             DynamicMethod::parseFromUnderscore($option)
                 ->prepend('set')
-                ->callOn($this, [ $value ]);
+                ->callOn($this, [$value]);
         }
     }
 
@@ -142,7 +142,7 @@ 
         $method = 'subscribe'
     ) {
         $this->retryOnFailure(function () use ($method, $channels, $callback) {
-            $loop = $this->pubSubLoop([ $method => (array) $channels ]);
+            $loop = $this->pubSubLoop([$method => (array) $channels]);
 
             if ($method === 'psubscribe') {
                 $messageKind = 'pmessage';

src/Configuration/Loader.php

Doc Comments +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
     /**
      * Create an instance of the loader and load the configuration in one step.
      *
-     * @param LaravelApplication|LumenApplication $app The current application
+     * @param \Illuminate\Contracts\Container\Container $app The current application
      * instance that provides context and services needed to load the
      * appropriate configuration.
      *
@@ -253,7 +253,7 @@ 
      * This helper method enables the package's service providers to get config
      * values without having to resolve the config service from the container.
      *
-     * @param string|array $key     The key(s) for the value(s) to fetch.
+     * @param string $key     The key(s) for the value(s) to fetch.
      * @param mixed        $default Returned if the key does not exist.
      *
      * @return mixed The requested configuration value or the provided default

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Laravel\Horizon\Horizon;
 use Laravel\Lumen\Application as LumenApplication;
 use Monospice\LaravelRedisSentinel\Configuration\HostNormalizer;
-use Monospice\LaravelRedisSentinel\Manager;
 use UnexpectedValueException;
 
 /**

Spacing +5 added lines, -5 removed lines

@@ -165,7 +165,7 @@ 
         $this->isLumen = $app instanceof $lumenApplicationClass;
         $this->supportsSessions = $app->bound('session');
         $this->horizonAvailable = static::$ignoreHorizonRequirements
-            || ! $this->isLumen && class_exists(Horizon::class);
+            || !$this->isLumen && class_exists(Horizon::class);
     }
 
     /**
@@ -224,7 +224,7 @@ 
         }
 
         $horizonConfig = $this->getSelectedHorizonConnectionConfiguration();
-        $options = Arr::get($horizonConfig, 'options', [ ]);
+        $options = Arr::get($horizonConfig, 'options', []);
         $options['prefix'] = $this->config->get('horizon.prefix', 'horizon:');
 
         $horizonConfig['options'] = $options;
@@ -399,7 +399,7 @@ 
      */
     protected function setSessionConfiguration()
     {
-        if (! $this->supportsSessions
+        if (!$this->supportsSessions
             || $this->config->get('session.driver') !== 'redis-sentinel'
             || $this->config->get('session.connection') !== null
         ) {
@@ -434,7 +434,7 @@ 
     protected function mergePackageConfiguration()
     {
         $defaultConfig = require self::CONFIG_PATH;
-        $currentConfig = $this->config->get('redis-sentinel', [ ]);
+        $currentConfig = $this->config->get('redis-sentinel', []);
 
         $this->packageConfig = array_merge($defaultConfig, $currentConfig);
     }
@@ -449,7 +449,7 @@ 
     {
         $connections = $this->config->get('database.redis-sentinel');
 
-        if (! is_array($connections)) {
+        if (!is_array($connections)) {
             return;
         }
 

src/RedisSentinelServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 
         // This package's Horizon service provider will set up the queue
         // connector a bit differently, so we don't need to do it twice:
-        if (! $this->config->shouldIntegrateHorizon) {
+        if (!$this->config->shouldIntegrateHorizon) {
             $this->addRedisSentinelQueueConnector();
         }
 

src/Horizon/HorizonServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function boot()
     {
-        if (! $this->config->shouldIntegrateHorizon) {
+        if (!$this->config->shouldIntegrateHorizon) {
             return;
         }
 
@@ -76,7 +76,7 @@ 
      */
     public function register()
     {
-        if (! $this->config->shouldIntegrateHorizon) {
+        if (!$this->config->shouldIntegrateHorizon) {
             return;
         }
 
@@ -117,13 +117,13 @@ 
     {
         // If we're using this package for Horizon only, we only register this
         // service provider, so nothing overrides Laravel's standard Redis API:
-        if (! $this->app->bound(RedisSentinelServiceProvider::class)) {
+        if (!$this->app->bound(RedisSentinelServiceProvider::class)) {
             return true;
         }
 
         // If we're already overriding Laravel's standard Redis API, we don't
         // need to rebind the "redis" service for Horizon.
-        return ! $this->config->shouldOverrideLaravelRedisApi;
+        return !$this->config->shouldOverrideLaravelRedisApi;
     }
 
     /**

src/Manager/VersionedManagerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
     public function makeInstance()
     {
         $class = $this->getVersionedRedisSentinelManagerClass();
-        $config = $this->config->get('database.redis-sentinel', [ ]);
+        $config = $this->config->get('database.redis-sentinel', []);
         $driver = Arr::pull($config, 'client', 'predis');
 
         // Laravel 5.7 introduced the app as the first parameter:

src/Connectors/PhpRedisConnector.php

Spacing +7 added lines, -7 removed lines

@@ -57,7 +57,7 @@ 
      * @return PhpRedisConnection The Sentinel connection containing a configured
      * PhpRedis Client
      */
-    public function connect(array $servers, array $options = [ ])
+    public function connect(array $servers, array $options = [])
     {
         // Set the initial Sentinel servers.
         $this->servers = array_map(function ($server) {
@@ -66,7 +66,7 @@ 
 
         // Merge the global options shared by all Sentinel connections with
         // connection-specific options
-        $clientOpts = array_merge($options, Arr::pull($servers, 'options', [ ]));
+        $clientOpts = array_merge($options, Arr::pull($servers, 'options', []));
 
         // Extract the array of Sentinel connection options from the rest of
         // the client options
@@ -106,12 +106,12 @@ 
         shuffle($servers);
 
         // Check if the redis extension is enabled.
-        if (! extension_loaded('redis')) {
+        if (!extension_loaded('redis')) {
             throw new LogicException('Please make sure the PHP Redis extension is installed and enabled.');
         }
 
         // Check if the extension is up to date and contains RedisSentinel.
-        if (! class_exists(RedisSentinel::class)) {
+        if (!class_exists(RedisSentinel::class)) {
             throw new LogicException('Please make sure the PHP Redis extension is up to date.');
         }
 
@@ -133,7 +133,7 @@ 
 
                 // Lookup the master node.
                 $master = $sentinel->getMasterAddrByName($service);
-                if (is_array($master) && ! count($master)) {
+                if (is_array($master) && !count($master)) {
                     throw new RedisException(sprintf('No master found for service "%s".', $service));
                 }
 
@@ -188,14 +188,14 @@ 
     {
         if (is_string($server)) {
             list($host, $port) = explode(':', $server);
-            if (! $host || ! $port) {
+            if (!$host || !$port) {
                 throw new RedisException('Could not format the server definition.');
             }
 
             return ['host' => $host, 'port' => (int) $port];
         }
 
-        if (! is_array($server)) {
+        if (!is_array($server)) {
             throw new RedisException('Could not format the server definition.');
         }
 

Doc Comments +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      * Create a new Redis Sentinel connection from the provided configuration
      * options
      *
-     * @param array $server  The client configuration for the connection
+     * @param array $servers  The client configuration for the connection
      * @param array $options The global client options shared by all Sentinel
      * connections
      *
@@ -181,7 +181,7 @@ 
      * Retry the callback when a RedisException is catched.
      *
      * @param callable $callback The operation to execute.
-     * @return mixed The result of the first successful attempt.
+     * @return null|callable The result of the first successful attempt.
      *
      * @throws RedisRetryException After exhausting the allowed number of
      * attempts to connect.