@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | /** |
172 | 172 | * Create an instance of the loader and load the configuration in one step. |
173 | 173 | * |
174 | - * @param LaravelApplication|LumenApplication $app The current application |
|
174 | + * @param \Illuminate\Contracts\Container\Container $app The current application |
|
175 | 175 | * instance that provides context and services needed to load the |
176 | 176 | * appropriate configuration. |
177 | 177 | * |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * This helper method enables the package's service providers to get config |
254 | 254 | * values without having to resolve the config service from the container. |
255 | 255 | * |
256 | - * @param string|array $key The key(s) for the value(s) to fetch. |
|
256 | + * @param string $key The key(s) for the value(s) to fetch. |
|
257 | 257 | * @param mixed $default Returned if the key does not exist. |
258 | 258 | * |
259 | 259 | * @return mixed The requested configuration value or the provided default |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use Laravel\Horizon\Horizon; |
8 | 8 | use Laravel\Lumen\Application as LumenApplication; |
9 | 9 | use Monospice\LaravelRedisSentinel\Configuration\HostNormalizer; |
10 | -use Monospice\LaravelRedisSentinel\Manager; |
|
11 | 10 | use UnexpectedValueException; |
12 | 11 | |
13 | 12 | /** |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $this->isLumen = $app instanceof $lumenApplicationClass; |
166 | 166 | $this->supportsSessions = $app->bound('session'); |
167 | 167 | $this->horizonAvailable = static::$ignoreHorizonRequirements |
168 | - || ! $this->isLumen && class_exists(Horizon::class); |
|
168 | + || !$this->isLumen && class_exists(Horizon::class); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | /** |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | } |
225 | 225 | |
226 | 226 | $horizonConfig = $this->getSelectedHorizonConnectionConfiguration(); |
227 | - $options = Arr::get($horizonConfig, 'options', [ ]); |
|
227 | + $options = Arr::get($horizonConfig, 'options', []); |
|
228 | 228 | $options['prefix'] = $this->config->get('horizon.prefix', 'horizon:'); |
229 | 229 | |
230 | 230 | $horizonConfig['options'] = $options; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | */ |
400 | 400 | protected function setSessionConfiguration() |
401 | 401 | { |
402 | - if (! $this->supportsSessions |
|
402 | + if (!$this->supportsSessions |
|
403 | 403 | || $this->config->get('session.driver') !== 'redis-sentinel' |
404 | 404 | || $this->config->get('session.connection') !== null |
405 | 405 | ) { |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | protected function mergePackageConfiguration() |
435 | 435 | { |
436 | 436 | $defaultConfig = require self::CONFIG_PATH; |
437 | - $currentConfig = $this->config->get('redis-sentinel', [ ]); |
|
437 | + $currentConfig = $this->config->get('redis-sentinel', []); |
|
438 | 438 | |
439 | 439 | $this->packageConfig = array_merge($defaultConfig, $currentConfig); |
440 | 440 | } |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | { |
450 | 450 | $connections = $this->config->get('database.redis-sentinel'); |
451 | 451 | |
452 | - if (! is_array($connections)) { |
|
452 | + if (!is_array($connections)) { |
|
453 | 453 | return; |
454 | 454 | } |
455 | 455 |
@@ -59,7 +59,7 @@ |
||
59 | 59 | public function makeInstance() |
60 | 60 | { |
61 | 61 | $class = $this->getVersionedRedisSentinelManagerClass(); |
62 | - $config = $this->config->get('database.redis-sentinel', [ ]); |
|
62 | + $config = $this->config->get('database.redis-sentinel', []); |
|
63 | 63 | $driver = Arr::pull($config, 'client', 'predis'); |
64 | 64 | |
65 | 65 | return new RedisSentinelManager(new $class($driver, $config)); |
@@ -124,7 +124,7 @@ |
||
124 | 124 | |
125 | 125 | // This package's Horizon service provider will set up the queue |
126 | 126 | // connector a bit differently, so we don't need to do it twice: |
127 | - if (! $this->config->shouldIntegrateHorizon) { |
|
127 | + if (!$this->config->shouldIntegrateHorizon) { |
|
128 | 128 | $this->addRedisSentinelQueueConnector(); |
129 | 129 | } |
130 | 130 |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function boot() |
64 | 64 | { |
65 | - if (! $this->config->shouldIntegrateHorizon) { |
|
65 | + if (!$this->config->shouldIntegrateHorizon) { |
|
66 | 66 | return; |
67 | 67 | } |
68 | 68 | |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function register() |
78 | 78 | { |
79 | - if (! $this->config->shouldIntegrateHorizon) { |
|
79 | + if (!$this->config->shouldIntegrateHorizon) { |
|
80 | 80 | return; |
81 | 81 | } |
82 | 82 | |
@@ -117,13 +117,13 @@ discard block |
||
117 | 117 | { |
118 | 118 | // If we're using this package for Horizon only, we only register this |
119 | 119 | // service provider, so nothing overrides Laravel's standard Redis API: |
120 | - if (! $this->app->bound(RedisSentinelServiceProvider::class)) { |
|
120 | + if (!$this->app->bound(RedisSentinelServiceProvider::class)) { |
|
121 | 121 | return true; |
122 | 122 | } |
123 | 123 | |
124 | 124 | // If we're already overriding Laravel's standard Redis API, we don't |
125 | 125 | // need to rebind the "redis" service for Horizon. |
126 | - return ! $this->config->shouldOverrideLaravelRedisApi; |
|
126 | + return !$this->config->shouldOverrideLaravelRedisApi; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |