diff options
Diffstat (limited to 'settings/BackgroundJobs/VerifyUserData.php')
| -rw-r--r-- | settings/BackgroundJobs/VerifyUserData.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php index 2ec0ce2ea13..f044c9f31fb 100644 --- a/settings/BackgroundJobs/VerifyUserData.php +++ b/settings/BackgroundJobs/VerifyUserData.php @@ -62,27 +62,25 @@ class VerifyUserData extends Job { /** * VerifyUserData constructor. * - * @param AccountManager|null $accountManager - * @param IUserManager|null $userManager - * @param IClientService|null $clientService - * @param IConfig|null $config + * @param AccountManager $accountManager + * @param IUserManager $userManager + * @param IClientService $clientService + * @param ILogger $logger + * @param IConfig $config */ - public function __construct(AccountManager $accountManager = null, - IUserManager $userManager = null, - IClientService $clientService = null, - ILogger $logger = null, - IConfig $config = null + public function __construct(AccountManager $accountManager, + IUserManager $userManager, + IClientService $clientService, + ILogger $logger, + IConfig $config ) { - $this->accountManager = $accountManager !== null ? $accountManager : \OC::$server->query(AccountManager::class); - $this->userManager = $userManager !== null ? $userManager : \OC::$server->getUserManager(); - $this->httpClientService = $clientService !== null ? $clientService : \OC::$server->getHTTPClientService(); - $this->logger = $logger !== null ? $logger : \OC::$server->getLogger(); - - if ($config !== null) { - $this->lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); - } else { - $this->lookupServerUrl = \OC::$server->getConfig()->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); - } + $this->accountManager = $accountManager; + $this->userManager = $userManager; + $this->httpClientService = $clientService; + $this->logger = $logger; + + $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); + $this->lookupServerUrl = rtrim($lookupServerUrl, '/'); } /** |