diff options
| author | Daniel <mail@danielkesselberg.de> | 2023-08-14 12:02:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 12:02:37 +0200 |
| commit | 433cb707388a887e7a50156ce9c16f9759543583 (patch) | |
| tree | fa9944385ffa0ee0ec980798f956cde18052da3e | |
| parent | 73977a0cb1716c001050295760eaa021c341b6ea (diff) | |
| parent | 6083fe3c9b140915529387df735a79bdc4e57273 (diff) | |
| download | nextcloud-server-433cb707388a887e7a50156ce9c16f9759543583.tar.gz nextcloud-server-433cb707388a887e7a50156ce9c16f9759543583.zip | |
Merge pull request #39850 from nextcloud/nulCoalSimpl
Code simplification using null coalescing
| -rw-r--r-- | lib/private/RedisFactory.php | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index 6b509b1c1a9..4903a8713df 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -59,17 +59,8 @@ class RedisFactory { throw new \Exception('Redis Cluster support is not available'); } - if (isset($config['timeout'])) { - $timeout = $config['timeout']; - } else { - $timeout = 0.0; - } - - if (isset($config['read_timeout'])) { - $readTimeout = $config['read_timeout']; - } else { - $readTimeout = 0.0; - } + $timeout = $config['timeout'] ?? 0.0; + $readTimeout = $config['read_timeout'] ?? 0.0; $auth = null; if (isset($config['password']) && (string)$config['password'] !== '') { @@ -103,19 +94,8 @@ class RedisFactory { } else { $this->instance = new \Redis(); - if (isset($config['host'])) { - $host = $config['host']; - } else { - $host = '127.0.0.1'; - } - - if (isset($config['port'])) { - $port = $config['port']; - } elseif ($host[0] !== '/') { - $port = 6379; - } else { - $port = null; - } + $host = $config['host'] ?? '127.0.0.1'; + $port = $config['port'] ?? ($host[0] !== '/' ? 6379 : null); $this->eventLogger->start('connect:redis', 'Connect to redis and send AUTH, SELECT'); // Support for older phpredis versions not supporting connectionParameters |