diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-19 15:37:03 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-08-01 08:20:13 +0200 |
| commit | e1f52fc9019856d52466d9b796ce738e31f1c4ca (patch) | |
| tree | 489387720f34360dc58e9f29fb800e1e2af26145 /settings/Controller/UsersController.php | |
| parent | 456392e627de3aad19c8188974a4972cf4e274db (diff) | |
| download | nextcloud-server-e1f52fc9019856d52466d9b796ce738e31f1c4ca.tar.gz nextcloud-server-e1f52fc9019856d52466d9b796ce738e31f1c4ca.zip | |
Stricter phan config fixes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'settings/Controller/UsersController.php')
| -rw-r--r-- | settings/Controller/UsersController.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 76394fcb6c6..4b03cf91a10 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -45,7 +45,6 @@ use OCP\Files\Config\IUserMountCache; use OCP\Encryption\IEncryptionModule; use OCP\Encryption\IManager; use OCP\IConfig; -use OCP\IGroupManager; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; @@ -71,7 +70,7 @@ class UsersController extends Controller { private $isAdmin; /** @var IUserManager */ private $userManager; - /** @var IGroupManager */ + /** @var \OC\Group\Manager */ private $groupManager; /** @var IConfig */ private $config; @@ -113,7 +112,7 @@ class UsersController extends Controller { * @param string $appName * @param IRequest $request * @param IUserManager $userManager - * @param IGroupManager $groupManager + * @param \OC\Group\Manager $groupManager * @param IUserSession $userSession * @param IConfig $config * @param bool $isAdmin @@ -136,7 +135,7 @@ class UsersController extends Controller { public function __construct($appName, IRequest $request, IUserManager $userManager, - IGroupManager $groupManager, + \OC\Group\Manager $groupManager, IUserSession $userSession, IConfig $config, $isAdmin, @@ -180,14 +179,14 @@ class UsersController extends Controller { $this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption'); if ($this->isEncryptionAppEnabled) { // putting this directly in empty is possible in PHP 5.5+ - $result = $config->getAppValue('encryption', 'recoveryAdminEnabled', 0); + $result = $config->getAppValue('encryption', 'recoveryAdminEnabled', '0'); $this->isRestoreEnabled = !empty($result); } } /** * @param IUser $user - * @param array $userGroups + * @param array|null $userGroups * @return array */ private function formatUserForIndex(IUser $user, array $userGroups = null) { |