upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #39850 from nextcloud/nulCoalSimpl

Browse source 
Code simplification using null coalescing
This commit is contained in:
Daniel 2023-08-14 12:02:37 +02:00 committed by GitHub
commit 433cb70738
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/private/RedisFactory.php
View file

@ -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