diff options
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 1 | ||||
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 3 | ||||
| -rw-r--r-- | lib/private/User/Session.php | 22 |
3 files changed, 12 insertions, 14 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 7c536443a0e..03a24e89765 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -232,7 +232,6 @@ class AmazonS3 extends \OC\Files\Storage\Common { } catch (\Exception $e) { return $this->batchDelete(); } - return false; } private function batchDelete($path = null) { diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index cf017c73960..428f52fd9ef 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -208,9 +208,8 @@ class Cache implements ICache { return array_map(function (array $data) { return self::cacheEntryFromData($data, $this->mimetypeLoader);; }, $files); - } else { - return array(); } + return []; } /** diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 34319760c86..c2b58c37cdb 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -295,15 +295,15 @@ class Session implements IUserSession, Emitter { public function getLoginName() { if ($this->activeUser) { return $this->session->get('loginname'); - } else { - $uid = $this->session->get('user_id'); - if ($uid) { - $this->activeUser = $this->manager->get($uid); - return $this->session->get('loginname'); - } else { - return null; - } } + + $uid = $this->session->get('user_id'); + if ($uid) { + $this->activeUser = $this->manager->get($uid); + return $this->session->get('loginname'); + } + + return null; } /** @@ -369,10 +369,10 @@ class Session implements IUserSession, Emitter { if($this->isLoggedIn()) { $this->prepareUserLogin($firstTimeLogin, $regenerateSessionId); return true; - } else { - $message = \OC::$server->getL10N('lib')->t('Login canceled by app'); - throw new LoginException($message); } + + $message = \OC::$server->getL10N('lib')->t('Login canceled by app'); + throw new LoginException($message); } /** |