nextcloud / server

lib/private/Installer.php

Indentation +581 added lines, -581 removed lines

@@ -60,585 +60,585 @@
  * This class provides the functionality needed to install, update and remove apps
  */
 class Installer {
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IClientService */
-	private $clientService;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var array - for caching the result of app fetcher */
-	private $apps = null;
-	/** @var bool|null - for caching the result of the ready status */
-	private $isInstanceReadyForUpdates = null;
-	/** @var bool */
-	private $isCLI;
-
-	public function __construct(
-		AppFetcher $appFetcher,
-		IClientService $clientService,
-		ITempManager $tempManager,
-		LoggerInterface $logger,
-		IConfig $config,
-		bool $isCLI
-	) {
-		$this->appFetcher = $appFetcher;
-		$this->clientService = $clientService;
-		$this->tempManager = $tempManager;
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->isCLI = $isCLI;
-	}
-
-	/**
-	 * Installs an app that is located in one of the app folders already
-	 *
-	 * @param string $appId App to install
-	 * @param bool $forceEnable
-	 * @throws \Exception
-	 * @return string app ID
-	 */
-	public function installApp(string $appId, bool $forceEnable = false): string {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			throw new \Exception('App not found in any app directory');
-		}
-
-		$basedir = $app['path'].'/'.$appId;
-
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
-		}
-
-		$info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
-
-		$l = \OC::$server->getL10N('core');
-
-		if (!is_array($info)) {
-			throw new \Exception(
-				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
-					[$appId]
-				)
-			);
-		}
-
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
-
-		$version = implode('.', \OCP\Util::getVersion());
-		if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
-			throw new \Exception(
-				// TODO $l
-				$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
-					[$info['name']]
-				)
-			);
-		}
-
-		// check for required dependencies
-		\OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
-		/** @var Coordinator $coordinator */
-		$coordinator = \OC::$server->get(Coordinator::class);
-		$coordinator->runLazyRegistration($appId);
-		\OC_App::registerAutoloading($appId, $basedir);
-
-		$previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
-		}
-
-		//install the database
-		$ms = new MigrationService($info['id'], \OC::$server->get(Connection::class));
-		$ms->migrate('latest', true);
-
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
-		}
-
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
-
-		$appData = OC_App::getAppInfo($appId);
-		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
-
-		//set the installed version
-		\OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
-		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * Updates the specified app from the appstore
-	 *
-	 * @param string $appId
-	 * @param bool [$allowUnstable] Allow unstable releases
-	 * @return bool
-	 */
-	public function updateAppstoreApp($appId, $allowUnstable = false) {
-		if ($this->isUpdateAvailable($appId, $allowUnstable)) {
-			try {
-				$this->downloadApp($appId, $allowUnstable);
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), [
-					'exception' => $e,
-				]);
-				return false;
-			}
-			return OC_App::updateApp($appId);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Split the certificate file in individual certs
-	 *
-	 * @param string $cert
-	 * @return string[]
-	 */
-	private function splitCerts(string $cert): array {
-		preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
-
-		return $matches[0];
-	}
-
-	/**
-	 * Downloads an app and puts it into the app directory
-	 *
-	 * @param string $appId
-	 * @param bool [$allowUnstable]
-	 *
-	 * @throws \Exception If the installation was not successful
-	 */
-	public function downloadApp($appId, $allowUnstable = false) {
-		$appId = strtolower($appId);
-
-		$apps = $this->appFetcher->get($allowUnstable);
-		foreach ($apps as $app) {
-			if ($app['id'] === $appId) {
-				// Load the certificate
-				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
-				$rootCrts = $this->splitCerts($rootCrt);
-				foreach ($rootCrts as $rootCrt) {
-					$certificate->loadCA($rootCrt);
-				}
-				$loadedCertificate = $certificate->loadX509($app['certificate']);
-
-				// Verify if the certificate has been revoked
-				$crl = new X509();
-				foreach ($rootCrts as $rootCrt) {
-					$crl->loadCA($rootCrt);
-				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if ($crl->validateSignature() !== true) {
-					throw new \Exception('Could not validate CRL signature');
-				}
-				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
-				$revoked = $crl->getRevoked($csn);
-				if ($revoked !== false) {
-					throw new \Exception(
-						sprintf(
-							'Certificate "%s" has been revoked',
-							$csn
-						)
-					);
-				}
-
-				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if ($certificate->validateSignature() !== true) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
-							$appId
-						)
-					);
-				}
-
-				// Verify if the certificate is issued for the requested app id
-				$certInfo = openssl_x509_parse($app['certificate']);
-				if (!isset($certInfo['subject']['CN'])) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert with no CN',
-							$appId
-						)
-					);
-				}
-				if ($certInfo['subject']['CN'] !== $appId) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert issued to %s',
-							$appId,
-							$certInfo['subject']['CN']
-						)
-					);
-				}
-
-				// Download the release
-				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
-				$timeout = $this->isCLI ? 0 : 120;
-				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
-
-				// Check if the signature actually matches the downloaded content
-				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
-				// PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope
-				if ((PHP_VERSION_ID < 80000)) {
-					openssl_free_key($certificate);
-				}
-
-				if ($verified === true) {
-					// Seems to match, let's proceed
-					$extractDir = $this->tempManager->getTemporaryFolder();
-					$archive = new TAR($tempFile);
-
-					if ($archive) {
-						if (!$archive->extract($extractDir)) {
-							$errorMessage = 'Could not extract app ' . $appId;
-
-							$archiveError = $archive->getError();
-							if ($archiveError instanceof \PEAR_Error) {
-								$errorMessage .= ': ' . $archiveError->getMessage();
-							}
-
-							throw new \Exception($errorMessage);
-						}
-						$allFiles = scandir($extractDir);
-						$folders = array_diff($allFiles, ['.', '..']);
-						$folders = array_values($folders);
-
-						if (count($folders) > 1) {
-							throw new \Exception(
-								sprintf(
-									'Extracted app %s has more than 1 folder',
-									$appId
-								)
-							);
-						}
-
-						// Check if appinfo/info.xml has the same app ID as well
-						if ((PHP_VERSION_ID < 80000)) {
-							$loadEntities = libxml_disable_entity_loader(false);
-							$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
-							libxml_disable_entity_loader($loadEntities);
-						} else {
-							$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
-						}
-						if ((string)$xml->id !== $appId) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has a wrong app ID in info.xml: %s',
-									$appId,
-									(string)$xml->id
-								)
-							);
-						}
-
-						// Check if the version is lower than before
-						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if (version_compare($currentVersion, $newVersion) === 1) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has version %s and tried to update to lower version %s',
-									$appId,
-									$currentVersion,
-									$newVersion
-								)
-							);
-						}
-
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
-						// Remove old app with the ID if existent
-						OC_Helper::rmdirr($baseDir);
-						// Move to app folder
-						if (@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
-							OC_Helper::copyr($extractDir, $baseDir);
-						}
-						OC_Helper::copyr($extractDir, $baseDir);
-						OC_Helper::rmdirr($extractDir);
-						return;
-					} else {
-						throw new \Exception(
-							sprintf(
-								'Could not extract app with ID %s to %s',
-								$appId,
-								$extractDir
-							)
-						);
-					}
-				} else {
-					// Signature does not match
-					throw new \Exception(
-						sprintf(
-							'App with id %s has invalid signature',
-							$appId
-						)
-					);
-				}
-			}
-		}
-
-		throw new \Exception(
-			sprintf(
-				'Could not download app %s',
-				$appId
-			)
-		);
-	}
-
-	/**
-	 * Check if an update for the app is available
-	 *
-	 * @param string $appId
-	 * @param bool $allowUnstable
-	 * @return string|false false or the version number of the update
-	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false) {
-		if ($this->isInstanceReadyForUpdates === null) {
-			$installPath = OC_App::getInstallPath();
-			if ($installPath === false || $installPath === null) {
-				$this->isInstanceReadyForUpdates = false;
-			} else {
-				$this->isInstanceReadyForUpdates = true;
-			}
-		}
-
-		if ($this->isInstanceReadyForUpdates === false) {
-			return false;
-		}
-
-		if ($this->isInstalledFromGit($appId) === true) {
-			return false;
-		}
-
-		if ($this->apps === null) {
-			$this->apps = $this->appFetcher->get($allowUnstable);
-		}
-
-		foreach ($this->apps as $app) {
-			if ($app['id'] === $appId) {
-				$currentVersion = OC_App::getAppVersion($appId);
-
-				if (!isset($app['releases'][0]['version'])) {
-					return false;
-				}
-				$newestVersion = $app['releases'][0]['version'];
-				if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
-					return $newestVersion;
-				} else {
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if app has been installed from git
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the path contains a .git folder
-	 */
-	private function isInstalledFromGit($appId) {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			return false;
-		}
-		$basedir = $app['path'].'/'.$appId;
-		return file_exists($basedir.'/.git/');
-	}
-
-	/**
-	 * Check if app is already downloaded
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the app is already downloaded in the apps repository
-	 */
-	public function isDownloaded($name) {
-		foreach (\OC::$APPSROOTS as $dir) {
-			$dirToTest = $dir['path'];
-			$dirToTest .= '/';
-			$dirToTest .= $name;
-			$dirToTest .= '/';
-
-			if (is_dir($dirToTest)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes an app
-	 * @param string $appId ID of the application to remove
-	 * @return boolean
-	 *
-	 *
-	 * This function works as follows
-	 *   -# call uninstall repair steps
-	 *   -# removing the files
-	 *
-	 * The function will not delete preferences, tables and the configuration,
-	 * this has to be done by the function oc_app_uninstall().
-	 */
-	public function removeApp($appId) {
-		if ($this->isDownloaded($appId)) {
-			if (\OC::$server->getAppManager()->isShipped($appId)) {
-				return false;
-			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
-			OC_Helper::rmdirr($appDir);
-			return true;
-		} else {
-			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
-
-			return false;
-		}
-	}
-
-	/**
-	 * Installs the app within the bundle and marks the bundle as installed
-	 *
-	 * @param Bundle $bundle
-	 * @throws \Exception If app could not get installed
-	 */
-	public function installAppBundle(Bundle $bundle) {
-		$appIds = $bundle->getAppIdentifiers();
-		foreach ($appIds as $appId) {
-			if (!$this->isDownloaded($appId)) {
-				$this->downloadApp($appId);
-			}
-			$this->installApp($appId);
-			$app = new OC_App();
-			$app->enable($appId);
-		}
-		$bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
-		$bundles[] = $bundle->getIdentifier();
-		$this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
-	}
-
-	/**
-	 * Installs shipped apps
-	 *
-	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
-	 * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
-	 *                         working ownCloud at the end instead of an aborted update.
-	 * @return array Array of error messages (appid => Exception)
-	 */
-	public static function installShippedApps($softErrors = false) {
-		$appManager = \OC::$server->getAppManager();
-		$config = \OC::$server->getConfig();
-		$errors = [];
-		foreach (\OC::$APPSROOTS as $app_dir) {
-			if ($dir = opendir($app_dir['path'])) {
-				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
-						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
-							if ($config->getAppValue($filename, "installed_version", null) === null) {
-								$info = OC_App::getAppInfo($filename);
-								$enabled = isset($info['default_enable']);
-								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
-									  && $config->getAppValue($filename, 'enabled') !== 'no') {
-									if ($softErrors) {
-										try {
-											Installer::installShippedApp($filename);
-										} catch (HintException $e) {
-											if ($e->getPrevious() instanceof TableExistsException) {
-												$errors[$filename] = $e;
-												continue;
-											}
-											throw $e;
-										}
-									} else {
-										Installer::installShippedApp($filename);
-									}
-									$config->setAppValue($filename, 'enabled', 'yes');
-								}
-							}
-						}
-					}
-				}
-				closedir($dir);
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * install an app already placed in the app folder
-	 * @param string $app id of the app to install
-	 * @return integer
-	 */
-	public static function installShippedApp($app) {
-		//install the database
-		$appPath = OC_App::getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		$ms = new MigrationService($app, \OC::$server->get(Connection::class));
-		$ms->migrate('latest', true);
-
-		//run appinfo/install.php
-		self::includeAppScript("$appPath/appinfo/install.php");
-
-		$info = OC_App::getAppInfo($app);
-		if (is_null($info)) {
-			return false;
-		}
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
-
-		$config = \OC::$server->getConfig();
-
-		$config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
-		if (array_key_exists('ocsid', $info)) {
-			$config->setAppValue($app, 'ocsid', $info['ocsid']);
-		}
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * @param string $script
-	 */
-	private static function includeAppScript($script) {
-		if (file_exists($script)) {
-			include $script;
-		}
-	}
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IClientService */
+    private $clientService;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var array - for caching the result of app fetcher */
+    private $apps = null;
+    /** @var bool|null - for caching the result of the ready status */
+    private $isInstanceReadyForUpdates = null;
+    /** @var bool */
+    private $isCLI;
+
+    public function __construct(
+        AppFetcher $appFetcher,
+        IClientService $clientService,
+        ITempManager $tempManager,
+        LoggerInterface $logger,
+        IConfig $config,
+        bool $isCLI
+    ) {
+        $this->appFetcher = $appFetcher;
+        $this->clientService = $clientService;
+        $this->tempManager = $tempManager;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->isCLI = $isCLI;
+    }
+
+    /**
+     * Installs an app that is located in one of the app folders already
+     *
+     * @param string $appId App to install
+     * @param bool $forceEnable
+     * @throws \Exception
+     * @return string app ID
+     */
+    public function installApp(string $appId, bool $forceEnable = false): string {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            throw new \Exception('App not found in any app directory');
+        }
+
+        $basedir = $app['path'].'/'.$appId;
+
+        if (is_file($basedir . '/appinfo/database.xml')) {
+            throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+        }
+
+        $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
+
+        $l = \OC::$server->getL10N('core');
+
+        if (!is_array($info)) {
+            throw new \Exception(
+                $l->t('App "%s" cannot be installed because appinfo file cannot be read.',
+                    [$appId]
+                )
+            );
+        }
+
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
+
+        $version = implode('.', \OCP\Util::getVersion());
+        if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
+            throw new \Exception(
+                // TODO $l
+                $l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        // check for required dependencies
+        \OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
+        /** @var Coordinator $coordinator */
+        $coordinator = \OC::$server->get(Coordinator::class);
+        $coordinator->runLazyRegistration($appId);
+        \OC_App::registerAutoloading($appId, $basedir);
+
+        $previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
+        }
+
+        //install the database
+        $ms = new MigrationService($info['id'], \OC::$server->get(Connection::class));
+        $ms->migrate('latest', true);
+
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
+        }
+
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        //run appinfo/install.php
+        self::includeAppScript($basedir . '/appinfo/install.php');
+
+        $appData = OC_App::getAppInfo($appId);
+        OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
+
+        //set the installed version
+        \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
+        \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * Updates the specified app from the appstore
+     *
+     * @param string $appId
+     * @param bool [$allowUnstable] Allow unstable releases
+     * @return bool
+     */
+    public function updateAppstoreApp($appId, $allowUnstable = false) {
+        if ($this->isUpdateAvailable($appId, $allowUnstable)) {
+            try {
+                $this->downloadApp($appId, $allowUnstable);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), [
+                    'exception' => $e,
+                ]);
+                return false;
+            }
+            return OC_App::updateApp($appId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Split the certificate file in individual certs
+     *
+     * @param string $cert
+     * @return string[]
+     */
+    private function splitCerts(string $cert): array {
+        preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
+
+        return $matches[0];
+    }
+
+    /**
+     * Downloads an app and puts it into the app directory
+     *
+     * @param string $appId
+     * @param bool [$allowUnstable]
+     *
+     * @throws \Exception If the installation was not successful
+     */
+    public function downloadApp($appId, $allowUnstable = false) {
+        $appId = strtolower($appId);
+
+        $apps = $this->appFetcher->get($allowUnstable);
+        foreach ($apps as $app) {
+            if ($app['id'] === $appId) {
+                // Load the certificate
+                $certificate = new X509();
+                $rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+                $rootCrts = $this->splitCerts($rootCrt);
+                foreach ($rootCrts as $rootCrt) {
+                    $certificate->loadCA($rootCrt);
+                }
+                $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+                // Verify if the certificate has been revoked
+                $crl = new X509();
+                foreach ($rootCrts as $rootCrt) {
+                    $crl->loadCA($rootCrt);
+                }
+                $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+                if ($crl->validateSignature() !== true) {
+                    throw new \Exception('Could not validate CRL signature');
+                }
+                $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+                $revoked = $crl->getRevoked($csn);
+                if ($revoked !== false) {
+                    throw new \Exception(
+                        sprintf(
+                            'Certificate "%s" has been revoked',
+                            $csn
+                        )
+                    );
+                }
+
+                // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+                if ($certificate->validateSignature() !== true) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+                            $appId
+                        )
+                    );
+                }
+
+                // Verify if the certificate is issued for the requested app id
+                $certInfo = openssl_x509_parse($app['certificate']);
+                if (!isset($certInfo['subject']['CN'])) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert with no CN',
+                            $appId
+                        )
+                    );
+                }
+                if ($certInfo['subject']['CN'] !== $appId) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert issued to %s',
+                            $appId,
+                            $certInfo['subject']['CN']
+                        )
+                    );
+                }
+
+                // Download the release
+                $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+                $timeout = $this->isCLI ? 0 : 120;
+                $client = $this->clientService->newClient();
+                $client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
+
+                // Check if the signature actually matches the downloaded content
+                $certificate = openssl_get_publickey($app['certificate']);
+                $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+                // PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope
+                if ((PHP_VERSION_ID < 80000)) {
+                    openssl_free_key($certificate);
+                }
+
+                if ($verified === true) {
+                    // Seems to match, let's proceed
+                    $extractDir = $this->tempManager->getTemporaryFolder();
+                    $archive = new TAR($tempFile);
+
+                    if ($archive) {
+                        if (!$archive->extract($extractDir)) {
+                            $errorMessage = 'Could not extract app ' . $appId;
+
+                            $archiveError = $archive->getError();
+                            if ($archiveError instanceof \PEAR_Error) {
+                                $errorMessage .= ': ' . $archiveError->getMessage();
+                            }
+
+                            throw new \Exception($errorMessage);
+                        }
+                        $allFiles = scandir($extractDir);
+                        $folders = array_diff($allFiles, ['.', '..']);
+                        $folders = array_values($folders);
+
+                        if (count($folders) > 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Extracted app %s has more than 1 folder',
+                                    $appId
+                                )
+                            );
+                        }
+
+                        // Check if appinfo/info.xml has the same app ID as well
+                        if ((PHP_VERSION_ID < 80000)) {
+                            $loadEntities = libxml_disable_entity_loader(false);
+                            $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+                            libxml_disable_entity_loader($loadEntities);
+                        } else {
+                            $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+                        }
+                        if ((string)$xml->id !== $appId) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has a wrong app ID in info.xml: %s',
+                                    $appId,
+                                    (string)$xml->id
+                                )
+                            );
+                        }
+
+                        // Check if the version is lower than before
+                        $currentVersion = OC_App::getAppVersion($appId);
+                        $newVersion = (string)$xml->version;
+                        if (version_compare($currentVersion, $newVersion) === 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has version %s and tried to update to lower version %s',
+                                    $appId,
+                                    $currentVersion,
+                                    $newVersion
+                                )
+                            );
+                        }
+
+                        $baseDir = OC_App::getInstallPath() . '/' . $appId;
+                        // Remove old app with the ID if existent
+                        OC_Helper::rmdirr($baseDir);
+                        // Move to app folder
+                        if (@mkdir($baseDir)) {
+                            $extractDir .= '/' . $folders[0];
+                            OC_Helper::copyr($extractDir, $baseDir);
+                        }
+                        OC_Helper::copyr($extractDir, $baseDir);
+                        OC_Helper::rmdirr($extractDir);
+                        return;
+                    } else {
+                        throw new \Exception(
+                            sprintf(
+                                'Could not extract app with ID %s to %s',
+                                $appId,
+                                $extractDir
+                            )
+                        );
+                    }
+                } else {
+                    // Signature does not match
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has invalid signature',
+                            $appId
+                        )
+                    );
+                }
+            }
+        }
+
+        throw new \Exception(
+            sprintf(
+                'Could not download app %s',
+                $appId
+            )
+        );
+    }
+
+    /**
+     * Check if an update for the app is available
+     *
+     * @param string $appId
+     * @param bool $allowUnstable
+     * @return string|false false or the version number of the update
+     */
+    public function isUpdateAvailable($appId, $allowUnstable = false) {
+        if ($this->isInstanceReadyForUpdates === null) {
+            $installPath = OC_App::getInstallPath();
+            if ($installPath === false || $installPath === null) {
+                $this->isInstanceReadyForUpdates = false;
+            } else {
+                $this->isInstanceReadyForUpdates = true;
+            }
+        }
+
+        if ($this->isInstanceReadyForUpdates === false) {
+            return false;
+        }
+
+        if ($this->isInstalledFromGit($appId) === true) {
+            return false;
+        }
+
+        if ($this->apps === null) {
+            $this->apps = $this->appFetcher->get($allowUnstable);
+        }
+
+        foreach ($this->apps as $app) {
+            if ($app['id'] === $appId) {
+                $currentVersion = OC_App::getAppVersion($appId);
+
+                if (!isset($app['releases'][0]['version'])) {
+                    return false;
+                }
+                $newestVersion = $app['releases'][0]['version'];
+                if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
+                    return $newestVersion;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app has been installed from git
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the path contains a .git folder
+     */
+    private function isInstalledFromGit($appId) {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            return false;
+        }
+        $basedir = $app['path'].'/'.$appId;
+        return file_exists($basedir.'/.git/');
+    }
+
+    /**
+     * Check if app is already downloaded
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the app is already downloaded in the apps repository
+     */
+    public function isDownloaded($name) {
+        foreach (\OC::$APPSROOTS as $dir) {
+            $dirToTest = $dir['path'];
+            $dirToTest .= '/';
+            $dirToTest .= $name;
+            $dirToTest .= '/';
+
+            if (is_dir($dirToTest)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes an app
+     * @param string $appId ID of the application to remove
+     * @return boolean
+     *
+     *
+     * This function works as follows
+     *   -# call uninstall repair steps
+     *   -# removing the files
+     *
+     * The function will not delete preferences, tables and the configuration,
+     * this has to be done by the function oc_app_uninstall().
+     */
+    public function removeApp($appId) {
+        if ($this->isDownloaded($appId)) {
+            if (\OC::$server->getAppManager()->isShipped($appId)) {
+                return false;
+            }
+            $appDir = OC_App::getInstallPath() . '/' . $appId;
+            OC_Helper::rmdirr($appDir);
+            return true;
+        } else {
+            \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
+
+            return false;
+        }
+    }
+
+    /**
+     * Installs the app within the bundle and marks the bundle as installed
+     *
+     * @param Bundle $bundle
+     * @throws \Exception If app could not get installed
+     */
+    public function installAppBundle(Bundle $bundle) {
+        $appIds = $bundle->getAppIdentifiers();
+        foreach ($appIds as $appId) {
+            if (!$this->isDownloaded($appId)) {
+                $this->downloadApp($appId);
+            }
+            $this->installApp($appId);
+            $app = new OC_App();
+            $app->enable($appId);
+        }
+        $bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
+        $bundles[] = $bundle->getIdentifier();
+        $this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
+    }
+
+    /**
+     * Installs shipped apps
+     *
+     * This function installs all apps found in the 'apps' directory that should be enabled by default;
+     * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
+     *                         working ownCloud at the end instead of an aborted update.
+     * @return array Array of error messages (appid => Exception)
+     */
+    public static function installShippedApps($softErrors = false) {
+        $appManager = \OC::$server->getAppManager();
+        $config = \OC::$server->getConfig();
+        $errors = [];
+        foreach (\OC::$APPSROOTS as $app_dir) {
+            if ($dir = opendir($app_dir['path'])) {
+                while (false !== ($filename = readdir($dir))) {
+                    if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+                        if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
+                            if ($config->getAppValue($filename, "installed_version", null) === null) {
+                                $info = OC_App::getAppInfo($filename);
+                                $enabled = isset($info['default_enable']);
+                                if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
+                                      && $config->getAppValue($filename, 'enabled') !== 'no') {
+                                    if ($softErrors) {
+                                        try {
+                                            Installer::installShippedApp($filename);
+                                        } catch (HintException $e) {
+                                            if ($e->getPrevious() instanceof TableExistsException) {
+                                                $errors[$filename] = $e;
+                                                continue;
+                                            }
+                                            throw $e;
+                                        }
+                                    } else {
+                                        Installer::installShippedApp($filename);
+                                    }
+                                    $config->setAppValue($filename, 'enabled', 'yes');
+                                }
+                            }
+                        }
+                    }
+                }
+                closedir($dir);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * install an app already placed in the app folder
+     * @param string $app id of the app to install
+     * @return integer
+     */
+    public static function installShippedApp($app) {
+        //install the database
+        $appPath = OC_App::getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        $ms = new MigrationService($app, \OC::$server->get(Connection::class));
+        $ms->migrate('latest', true);
+
+        //run appinfo/install.php
+        self::includeAppScript("$appPath/appinfo/install.php");
+
+        $info = OC_App::getAppInfo($app);
+        if (is_null($info)) {
+            return false;
+        }
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
+
+        $config = \OC::$server->getConfig();
+
+        $config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
+        if (array_key_exists('ocsid', $info)) {
+            $config->setAppValue($app, 'ocsid', $info['ocsid']);
+        }
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            $config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            $config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * @param string $script
+     */
+    private static function includeAppScript($script) {
+        if (file_exists($script)) {
+            include $script;
+        }
+    }
 }

lib/private/Console/Application.php

Indentation +172 added lines, -172 removed lines

@@ -47,186 +47,186 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application {
-	/** @var IConfig */
-	private $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IRequest */
-	private $request;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var MemoryInfo */
-	private $memoryInfo;
+    /** @var IConfig */
+    private $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IRequest */
+    private $request;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var MemoryInfo */
+    private $memoryInfo;
 
-	public function __construct(IConfig $config,
-								EventDispatcherInterface $dispatcher,
-								IRequest $request,
-								LoggerInterface $logger,
-								MemoryInfo $memoryInfo) {
-		$defaults = \OC::$server->getThemingDefaults();
-		$this->config = $config;
-		$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
-		$this->dispatcher = $dispatcher;
-		$this->request = $request;
-		$this->logger = $logger;
-		$this->memoryInfo = $memoryInfo;
-	}
+    public function __construct(IConfig $config,
+                                EventDispatcherInterface $dispatcher,
+                                IRequest $request,
+                                LoggerInterface $logger,
+                                MemoryInfo $memoryInfo) {
+        $defaults = \OC::$server->getThemingDefaults();
+        $this->config = $config;
+        $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
+        $this->dispatcher = $dispatcher;
+        $this->request = $request;
+        $this->logger = $logger;
+        $this->memoryInfo = $memoryInfo;
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param ConsoleOutputInterface $output
-	 * @throws \Exception
-	 */
-	public function loadCommands(
-		InputInterface $input,
-		ConsoleOutputInterface $output
-	) {
-		// $application is required to be defined in the register_command scripts
-		$application = $this->application;
-		$inputDefinition = $application->getDefinition();
-		$inputDefinition->addOption(
-			new InputOption(
-				'no-warnings',
-				null,
-				InputOption::VALUE_NONE,
-				'Skip global warnings, show command output only',
-				null
-			)
-		);
-		try {
-			$input->bind($inputDefinition);
-		} catch (\RuntimeException $e) {
-			//expected if there are extra options
-		}
-		if ($input->getOption('no-warnings')) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-		}
+    /**
+     * @param InputInterface $input
+     * @param ConsoleOutputInterface $output
+     * @throws \Exception
+     */
+    public function loadCommands(
+        InputInterface $input,
+        ConsoleOutputInterface $output
+    ) {
+        // $application is required to be defined in the register_command scripts
+        $application = $this->application;
+        $inputDefinition = $application->getDefinition();
+        $inputDefinition->addOption(
+            new InputOption(
+                'no-warnings',
+                null,
+                InputOption::VALUE_NONE,
+                'Skip global warnings, show command output only',
+                null
+            )
+        );
+        try {
+            $input->bind($inputDefinition);
+        } catch (\RuntimeException $e) {
+            //expected if there are extra options
+        }
+        if ($input->getOption('no-warnings')) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
+        }
 
-		if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
-			$output->getErrorOutput()->writeln(
-				'<comment>The current PHP memory limit ' .
-				'is below the recommended value of 512MB.</comment>'
-			);
-		}
+        if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
+            $output->getErrorOutput()->writeln(
+                '<comment>The current PHP memory limit ' .
+                'is below the recommended value of 512MB.</comment>'
+            );
+        }
 
-		try {
-			require_once __DIR__ . '/../../../core/register_command.php';
-			if ($this->config->getSystemValue('installed', false)) {
-				if (\OCP\Util::needUpgrade()) {
-					throw new NeedsUpdateException();
-				} elseif ($this->config->getSystemValueBool('maintenance')) {
-					$this->writeMaintenanceModeInfo($input, $output);
-				} else {
-					OC_App::loadApps();
-					foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
-						$appPath = \OC_App::getAppPath($app);
-						if ($appPath === false) {
-							continue;
-						}
-						// load commands using info.xml
-						$info = \OC_App::getAppInfo($app);
-						if (isset($info['commands'])) {
-							$this->loadCommandsFromInfoXml($info['commands']);
-						}
-						// load from register_command.php
-						\OC_App::registerAutoloading($app, $appPath);
-						$file = $appPath . '/appinfo/register_command.php';
-						if (file_exists($file)) {
-							try {
-								require $file;
-							} catch (\Exception $e) {
-								$this->logger->error($e->getMessage(), [
-									'exception' => $e,
-								]);
-							}
-						}
-					}
-				}
-			} elseif ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
-				$output->writeln("Nextcloud is not installed - only a limited number of commands are available");
-			}
-		} catch (NeedsUpdateException $e) {
-			if ($input->getArgument('command') !== '_completion') {
-				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
-				$output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
-			}
-		}
+        try {
+            require_once __DIR__ . '/../../../core/register_command.php';
+            if ($this->config->getSystemValue('installed', false)) {
+                if (\OCP\Util::needUpgrade()) {
+                    throw new NeedsUpdateException();
+                } elseif ($this->config->getSystemValueBool('maintenance')) {
+                    $this->writeMaintenanceModeInfo($input, $output);
+                } else {
+                    OC_App::loadApps();
+                    foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
+                        $appPath = \OC_App::getAppPath($app);
+                        if ($appPath === false) {
+                            continue;
+                        }
+                        // load commands using info.xml
+                        $info = \OC_App::getAppInfo($app);
+                        if (isset($info['commands'])) {
+                            $this->loadCommandsFromInfoXml($info['commands']);
+                        }
+                        // load from register_command.php
+                        \OC_App::registerAutoloading($app, $appPath);
+                        $file = $appPath . '/appinfo/register_command.php';
+                        if (file_exists($file)) {
+                            try {
+                                require $file;
+                            } catch (\Exception $e) {
+                                $this->logger->error($e->getMessage(), [
+                                    'exception' => $e,
+                                ]);
+                            }
+                        }
+                    }
+                }
+            } elseif ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
+                $output->writeln("Nextcloud is not installed - only a limited number of commands are available");
+            }
+        } catch (NeedsUpdateException $e) {
+            if ($input->getArgument('command') !== '_completion') {
+                $output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
+                $output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
+            }
+        }
 
-		if ($input->getFirstArgument() !== 'check') {
-			$errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
-			if (!empty($errors)) {
-				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
-					$output->writeln('');
-				}
-				throw new \Exception("Environment not properly prepared.");
-			}
-		}
-	}
+        if ($input->getFirstArgument() !== 'check') {
+            $errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
+            if (!empty($errors)) {
+                foreach ($errors as $error) {
+                    $output->writeln((string)$error['error']);
+                    $output->writeln((string)$error['hint']);
+                    $output->writeln('');
+                }
+                throw new \Exception("Environment not properly prepared.");
+            }
+        }
+    }
 
-	/**
-	 * Write a maintenance mode info.
-	 * The commands "_completion" and "maintenance:mode" are excluded.
-	 *
-	 * @param InputInterface $input The input implementation for reading inputs.
-	 * @param ConsoleOutputInterface $output The output implementation
-	 * for writing outputs.
-	 * @return void
-	 */
-	private function writeMaintenanceModeInfo(
-		InputInterface $input, ConsoleOutputInterface $output
-	) {
-		if ($input->getArgument('command') !== '_completion'
-			&& $input->getArgument('command') !== 'maintenance:mode') {
-			$errOutput = $output->getErrorOutput();
-			$errOutput->writeln(
-				'<comment>Nextcloud is in maintenance mode - ' .
-				'no apps have been loaded</comment>' . PHP_EOL
-			);
-		}
-	}
+    /**
+     * Write a maintenance mode info.
+     * The commands "_completion" and "maintenance:mode" are excluded.
+     *
+     * @param InputInterface $input The input implementation for reading inputs.
+     * @param ConsoleOutputInterface $output The output implementation
+     * for writing outputs.
+     * @return void
+     */
+    private function writeMaintenanceModeInfo(
+        InputInterface $input, ConsoleOutputInterface $output
+    ) {
+        if ($input->getArgument('command') !== '_completion'
+            && $input->getArgument('command') !== 'maintenance:mode') {
+            $errOutput = $output->getErrorOutput();
+            $errOutput->writeln(
+                '<comment>Nextcloud is in maintenance mode - ' .
+                'no apps have been loaded</comment>' . PHP_EOL
+            );
+        }
+    }
 
-	/**
-	 * Sets whether to automatically exit after a command execution or not.
-	 *
-	 * @param bool $boolean Whether to automatically exit after a command execution or not
-	 */
-	public function setAutoExit($boolean) {
-		$this->application->setAutoExit($boolean);
-	}
+    /**
+     * Sets whether to automatically exit after a command execution or not.
+     *
+     * @param bool $boolean Whether to automatically exit after a command execution or not
+     */
+    public function setAutoExit($boolean) {
+        $this->application->setAutoExit($boolean);
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
-			ConsoleEvent::EVENT_RUN,
-			$this->request->server['argv']
-		));
-		return $this->application->run($input, $output);
-	}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null) {
+        $this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
+            ConsoleEvent::EVENT_RUN,
+            $this->request->server['argv']
+        ));
+        return $this->application->run($input, $output);
+    }
 
-	private function loadCommandsFromInfoXml($commands) {
-		foreach ($commands as $command) {
-			try {
-				$c = \OC::$server->query($command);
-			} catch (QueryException $e) {
-				if (class_exists($command)) {
-					try {
-						$c = new $command();
-					} catch (\ArgumentCountError $e2) {
-						throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
-					}
-				} else {
-					throw new \Exception("Console command '$command' is unknown and could not be loaded");
-				}
-			}
+    private function loadCommandsFromInfoXml($commands) {
+        foreach ($commands as $command) {
+            try {
+                $c = \OC::$server->query($command);
+            } catch (QueryException $e) {
+                if (class_exists($command)) {
+                    try {
+                        $c = new $command();
+                    } catch (\ArgumentCountError $e2) {
+                        throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
+                    }
+                } else {
+                    throw new \Exception("Console command '$command' is unknown and could not be loaded");
+                }
+            }
 
-			$this->application->add($c);
-		}
-	}
+            $this->application->add($c);
+        }
+    }
 }

lib/private/Server.php

Indentation +2057 added lines, -2057 removed lines

@@ -260,2066 +260,2066 @@
  */
 class Server extends ServerContainer implements IServerContainer {
 
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
-			return $c;
-		});
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarManager', \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				),
-				$c->get(SymfonyAdapter::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id')
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				)
-			);
-		});
-
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(ILogger::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class);
-
-		/** @deprecated 21.0.0 */
-		$this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class);
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		/** @deprecated 21.0.0 */
-		$this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class);
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('TagMapper', TagMapper::class);
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root(
-				$manager,
-				$view,
-				null,
-				$c->get(IUserMountCache::class),
-				$this->get(ILogger::class),
-				$this->get(IUserManager::class)
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(\OC\EventDispatcher\SymfonyAdapter::class),
-				$c->get(IEventDispatcher::class)
-			);
-		});
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('LazyRootFolder', IRootFolder::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager($this->get(IUserManager::class), $c->get(SymfonyAdapter::class), $this->get(ILogger::class));
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
-			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new GroupCreatedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new GroupDeletedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
-			});
-			return $groupManager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory('');
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$defaultTokenProvider = $c->get(IProvider::class);
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$legacyDispatcher = $c->get(SymfonyAdapter::class);
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$defaultTokenProvider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->getLockdownManager(),
-				$c->get(ILogger::class),
-				$c->get(IEventDispatcher::class)
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-				$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserChangedEvent($user, $feature, $value, $oldValue));
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserSession', \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('NavigationManager', INavigationManager::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemConfig', \OC\SystemConfig::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				\OC::$SERVERROOT
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('L10NFactory', IFactory::class);
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppFetcher', AppFetcher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
-
-		$this->registerService(ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserCache', ICache::class);
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(ILogger::class),
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode(',', \OC_Util::getVersion());
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
-				return new \OC\Memcache\Factory($prefix, $c->get(ILogger::class),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-			return $arrayCacheFactory;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig);
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$l10n
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AvatarManager', AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), null, $registry);
-		});
-		$this->registerAlias(ILogger::class, \OC\Log::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Logger', \OC\Log::class);
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('JobList', IJobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			$logger = $c->get(ILogger::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
-			} else {
-				$router = new \OC\Route\Router($logger);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Router', IRouter::class);
-
-		$this->registerAlias(ISearch::class, Search::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Search', ISearch::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			return new \OC\Security\RateLimiting\Backend\MemoryCache(
-				$this->get(ICacheFactory::class),
-				new \OC\AppFramework\Utility\TimeFactory()
-			);
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Crypto', ICrypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Hasher', IHasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig);
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connectionParams = $factory->createConnectionParams();
-			$connection = $factory->getConnection($type, $connectionParams);
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
-			return $connection;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class);
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(LocalAddressChecker::class, function (ContainerInterface $c) {
-			return new LocalAddressChecker(
-				$c->get(ILogger::class),
-			);
-		});
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerService(DnsPinMiddleware::class, function (ContainerInterface $c) {
-			return new DnsPinMiddleware(
-				$c->get(NegativeDnsCache::class),
-				$c->get(LocalAddressChecker::class)
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			$eventLogger = new EventLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$eventLogger->activate();
-			}
-			return $eventLogger;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('QueryLogger', IQueryLogger::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TempManager', TempManager::class);
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (ContainerInterface $c) {
-			// TODO: use auto-wiring
-			return new \OC\App\AppManager(
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(\OC\AppConfig::class),
-				$c->get(IGroupManager::class),
-				$c->get(ICacheFactory::class),
-				$c->get(SymfonyAdapter::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppManager', AppManager::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = new UserMountCache(
-				$c->get(IDBConnection::class),
-				$c->get(IUserManager::class),
-				$c->get(ILogger::class)
-			);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = \OC\Files\Filesystem::getLoader();
-			$mountCache = $c->get(IUserMountCache::class);
-			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(ILogger::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MountConfigManager', IMountProviderCollection::class);
-
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isInstalled($app)) {
-					\OC_App::loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Throttler', Throttler::class);
-		$this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) {
-			// IConfig and IAppManager requires a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appManager = $c->get(IAppManager::class);
-			} else {
-				$config = null;
-				$appManager = null;
-			}
-
-			return new Checker(
-				new EnvironmentHelper(),
-				new FileAccessHelper(),
-				new AppLocator(),
-				$config,
-				$c->get(ICacheFactory::class),
-				$appManager,
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(ISecureRandom::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(ILogger::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class)
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Mailer', IMailer::class);
-
-		/** @deprecated 21.0.0 */
-		$this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					$c->get(ILogger::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class);
-
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MountManager', IMountManager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(ILogger::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MimeTypeDetector', IMimeTypeDetector::class);
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$user = $manager->get($id);
-				if (is_null($user)) {
-					$l = $c->getL10N('core');
-					$displayName = $l->t('Unknown user');
-				} else {
-					$displayName = $user->getDisplayName();
-				}
-				return $displayName;
-			});
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			/*
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+            return $c;
+        });
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarManager', \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                ),
+                $c->get(SymfonyAdapter::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id')
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('PreviewManager', IPreview::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                )
+            );
+        });
+
+        $this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(ILogger::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class);
+
+        /** @deprecated 21.0.0 */
+        $this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class);
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        /** @deprecated 21.0.0 */
+        $this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class);
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('TagMapper', TagMapper::class);
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root(
+                $manager,
+                $view,
+                null,
+                $c->get(IUserMountCache::class),
+                $this->get(ILogger::class),
+                $this->get(IUserManager::class)
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(\OC\EventDispatcher\SymfonyAdapter::class),
+                $c->get(IEventDispatcher::class)
+            );
+        });
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('LazyRootFolder', IRootFolder::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager($this->get(IUserManager::class), $c->get(SymfonyAdapter::class), $this->get(ILogger::class));
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
+            });
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new GroupCreatedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new GroupDeletedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
+            });
+            return $groupManager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory('');
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $defaultTokenProvider = $c->get(IProvider::class);
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $legacyDispatcher = $c->get(SymfonyAdapter::class);
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $defaultTokenProvider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->getLockdownManager(),
+                $c->get(ILogger::class),
+                $c->get(IEventDispatcher::class)
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+                $legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserChangedEvent($user, $feature, $value, $oldValue));
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserSession', \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('NavigationManager', INavigationManager::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemConfig', \OC\SystemConfig::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                \OC::$SERVERROOT
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('L10NFactory', IFactory::class);
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppFetcher', AppFetcher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
+
+        $this->registerService(ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserCache', ICache::class);
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(ILogger::class),
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode(',', \OC_Util::getVersion());
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path);
+                return new \OC\Memcache\Factory($prefix, $c->get(ILogger::class),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+            return $arrayCacheFactory;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig);
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $l10n
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AvatarManager', AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), null, $registry);
+        });
+        $this->registerAlias(ILogger::class, \OC\Log::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Logger', \OC\Log::class);
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('JobList', IJobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            $logger = $c->get(ILogger::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
+            } else {
+                $router = new \OC\Route\Router($logger);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Router', IRouter::class);
+
+        $this->registerAlias(ISearch::class, Search::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Search', ISearch::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            return new \OC\Security\RateLimiting\Backend\MemoryCache(
+                $this->get(ICacheFactory::class),
+                new \OC\AppFramework\Utility\TimeFactory()
+            );
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Crypto', ICrypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Hasher', IHasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig);
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connectionParams = $factory->createConnectionParams();
+            $connection = $factory->getConnection($type, $connectionParams);
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+            return $connection;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class);
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(LocalAddressChecker::class, function (ContainerInterface $c) {
+            return new LocalAddressChecker(
+                $c->get(ILogger::class),
+            );
+        });
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerService(DnsPinMiddleware::class, function (ContainerInterface $c) {
+            return new DnsPinMiddleware(
+                $c->get(NegativeDnsCache::class),
+                $c->get(LocalAddressChecker::class)
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            $eventLogger = new EventLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $eventLogger->activate();
+            }
+            return $eventLogger;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('QueryLogger', IQueryLogger::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TempManager', TempManager::class);
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (ContainerInterface $c) {
+            // TODO: use auto-wiring
+            return new \OC\App\AppManager(
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(\OC\AppConfig::class),
+                $c->get(IGroupManager::class),
+                $c->get(ICacheFactory::class),
+                $c->get(SymfonyAdapter::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppManager', AppManager::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = new UserMountCache(
+                $c->get(IDBConnection::class),
+                $c->get(IUserManager::class),
+                $c->get(ILogger::class)
+            );
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = \OC\Files\Filesystem::getLoader();
+            $mountCache = $c->get(IUserMountCache::class);
+            $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(ILogger::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MountConfigManager', IMountProviderCollection::class);
+
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isInstalled($app)) {
+                    \OC_App::loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Throttler', Throttler::class);
+        $this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) {
+            // IConfig and IAppManager requires a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appManager = $c->get(IAppManager::class);
+            } else {
+                $config = null;
+                $appManager = null;
+            }
+
+            return new Checker(
+                new EnvironmentHelper(),
+                new FileAccessHelper(),
+                new AppLocator(),
+                $config,
+                $c->get(ICacheFactory::class),
+                $appManager,
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(ISecureRandom::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(ILogger::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class)
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Mailer', IMailer::class);
+
+        /** @deprecated 21.0.0 */
+        $this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    return new MemcacheLockingProvider($memcache, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    $c->get(ILogger::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class);
+
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MountManager', IMountManager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(ILogger::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MimeTypeDetector', IMimeTypeDetector::class);
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $user = $manager->get($id);
+                if (is_null($user)) {
+                    $l = $c->getL10N('core');
+                    $displayName = $l->t('Unknown user');
+                } else {
+                    $displayName = $user->getDisplayName();
+                }
+                return $displayName;
+            });
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            /*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
 			 * make composer cache the result. Resulting in errors when enabling
 			 * the theming app.
 			 */
-			$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
-			if (isset($prefixes['OCA\\Theming\\'])) {
-				$classExists = true;
-			} else {
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValue('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming')),
-					new ImageManager(
-						$c->get(\OCP\IConfig::class),
-						$c->getAppDataDir('theming'),
-						$c->get(IURLGenerator::class),
-						$this->get(ICacheFactory::class),
-						$this->get(ILogger::class),
-						$this->get(ITempManager::class)
-					),
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class)
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(SystemConfig::class),
-				$c->get(ILogger::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
-		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(ISecureRandom::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(\OCP\IConfig::class),
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
-
-		$this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			$factory = new $factoryClass($this);
-
-			$manager = new \OC\Share20\Manager(
-				$c->get(ILogger::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get(IHasher::class),
-				$c->get(IMountManager::class),
-				$c->get(IGroupManager::class),
-				$c->getL10N('lib'),
-				$c->get(IFactory::class),
-				$factory,
-				$c->get(IUserManager::class),
-				$c->get(IRootFolder::class),
-				$c->get(SymfonyAdapter::class),
-				$c->get(IMailer::class),
-				$c->get(IURLGenerator::class),
-				$c->get('ThemingDefaults'),
-				$c->get(IEventDispatcher::class)
-			);
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager($c->get(\OCP\Contacts\IManager::class));
-		});
-
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-
-		$this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) {
-			return new CloudFederationProviderManager(
-				$c->get(IAppManager::class),
-				$c->get(IClientService::class),
-				$c->get(ICloudIdManager::class),
-				$c->get(ILogger::class)
-			);
-		});
-
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->getThemingDefaults()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
-
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
-
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
-			return new Installer(
-				$c->get(AppFetcher::class),
-				$c->get(IClientService::class),
-				$c->get(ITempManager::class),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				\OC::$CLI
-			);
-		});
-
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
-
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
-
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
-
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
-
-		$this->registerAlias(IDashboardManager::class, DashboardManager::class);
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
-
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
-
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	/**
-	 * @return \OCP\Calendar\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarManager() {
-		return $this->get(\OC\Calendar\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Resource\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarResourceBackendManager() {
-		return $this->get(\OC\Calendar\Resource\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Room\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarRoomBackendManager() {
-		return $this->get(\OC\Calendar\Room\Manager::class);
-	}
-
-	private function connectDispatcher() {
-		$dispatcher = $this->get(SymfonyAdapter::class);
-
-		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
-			$logger = $this->get(ILogger::class);
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->remove();
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			} catch (\Exception $e) {
-				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
-			}
-		});
-
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-			$feature = $e->getArgument('feature');
-			$oldValue = $e->getArgument('oldValue');
-			$value = $e->getArgument('value');
-
-			// We only change the avatar on display name changes
-			if ($feature !== 'displayName') {
-				return;
-			}
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->userChanged($feature, $oldValue, $value);
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			}
-		});
-
-		/** @var IEventDispatcher $eventDispatched */
-		$eventDispatched = $this->get(IEventDispatcher::class);
-		$eventDispatched->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatched->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->get(IStorage::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return IPreview
-	 * @deprecated 20.0.0
-	 */
-	public function getPreviewManager() {
-		return $this->get(IPreview::class);
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return ITagManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTagManager() {
-		return $this->get(ITagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemTagManager() {
-		return $this->get(ISystemTagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->get(ISystemTagObjectMapper::class);
-	}
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return IAvatarManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAvatarManager() {
-		return $this->get(IAvatarManager::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(IUserSession::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(IUserSession::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->get(\OC\Authentication\TwoFactorAuth\Manager::class);
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 * @deprecated 20.0.0
-	 */
-	public function getNavigationManager() {
-		return $this->get(INavigationManager::class);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return IAppConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getAppConfig() {
-		return $this->get(IAppConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * @return AppFetcher
-	 * @deprecated 20.0.0
-	 */
-	public function getAppFetcher() {
-		return $this->get(AppFetcher::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getGetRedisFactory() {
-		return $this->get('RedisFactory');
-	}
-
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return ILogger
-	 * @deprecated 20.0.0
-	 */
-	public function getLogger() {
-		return $this->get(ILogger::class);
-	}
-
-	/**
-	 * @return ILogFactory
-	 * @throws \OCP\AppFramework\QueryException
-	 * @deprecated 20.0.0
-	 */
-	public function getLogFactory() {
-		return $this->get(ILogFactory::class);
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return IRouter
-	 * @deprecated 20.0.0
-	 */
-	public function getRouter() {
-		return $this->get(IRouter::class);
-	}
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return ISearch
-	 * @deprecated 20.0.0
-	 */
-	public function getSearch() {
-		return $this->get(ISearch::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return ICredentialsManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCredentialsManager() {
-		return $this->get(ICredentialsManager::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return IClientService
-	 * @deprecated 20.0.0
-	 */
-	public function getHTTPClientService() {
-		return $this->get(IClientService::class);
-	}
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 * @deprecated 20.0.0
-	 */
-	public function createEventSource() {
-		return new \OC_EventSource();
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IEventLogger
-	 * @deprecated 20.0.0
-	 */
-	public function getEventLogger() {
-		return $this->get(IEventLogger::class);
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IQueryLogger
-	 * @deprecated 20.0.0
-	 */
-	public function getQueryLogger() {
-		return $this->get(IQueryLogger::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 * @deprecated 20.0.0
-	 */
-	public function getOcsClient() {
-		return $this->get('OcsClient');
-	}
-
-	/**
-	 * @return IDateTimeZone
-	 * @deprecated 20.0.0
-	 */
-	public function getDateTimeZone() {
-		return $this->get(IDateTimeZone::class);
-	}
-
-	/**
-	 * @return IDateTimeFormatter
-	 * @deprecated 20.0.0
-	 */
-	public function getDateTimeFormatter() {
-		return $this->get(IDateTimeFormatter::class);
-	}
-
-	/**
-	 * @return IMountProviderCollection
-	 * @deprecated 20.0.0
-	 */
-	public function getMountProviderCollection() {
-		return $this->get(IMountProviderCollection::class);
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 * @deprecated 20.0.0
-	 */
-	public function getIniWrapper() {
-		return $this->get(IniGetWrapper::class);
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 * @deprecated 20.0.0
-	 */
-	public function getCommandBus() {
-		return $this->get(IBus::class);
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 * @deprecated 20.0.0
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->get(TrustedDomainHelper::class);
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * @return IMountManager
-	 * @deprecated 20.0.0
-	 **/
-	public function getMountManager() {
-		return $this->get(IMountManager::class);
-	}
-
-	/**
-	 * @return IUserMountCache
-	 * @deprecated 20.0.0
-	 */
-	public function getUserMountCache() {
-		return $this->get(IUserMountCache::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return CapabilitiesManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCapabilitiesManager() {
-		return $this->get(CapabilitiesManager::class);
-	}
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
-	 */
-	public function getEventDispatcher() {
-		return $this->get(\OC\EventDispatcher\SymfonyAdapter::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return ICommentsManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCommentsManager() {
-		return $this->get(ICommentsManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return \OC\Session\CryptoWrapper
-	 * @deprecated 20.0.0
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->get('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return Throttler
-	 * @deprecated 20.0.0
-	 */
-	public function getBruteForceThrottler() {
-		return $this->get(Throttler::class);
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->get(ContentSecurityPolicyManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 * @deprecated 20.0.0
-	 */
-	public function getStoragesBackendService() {
-		return $this->get(BackendService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getGlobalStoragesService() {
-		return $this->get(GlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getUserGlobalStoragesService() {
-		return $this->get(UserGlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getUserStoragesService() {
-		return $this->get(UserStoragesService::class);
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getShareManager() {
-		return $this->get(\OCP\Share\IManager::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\Collaborators\ISearch
-	 * @deprecated 20.0.0
-	 */
-	public function getCollaboratorSearch() {
-		return $this->get(\OCP\Collaboration\Collaborators\ISearch::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\AutoComplete\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAutoCompleteManager() {
-		return $this->get(IManager::class);
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 * @deprecated 20.0.0
-	 */
-	public function getLDAPProvider() {
-		return $this->get('LDAPProvider');
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Lockdown\ILockdownManager
-	 * @deprecated 20.0.0
-	 */
-	public function getLockdownManager() {
-		return $this->get('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
-
-	/**
-	 * @return \OCP\GlobalScale\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getGlobalScaleConfig() {
-		return $this->get(IConfig::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationProviderManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudFederationProviderManager() {
-		return $this->get(ICloudFederationProviderManager::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\Api\IApiFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getRemoteApiFactory() {
-		return $this->get(IApiFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudFederationFactory() {
-		return $this->get(ICloudFederationFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\IInstanceFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getRemoteInstanceFactory() {
-		return $this->get(IInstanceFactory::class);
-	}
-
-	/**
-	 * @return IStorageFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getStorageFactory() {
-		return $this->get(IStorageFactory::class);
-	}
-
-	/**
-	 * Get the Preview GeneratorHelper
-	 *
-	 * @return GeneratorHelper
-	 * @since 17.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getGeneratorHelper() {
-		return $this->get(\OC\Preview\GeneratorHelper::class);
-	}
-
-	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
-			try {
-				/** @var ILogger $logger */
-				$logger = $container->get(ILogger::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
-			} catch (ContainerExceptionInterface $e) {
-				// Could not get logger. Continue
-			}
-
-			return $container->get($target);
-		}, false);
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValue('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming')),
+                    new ImageManager(
+                        $c->get(\OCP\IConfig::class),
+                        $c->getAppDataDir('theming'),
+                        $c->get(IURLGenerator::class),
+                        $this->get(ICacheFactory::class),
+                        $this->get(ILogger::class),
+                        $this->get(ITempManager::class)
+                    ),
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class)
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(SystemConfig::class),
+                $c->get(ILogger::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
+        $this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(ISecureRandom::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(\OCP\IConfig::class),
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
+
+        $this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            $factory = new $factoryClass($this);
+
+            $manager = new \OC\Share20\Manager(
+                $c->get(ILogger::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get(IHasher::class),
+                $c->get(IMountManager::class),
+                $c->get(IGroupManager::class),
+                $c->getL10N('lib'),
+                $c->get(IFactory::class),
+                $factory,
+                $c->get(IUserManager::class),
+                $c->get(IRootFolder::class),
+                $c->get(SymfonyAdapter::class),
+                $c->get(IMailer::class),
+                $c->get(IURLGenerator::class),
+                $c->get('ThemingDefaults'),
+                $c->get(IEventDispatcher::class)
+            );
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager($c->get(\OCP\Contacts\IManager::class));
+        });
+
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+
+        $this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) {
+            return new CloudFederationProviderManager(
+                $c->get(IAppManager::class),
+                $c->get(IClientService::class),
+                $c->get(ICloudIdManager::class),
+                $c->get(ILogger::class)
+            );
+        });
+
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->getThemingDefaults()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
+
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
+
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(Installer::class, function (ContainerInterface $c) {
+            return new Installer(
+                $c->get(AppFetcher::class),
+                $c->get(IClientService::class),
+                $c->get(ITempManager::class),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                \OC::$CLI
+            );
+        });
+
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
+
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
+
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
+
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
+
+        $this->registerAlias(IDashboardManager::class, DashboardManager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
+
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
+
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    /**
+     * @return \OCP\Calendar\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarManager() {
+        return $this->get(\OC\Calendar\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Resource\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarResourceBackendManager() {
+        return $this->get(\OC\Calendar\Resource\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Room\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarRoomBackendManager() {
+        return $this->get(\OC\Calendar\Room\Manager::class);
+    }
+
+    private function connectDispatcher() {
+        $dispatcher = $this->get(SymfonyAdapter::class);
+
+        // Delete avatar on user deletion
+        $dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
+            $logger = $this->get(ILogger::class);
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->remove();
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            } catch (\Exception $e) {
+                // Ignore exceptions
+                $logger->info('Could not cleanup avatar of ' . $user->getUID());
+            }
+        });
+
+        $dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+            $feature = $e->getArgument('feature');
+            $oldValue = $e->getArgument('oldValue');
+            $value = $e->getArgument('value');
+
+            // We only change the avatar on display name changes
+            if ($feature !== 'displayName') {
+                return;
+            }
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->userChanged($feature, $oldValue, $value);
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            }
+        });
+
+        /** @var IEventDispatcher $eventDispatched */
+        $eventDispatched = $this->get(IEventDispatcher::class);
+        $eventDispatched->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatched->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->get(IStorage::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return IPreview
+     * @deprecated 20.0.0
+     */
+    public function getPreviewManager() {
+        return $this->get(IPreview::class);
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return ITagManager
+     * @deprecated 20.0.0
+     */
+    public function getTagManager() {
+        return $this->get(ITagManager::class);
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return ISystemTagManager
+     *
+     * @since 9.0.0
+     * @deprecated 20.0.0
+     */
+    public function getSystemTagManager() {
+        return $this->get(ISystemTagManager::class);
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     * @deprecated 20.0.0
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->get(ISystemTagObjectMapper::class);
+    }
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return IAvatarManager
+     * @deprecated 20.0.0
+     */
+    public function getAvatarManager() {
+        return $this->get(IAvatarManager::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(IUserSession::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(IUserSession::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OC\Authentication\TwoFactorAuth\Manager
+     * @deprecated 20.0.0
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->get(\OC\Authentication\TwoFactorAuth\Manager::class);
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     * @deprecated 20.0.0
+     */
+    public function getNavigationManager() {
+        return $this->get(INavigationManager::class);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return IAppConfig
+     * @deprecated 20.0.0
+     */
+    public function getAppConfig() {
+        return $this->get(IAppConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * @return AppFetcher
+     * @deprecated 20.0.0
+     */
+    public function getAppFetcher() {
+        return $this->get(AppFetcher::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     * @deprecated 20.0.0
+     */
+    public function getGetRedisFactory() {
+        return $this->get('RedisFactory');
+    }
+
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a logger instance
+     *
+     * @return ILogger
+     * @deprecated 20.0.0
+     */
+    public function getLogger() {
+        return $this->get(ILogger::class);
+    }
+
+    /**
+     * @return ILogFactory
+     * @throws \OCP\AppFramework\QueryException
+     * @deprecated 20.0.0
+     */
+    public function getLogFactory() {
+        return $this->get(ILogFactory::class);
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return IRouter
+     * @deprecated 20.0.0
+     */
+    public function getRouter() {
+        return $this->get(IRouter::class);
+    }
+
+    /**
+     * Returns a search instance
+     *
+     * @return ISearch
+     * @deprecated 20.0.0
+     */
+    public function getSearch() {
+        return $this->get(ISearch::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return ICredentialsManager
+     * @deprecated 20.0.0
+     */
+    public function getCredentialsManager() {
+        return $this->get(ICredentialsManager::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return IClientService
+     * @deprecated 20.0.0
+     */
+    public function getHTTPClientService() {
+        return $this->get(IClientService::class);
+    }
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     * @deprecated 20.0.0
+     */
+    public function createEventSource() {
+        return new \OC_EventSource();
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IEventLogger
+     * @deprecated 20.0.0
+     */
+    public function getEventLogger() {
+        return $this->get(IEventLogger::class);
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IQueryLogger
+     * @deprecated 20.0.0
+     */
+    public function getQueryLogger() {
+        return $this->get(IQueryLogger::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     * @deprecated 20.0.0
+     */
+    public function getOcsClient() {
+        return $this->get('OcsClient');
+    }
+
+    /**
+     * @return IDateTimeZone
+     * @deprecated 20.0.0
+     */
+    public function getDateTimeZone() {
+        return $this->get(IDateTimeZone::class);
+    }
+
+    /**
+     * @return IDateTimeFormatter
+     * @deprecated 20.0.0
+     */
+    public function getDateTimeFormatter() {
+        return $this->get(IDateTimeFormatter::class);
+    }
+
+    /**
+     * @return IMountProviderCollection
+     * @deprecated 20.0.0
+     */
+    public function getMountProviderCollection() {
+        return $this->get(IMountProviderCollection::class);
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     * @deprecated 20.0.0
+     */
+    public function getIniWrapper() {
+        return $this->get(IniGetWrapper::class);
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     * @deprecated 20.0.0
+     */
+    public function getCommandBus() {
+        return $this->get(IBus::class);
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     * @deprecated 20.0.0
+     */
+    public function getTrustedDomainHelper() {
+        return $this->get(TrustedDomainHelper::class);
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * @return IMountManager
+     * @deprecated 20.0.0
+     **/
+    public function getMountManager() {
+        return $this->get(IMountManager::class);
+    }
+
+    /**
+     * @return IUserMountCache
+     * @deprecated 20.0.0
+     */
+    public function getUserMountCache() {
+        return $this->get(IUserMountCache::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the manager of all the capabilities
+     *
+     * @return CapabilitiesManager
+     * @deprecated 20.0.0
+     */
+    public function getCapabilitiesManager() {
+        return $this->get(CapabilitiesManager::class);
+    }
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
+     */
+    public function getEventDispatcher() {
+        return $this->get(\OC\EventDispatcher\SymfonyAdapter::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return ICommentsManager
+     * @deprecated 20.0.0
+     */
+    public function getCommentsManager() {
+        return $this->get(ICommentsManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return \OC\Session\CryptoWrapper
+     * @deprecated 20.0.0
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->get('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return Throttler
+     * @deprecated 20.0.0
+     */
+    public function getBruteForceThrottler() {
+        return $this->get(Throttler::class);
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->get(ContentSecurityPolicyManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     * @deprecated 20.0.0
+     */
+    public function getStoragesBackendService() {
+        return $this->get(BackendService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getGlobalStoragesService() {
+        return $this->get(GlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getUserGlobalStoragesService() {
+        return $this->get(UserGlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getUserStoragesService() {
+        return $this->get(UserStoragesService::class);
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     * @deprecated 20.0.0
+     */
+    public function getShareManager() {
+        return $this->get(\OCP\Share\IManager::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\Collaborators\ISearch
+     * @deprecated 20.0.0
+     */
+    public function getCollaboratorSearch() {
+        return $this->get(\OCP\Collaboration\Collaborators\ISearch::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\AutoComplete\IManager
+     * @deprecated 20.0.0
+     */
+    public function getAutoCompleteManager() {
+        return $this->get(IManager::class);
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     * @deprecated 20.0.0
+     */
+    public function getLDAPProvider() {
+        return $this->get('LDAPProvider');
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Lockdown\ILockdownManager
+     * @deprecated 20.0.0
+     */
+    public function getLockdownManager() {
+        return $this->get('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
+
+    /**
+     * @return \OCP\GlobalScale\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getGlobalScaleConfig() {
+        return $this->get(IConfig::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationProviderManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudFederationProviderManager() {
+        return $this->get(ICloudFederationProviderManager::class);
+    }
+
+    /**
+     * @return \OCP\Remote\Api\IApiFactory
+     * @deprecated 20.0.0
+     */
+    public function getRemoteApiFactory() {
+        return $this->get(IApiFactory::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationFactory
+     * @deprecated 20.0.0
+     */
+    public function getCloudFederationFactory() {
+        return $this->get(ICloudFederationFactory::class);
+    }
+
+    /**
+     * @return \OCP\Remote\IInstanceFactory
+     * @deprecated 20.0.0
+     */
+    public function getRemoteInstanceFactory() {
+        return $this->get(IInstanceFactory::class);
+    }
+
+    /**
+     * @return IStorageFactory
+     * @deprecated 20.0.0
+     */
+    public function getStorageFactory() {
+        return $this->get(IStorageFactory::class);
+    }
+
+    /**
+     * Get the Preview GeneratorHelper
+     *
+     * @return GeneratorHelper
+     * @since 17.0.0
+     * @deprecated 20.0.0
+     */
+    public function getGeneratorHelper() {
+        return $this->get(\OC\Preview\GeneratorHelper::class);
+    }
+
+    private function registerDeprecatedAlias(string $alias, string $target) {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+            try {
+                /** @var ILogger $logger */
+                $logger = $container->get(ILogger::class);
+                $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+            } catch (ContainerExceptionInterface $e) {
+                // Could not get logger. Continue
+            }
+
+            return $container->get($target);
+        }, false);
+    }
 }

Spacing +101 added lines, -101 removed lines

@@ -275,10 +275,10 @@ 
 		$this->registerParameter('isCLI', \OC::$CLI);
 		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) {
 			return $c;
 		});
 
@@ -303,11 +303,11 @@ 
 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
-		$this->registerService(View::class, function (Server $c) {
+		$this->registerService(View::class, function(Server $c) {
 			return new View();
 		}, false);
 
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
+		$this->registerService(IPreview::class, function(ContainerInterface $c) {
 			return new PreviewManager(
 				$c->get(\OCP\IConfig::class),
 				$c->get(IRootFolder::class),
@@ -323,7 +323,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(ContainerInterface $c) {
 			return new \OC\Preview\Watcher(
 				new \OC\Preview\Storage\Root(
 					$c->get(IRootFolder::class),
@@ -332,7 +332,7 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Encryption\IManager::class, function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -354,7 +354,7 @@ 
 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class);
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
+		$this->registerService(IFile::class, function(ContainerInterface $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->get(IUserManager::class),
@@ -370,7 +370,7 @@ 
 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class);
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
+		$this->registerService(IStorage::class, function(ContainerInterface $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -393,22 +393,22 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+		$this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) {
 			/** @var \OCP\IConfig $config */
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagManager::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getManager();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
 
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
+		$this->registerService('RootFolder', function(ContainerInterface $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -428,7 +428,7 @@ 
 
 			return $root;
 		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
+		$this->registerService(HookConnector::class, function(ContainerInterface $c) {
 			return new HookConnector(
 				$c->get(IRootFolder::class),
 				new View(),
@@ -440,8 +440,8 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
 
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(IRootFolder::class, function(ContainerInterface $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->get('RootFolder');
 			});
 		});
@@ -452,44 +452,44 @@ 
 		$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) {
 			$groupManager = new \OC\Group\Manager($this->get(IUserManager::class), $c->get(SymfonyAdapter::class), $this->get(ILogger::class));
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupCreatedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
@@ -499,7 +499,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
 
-		$this->registerService(Store::class, function (ContainerInterface $c) {
+		$this->registerService(Store::class, function(ContainerInterface $c) {
 			$session = $c->get(ISession::class);
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
 				$tokenProvider = $c->get(IProvider::class);
@@ -512,7 +512,7 @@ 
 		$this->registerAlias(IStore::class, Store::class);
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->get(IUserManager::class);
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -538,26 +538,26 @@ 
 				$c->get(IEventDispatcher::class)
 			);
 			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) use ($legacyDispatcher) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
 				$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
 			});
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 
@@ -565,7 +565,7 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 
@@ -573,14 +573,14 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
 
@@ -588,12 +588,12 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+			$userSession->listen('\OC\User', 'preRememberedLogin', function($uid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
 
@@ -601,19 +601,19 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
+			$userSession->listen('\OC\User', 'logout', function($user) {
 				\OC_Hook::emit('OC_User', 'logout', []);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
+			$userSession->listen('\OC\User', 'postLogout', function($user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
 
@@ -637,7 +637,7 @@ 
 		$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+		$this->registerService(\OC\SystemConfig::class, function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 		/** @deprecated 19.0.0 */
@@ -647,7 +647,7 @@ 
 		$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(IFactory::class, function (Server $c) {
+		$this->registerService(IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->get(\OCP\IConfig::class),
 				$c->getRequest(),
@@ -667,13 +667,13 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
 
-		$this->registerService(ICache::class, function ($c) {
+		$this->registerService(ICache::class, function($c) {
 			return new Cache\File();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserCache', ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(ILogger::class),
 				ArrayCache::class,
 				ArrayCache::class,
@@ -688,7 +688,7 @@ 
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->get(ILogger::class),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -701,12 +701,12 @@ 
 		$this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			return new RedisFactory($systemConfig);
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			$l10n = $this->get(IFactory::class)->get('lib');
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
@@ -719,14 +719,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(AvatarManager::class, function (Server $c) {
+		$this->registerService(AvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->get(IUserSession::class),
 				$c->get(\OC\User\Manager::class),
@@ -745,7 +745,7 @@ 
 		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
 		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
 
-		$this->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->get(SystemConfig::class));
 			$logger = $factory->get($logType);
@@ -759,7 +759,7 @@ 
 		// PSR-3 logger
 		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->get(SystemConfig::class));
 		});
 
@@ -767,7 +767,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('JobList', IJobList::class);
 
-		$this->registerService(Router::class, function (Server $c) {
+		$this->registerService(Router::class, function(Server $c) {
 			$cacheFactory = $c->get(ICacheFactory::class);
 			$logger = $c->get(ILogger::class);
 			if ($cacheFactory->isLocalCacheAvailable()) {
@@ -785,7 +785,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Search', ISearch::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			return new \OC\Security\RateLimiting\Backend\MemoryCache(
 				$this->get(ICacheFactory::class),
 				new \OC\AppFramework\Utility\TimeFactory()
@@ -809,7 +809,7 @@ 
 		$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
 
 		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
+		$this->registerService(Connection::class, function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -826,24 +826,24 @@ 
 
 		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
 		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(LocalAddressChecker::class, function (ContainerInterface $c) {
+		$this->registerService(LocalAddressChecker::class, function(ContainerInterface $c) {
 			return new LocalAddressChecker(
 				$c->get(ILogger::class),
 			);
 		});
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+		$this->registerService(NegativeDnsCache::class, function(ContainerInterface $c) {
 			return new NegativeDnsCache(
 				$c->get(ICacheFactory::class),
 			);
 		});
-		$this->registerService(DnsPinMiddleware::class, function (ContainerInterface $c) {
+		$this->registerService(DnsPinMiddleware::class, function(ContainerInterface $c) {
 			return new DnsPinMiddleware(
 				$c->get(NegativeDnsCache::class),
 				$c->get(LocalAddressChecker::class)
 			);
 		});
 		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IEventLogger::class, function(ContainerInterface $c) {
 			$eventLogger = new EventLogger();
 			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -854,7 +854,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
 
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IQueryLogger::class, function(ContainerInterface $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -869,7 +869,7 @@ 
 		$this->registerDeprecatedAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (ContainerInterface $c) {
+		$this->registerService(AppManager::class, function(ContainerInterface $c) {
 			// TODO: use auto-wiring
 			return new \OC\App\AppManager(
 				$c->get(IUserSession::class),
@@ -889,7 +889,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
 
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -900,7 +900,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
 
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+		$this->registerService(IUserMountCache::class, function(ContainerInterface $c) {
 			$mountCache = new UserMountCache(
 				$c->get(IDBConnection::class),
 				$c->get(IUserManager::class),
@@ -913,7 +913,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
 
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+		$this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->get(IUserMountCache::class);
 			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
@@ -934,7 +934,7 @@ 
 
 		/** @deprecated 20.0.0 */
 		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
+		$this->registerService(IBus::class, function(ContainerInterface $c) {
 			$busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -954,7 +954,7 @@ 
 		$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Throttler', Throttler::class);
-		$this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) {
+		$this->registerService('IntegrityCodeChecker', function(ContainerInterface $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
@@ -975,7 +975,7 @@ 
 				$c->get(IMimeTypeDetector::class)
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IRequest::class, function(ContainerInterface $c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -1012,7 +1012,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(IMailer::class, function (Server $c) {
+		$this->registerService(IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->get(\OCP\IConfig::class),
 				$c->get(ILogger::class),
@@ -1029,7 +1029,7 @@ 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class);
 
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass)) {
@@ -1038,11 +1038,11 @@ 
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			return new $factoryClass($this);
 		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProvider::class, function(ContainerInterface $c) {
 			$factory = $c->get(ILDAPProviderFactory::class);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILockingProvider::class, function(ContainerInterface $c) {
 			$ini = $c->get(IniGetWrapper::class);
 			$config = $c->get(\OCP\IConfig::class);
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -1070,12 +1070,12 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MountManager', IMountManager::class);
 
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+		$this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) {
 			return new \OC\Files\Type\Detection(
 				$c->get(IURLGenerator::class),
 				$c->get(ILogger::class),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		/** @deprecated 19.0.0 */
@@ -1084,19 +1084,19 @@ 
 		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
 		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+		$this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) {
 			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
@@ -1104,14 +1104,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
 
-		$this->registerService(ICommentsManager::class, function (Server $c) {
+		$this->registerService(ICommentsManager::class, function(Server $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			$manager = $factory->getManager();
 
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->get(IUserManager::class);
 				$user = $manager->get($id);
 				if (is_null($user)) {
@@ -1129,7 +1129,7 @@ 
 		$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
 
 		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			/*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
@@ -1164,7 +1164,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->get(IURLGenerator::class),
@@ -1178,7 +1178,7 @@ 
 		$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
 		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
 
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+		$this->registerService('CryptoWrapper', function(ContainerInterface $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1205,14 +1205,14 @@ 
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+		$this->registerService(SessionStorage::class, function(ContainerInterface $c) {
 			return new SessionStorage($c->get(ISession::class));
 		});
 		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
 
-		$this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) {
+		$this->registerService(\OCP\Share\IManager::class, function(IServerContainer $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1242,7 +1242,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class);
 
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
 			$instance = new Collaboration\Collaborators\Search($c);
 
 			// register default plugins
@@ -1265,33 +1265,33 @@ 
 
 		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
 		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->get(IRootFolder::class),
 				$c->get(SystemConfig::class)
 			);
 		});
 
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(ContainerInterface $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->get(ISession::class);
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) {
 			return new DiscoveryService(
 				$c->get(ICacheFactory::class),
 				$c->get(IClientService::class)
 			);
 		});
 
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudIdManager::class, function(ContainerInterface $c) {
 			return new CloudIdManager($c->get(\OCP\Contacts\IManager::class));
 		});
 
 		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
 
-		$this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudFederationProviderManager::class, function(ContainerInterface $c) {
 			return new CloudFederationProviderManager(
 				$c->get(IAppManager::class),
 				$c->get(IClientService::class),
@@ -1300,7 +1300,7 @@ 
 			);
 		});
 
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1312,7 +1312,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->getThemingDefaults()
 			);
@@ -1320,17 +1320,17 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\ISession::class, function(ContainerInterface $c) {
 			return $c->get(\OCP\IUserSession::class)->getSession();
 		}, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+		$this->registerService(IShareHelper::class, function(ContainerInterface $c) {
 			return new ShareHelper(
 				$c->get(\OCP\Share\IManager::class)
 			);
 		});
 
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
+		$this->registerService(Installer::class, function(ContainerInterface $c) {
 			return new Installer(
 				$c->get(AppFetcher::class),
 				$c->get(IClientService::class),
@@ -1341,11 +1341,11 @@ 
 			);
 		});
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IApiFactory::class, function(ContainerInterface $c) {
 			return new ApiFactory($c->get(IClientService::class));
 		});
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IInstanceFactory::class, function(ContainerInterface $c) {
 			$memcacheFactory = $c->get(ICacheFactory::class);
 			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
 		});
@@ -1402,7 +1402,7 @@ 
 		$dispatcher = $this->get(SymfonyAdapter::class);
 
 		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
 			$logger = $this->get(ILogger::class);
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
@@ -1415,11 +1415,11 @@ 
 				// no avatar to remove
 			} catch (\Exception $e) {
 				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
+				$logger->info('Could not cleanup avatar of '.$user->getUID());
 			}
 		});
 
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::changeUser', function(GenericEvent $e) {
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
 			$user = $e->getSubject();
@@ -2310,11 +2310,11 @@ 
 	}
 
 	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) {
 			try {
 				/** @var ILogger $logger */
 				$logger = $container->get(ILogger::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+				$logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
 			} catch (ContainerExceptionInterface $e) {
 				// Could not get logger. Continue
 			}

lib/private/Collaboration/Collaborators/LookupPlugin.php

Indentation +75 added lines, -75 removed lines

@@ -39,88 +39,88 @@
 
 class LookupPlugin implements ISearchPlugin {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var string remote part of the current user's cloud id */
-	private $currentUserRemote;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var LoggerInterface */
-	private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var string remote part of the current user's cloud id */
+    private $currentUserRemote;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var LoggerInterface */
+    private $logger;
 
-	public function __construct(IConfig $config,
-								IClientService $clientService,
-								IUserSession $userSession,
-								ICloudIdManager $cloudIdManager,
-								LoggerInterface $logger) {
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
-		$currentUserCloudId = $userSession->getUser()->getCloudId();
-		$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
-		$this->logger = $logger;
-	}
+    public function __construct(IConfig $config,
+                                IClientService $clientService,
+                                IUserSession $userSession,
+                                ICloudIdManager $cloudIdManager,
+                                LoggerInterface $logger) {
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->cloudIdManager = $cloudIdManager;
+        $currentUserCloudId = $userSession->getUser()->getCloudId();
+        $this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
+        $this->logger = $logger;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
-		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
-		$hasInternetConnection = $this->config->getSystemValueBool('has_internet_connection', true);
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
+        $isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
+        $hasInternetConnection = $this->config->getSystemValueBool('has_internet_connection', true);
 
-		// if case of Global Scale we always search the lookup server
-		if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
-			return false;
-		}
+        // if case of Global Scale we always search the lookup server
+        if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
+            return false;
+        }
 
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		if (empty($lookupServerUrl)) {
-			return false;
-		}
-		$lookupServerUrl = rtrim($lookupServerUrl, '/');
-		$result = [];
+        $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        if (empty($lookupServerUrl)) {
+            return false;
+        }
+        $lookupServerUrl = rtrim($lookupServerUrl, '/');
+        $result = [];
 
-		try {
-			$client = $this->clientService->newClient();
-			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
+        try {
+            $client = $this->clientService->newClient();
+            $response = $client->get(
+                $lookupServerUrl . '/users?search=' . urlencode($search),
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
 
-			$body = json_decode($response->getBody(), true);
+            $body = json_decode($response->getBody(), true);
 
-			foreach ($body as $lookup) {
-				try {
-					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
-				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"', [
-						'exception' => $e,
-					]);
-					continue;
-				}
-				if ($this->currentUserRemote === $remote) {
-					continue;
-				}
-				$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
-				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
-				$result[] = [
-					'label' => $label,
-					'value' => [
-						'shareType' => IShare::TYPE_REMOTE,
-						'shareWith' => $lookup['federationId'],
-					],
-					'extra' => $lookup,
-				];
-			}
-		} catch (\Exception $e) {
-		}
+            foreach ($body as $lookup) {
+                try {
+                    $remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
+                } catch (\Exception $e) {
+                    $this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"', [
+                        'exception' => $e,
+                    ]);
+                    continue;
+                }
+                if ($this->currentUserRemote === $remote) {
+                    continue;
+                }
+                $name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
+                $label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
+                $result[] = [
+                    'label' => $label,
+                    'value' => [
+                        'shareType' => IShare::TYPE_REMOTE,
+                        'shareWith' => $lookup['federationId'],
+                    ],
+                    'extra' => $lookup,
+                ];
+            }
+        } catch (\Exception $e) {
+        }
 
-		$type = new SearchResultType('lookup');
-		$searchResult->addResultSet($type, $result, []);
+        $type = new SearchResultType('lookup');
+        $searchResult->addResultSet($type, $result, []);
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 		try {
 			$client = $this->clientService->newClient();
 			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
+				$lookupServerUrl.'/users?search='.urlencode($search),
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -96,7 +96,7 @@ 
 				try {
 					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
 				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"', [
+					$this->logger->error('Can not parse federated cloud ID "'.$lookup['federationId'].'"', [
 						'exception' => $e,
 					]);
 					continue;
@@ -105,7 +105,7 @@ 
 					continue;
 				}
 				$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
-				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
+				$label = empty($name) ? $lookup['federationId'] : $name.' ('.$lookup['federationId'].')';
 				$result[] = [
 					'label' => $label,
 					'value' => [

lib/private/Collaboration/Resources/Manager.php

Indentation +481 added lines, -481 removed lines

@@ -42,485 +42,485 @@
 use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
-	public const TABLE_COLLECTIONS = 'collres_collections';
-	public const TABLE_RESOURCES = 'collres_resources';
-	public const TABLE_ACCESS_CACHE = 'collres_accesscache';
-
-	/** @var IDBConnection */
-	protected $connection;
-	/** @var IProviderManager */
-	protected $providerManager;
-	/** @var LoggerInterface */
-	protected $logger;
-
-	/** @var string[] */
-	protected $providers = [];
-
-
-	public function __construct(IDBConnection $connection, IProviderManager $providerManager, LoggerInterface $logger) {
-		$this->connection = $connection;
-		$this->providerManager = $providerManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param int $id
-	 * @return ICollection
-	 * @throws CollectionException when the collection could not be found
-	 * @since 16.0.0
-	 */
-	public function getCollection(int $id): ICollection {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from(self::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if (!$row) {
-			throw new CollectionException('Collection not found');
-		}
-
-		return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name']);
-	}
-
-	/**
-	 * @param int $id
-	 * @param IUser|null $user
-	 * @return ICollection
-	 * @throws CollectionException when the collection could not be found
-	 * @since 16.0.0
-	 */
-	public function getCollectionForUser(int $id, ?IUser $user): ICollection {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('*')
-			->from(self::TABLE_COLLECTIONS, 'c')
-			->leftJoin(
-				'c', self::TABLE_ACCESS_CACHE, 'a',
-				$query->expr()->andX(
-					$query->expr()->eq('c.id', 'a.collection_id'),
-					$query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
-				)
-			)
-			->where($query->expr()->eq('c.id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if (!$row) {
-			throw new CollectionException('Collection not found');
-		}
-
-		$access = $row['access'] === null ? null : (bool) $row['access'];
-		if ($user instanceof IUser) {
-			return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access);
-		}
-
-		return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string $filter
-	 * @param int $limit
-	 * @param int $start
-	 * @return ICollection[]
-	 * @since 16.0.0
-	 */
-	public function searchCollections(IUser $user, string $filter, int $limit = 50, int $start = 0): array {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('c.*', 'a.access')
-			->from(self::TABLE_COLLECTIONS, 'c')
-			->leftJoin(
-				'c', self::TABLE_ACCESS_CACHE, 'a',
-				$query->expr()->andX(
-					$query->expr()->eq('c.id', 'a.collection_id'),
-					$query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
-				)
-			)
-			->where($query->expr()->eq('a.access', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
-			->orderBy('c.id')
-			->setMaxResults($limit)
-			->setFirstResult($start);
-
-		if ($filter !== '') {
-			$query->where($query->expr()->iLike('c.name', $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($filter) . '%')));
-		}
-
-		$result = $query->execute();
-		$collections = [];
-
-		$foundResults = 0;
-		while ($row = $result->fetch()) {
-			$foundResults++;
-			$access = $row['access'] === null ? null : (bool) $row['access'];
-			$collection = new Collection($this, $this->connection, (int)$row['id'], (string)$row['name'], $user, $access);
-			if ($collection->canAccess($user)) {
-				$collections[] = $collection;
-			}
-		}
-		$result->closeCursor();
-
-		if (empty($collections) && $foundResults === $limit) {
-			return $this->searchCollections($user, $filter, $limit, $start + $limit);
-		}
-
-		return $collections;
-	}
-
-	/**
-	 * @param string $name
-	 * @return ICollection
-	 * @since 16.0.0
-	 */
-	public function newCollection(string $name): ICollection {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::TABLE_COLLECTIONS)
-			->values([
-				'name' => $query->createNamedParameter($name),
-			]);
-		$query->execute();
-
-		return new Collection($this, $this->connection, $query->getLastInsertId(), $name);
-	}
-
-	/**
-	 * @param string $type
-	 * @param string $id
-	 * @return IResource
-	 * @since 16.0.0
-	 */
-	public function createResource(string $type, string $id): IResource {
-		return new Resource($this, $this->connection, $type, $id);
-	}
-
-	/**
-	 * @param string $type
-	 * @param string $id
-	 * @param IUser|null $user
-	 * @return IResource
-	 * @throws ResourceException
-	 * @since 16.0.0
-	 */
-	public function getResourceForUser(string $type, string $id, ?IUser $user): IResource {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('r.*', 'a.access')
-			->from(self::TABLE_RESOURCES, 'r')
-			->leftJoin(
-				'r', self::TABLE_ACCESS_CACHE, 'a',
-				$query->expr()->andX(
-					$query->expr()->eq('r.resource_id', 'a.resource_id'),
-					$query->expr()->eq('r.resource_type', 'a.resource_type'),
-					$query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
-				)
-			)
-			->where($query->expr()->eq('r.resource_type', $query->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
-			->andWhere($query->expr()->eq('r.resource_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if (!$row) {
-			throw new ResourceException('Resource not found');
-		}
-
-		$access = $row['access'] === null ? null : (bool) $row['access'];
-		if ($user instanceof IUser) {
-			return new Resource($this, $this->connection, $type, $id, $user, $access);
-		}
-
-		return new Resource($this, $this->connection, $type, $id, null, $access);
-	}
-
-	/**
-	 * @param ICollection $collection
-	 * @param IUser|null $user
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResourcesByCollectionForUser(ICollection $collection, ?IUser $user): array {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('r.*', 'a.access')
-			->from(self::TABLE_RESOURCES, 'r')
-			->leftJoin(
-				'r', self::TABLE_ACCESS_CACHE, 'a',
-				$query->expr()->andX(
-					$query->expr()->eq('r.resource_id', 'a.resource_id'),
-					$query->expr()->eq('r.resource_type', 'a.resource_type'),
-					$query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
-				)
-			)
-			->where($query->expr()->eq('r.collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)));
-
-		$resources = [];
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$access = $row['access'] === null ? null : (bool) $row['access'];
-			$resources[] = new Resource($this, $this->connection, $row['resource_type'], $row['resource_id'], $user, $access);
-		}
-		$result->closeCursor();
-
-		return $resources;
-	}
-
-	/**
-	 * Get the rich object data of a resource
-	 *
-	 * @param IResource $resource
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getResourceRichObject(IResource $resource): array {
-		foreach ($this->providerManager->getResourceProviders() as $provider) {
-			if ($provider->getType() === $resource->getType()) {
-				try {
-					return $provider->getResourceRichObject($resource);
-				} catch (ResourceException $e) {
-				}
-			}
-		}
-
-		return [];
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IResource $resource
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessResource(IResource $resource, ?IUser $user): bool {
-		$access = $this->checkAccessCacheForUserByResource($resource, $user);
-		if (\is_bool($access)) {
-			return $access;
-		}
-
-		$access = false;
-		foreach ($this->providerManager->getResourceProviders() as $provider) {
-			if ($provider->getType() === $resource->getType()) {
-				try {
-					if ($provider->canAccessResource($resource, $user)) {
-						$access = true;
-						break;
-					}
-				} catch (ResourceException $e) {
-				}
-			}
-		}
-
-		$this->cacheAccessForResource($resource, $user, $access);
-		return $access;
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param ICollection $collection
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessCollection(ICollection $collection, ?IUser $user): bool {
-		$access = $this->checkAccessCacheForUserByCollection($collection, $user);
-		if (\is_bool($access)) {
-			return $access;
-		}
-
-		$access = null;
-		// Access is granted when a user can access all resources
-		foreach ($collection->getResources() as $resource) {
-			if (!$resource->canAccess($user)) {
-				$access = false;
-				break;
-			}
-
-			$access = true;
-		}
-
-		$this->cacheAccessForCollection($collection, $user, $access);
-		return $access;
-	}
-
-	protected function checkAccessCacheForUserByResource(IResource $resource, ?IUser $user): ?bool {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('access')
-			->from(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId(), IQueryBuilder::PARAM_STR)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
-			->setMaxResults(1);
-
-		$hasAccess = null;
-		$result = $query->execute();
-		if ($row = $result->fetch()) {
-			$hasAccess = (bool) $row['access'];
-		}
-		$result->closeCursor();
-
-		return $hasAccess;
-	}
-
-	protected function checkAccessCacheForUserByCollection(ICollection $collection, ?IUser $user): ?bool {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->select('access')
-			->from(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
-			->setMaxResults(1);
-
-		$hasAccess = null;
-		$result = $query->execute();
-		if ($row = $result->fetch()) {
-			$hasAccess = (bool) $row['access'];
-		}
-		$result->closeCursor();
-
-		return $hasAccess;
-	}
-
-	public function cacheAccessForResource(IResource $resource, ?IUser $user, bool $access): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->insert(self::TABLE_ACCESS_CACHE)
-			->values([
-				'user_id' => $query->createNamedParameter($userId),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
-			]);
-		try {
-			$query->execute();
-		} catch (UniqueConstraintViolationException $e) {
-		}
-	}
-
-	public function cacheAccessForCollection(ICollection $collection, ?IUser $user, bool $access): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->insert(self::TABLE_ACCESS_CACHE)
-			->values([
-				'user_id' => $query->createNamedParameter($userId),
-				'collection_id' => $query->createNamedParameter($collection->getId()),
-				'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
-			]);
-		try {
-			$query->execute();
-		} catch (UniqueConstraintViolationException $e) {
-		}
-	}
-
-	public function invalidateAccessCacheForUser(?IUser $user): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
-		$query->execute();
-	}
-
-	public function invalidateAccessCacheForResource(IResource $resource): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)));
-		$query->execute();
-
-		foreach ($resource->getCollections() as $collection) {
-			$this->invalidateAccessCacheForCollection($collection);
-		}
-	}
-
-	public function invalidateAccessCacheForAllCollections(): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->neq('collection_id', $query->createNamedParameter(0)));
-		$query->execute();
-	}
-
-	public function invalidateAccessCacheForCollection(ICollection $collection): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())));
-		$query->execute();
-	}
-
-	public function invalidateAccessCacheForProvider(IProvider $provider): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)));
-		$query->execute();
-	}
-
-	public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
-		$query->execute();
-
-		foreach ($resource->getCollections() as $collection) {
-			$this->invalidateAccessCacheForCollectionByUser($collection, $user);
-		}
-	}
-
-	protected function invalidateAccessCacheForCollectionByUser(ICollection $collection, ?IUser $user): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
-		$query->execute();
-	}
-
-	public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void {
-		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		$query->delete(self::TABLE_ACCESS_CACHE)
-			->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
-		$query->execute();
-	}
-
-	/**
-	 * @param string $provider
-	 */
-	public function registerResourceProvider(string $provider): void {
-		$this->logger->debug('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated', ['provider' => $provider]);
-		$this->providerManager->registerResourceProvider($provider);
-	}
-
-	/**
-	 * Get the resource type of the provider
-	 *
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return '';
-	}
+    public const TABLE_COLLECTIONS = 'collres_collections';
+    public const TABLE_RESOURCES = 'collres_resources';
+    public const TABLE_ACCESS_CACHE = 'collres_accesscache';
+
+    /** @var IDBConnection */
+    protected $connection;
+    /** @var IProviderManager */
+    protected $providerManager;
+    /** @var LoggerInterface */
+    protected $logger;
+
+    /** @var string[] */
+    protected $providers = [];
+
+
+    public function __construct(IDBConnection $connection, IProviderManager $providerManager, LoggerInterface $logger) {
+        $this->connection = $connection;
+        $this->providerManager = $providerManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param int $id
+     * @return ICollection
+     * @throws CollectionException when the collection could not be found
+     * @since 16.0.0
+     */
+    public function getCollection(int $id): ICollection {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from(self::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if (!$row) {
+            throw new CollectionException('Collection not found');
+        }
+
+        return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name']);
+    }
+
+    /**
+     * @param int $id
+     * @param IUser|null $user
+     * @return ICollection
+     * @throws CollectionException when the collection could not be found
+     * @since 16.0.0
+     */
+    public function getCollectionForUser(int $id, ?IUser $user): ICollection {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('*')
+            ->from(self::TABLE_COLLECTIONS, 'c')
+            ->leftJoin(
+                'c', self::TABLE_ACCESS_CACHE, 'a',
+                $query->expr()->andX(
+                    $query->expr()->eq('c.id', 'a.collection_id'),
+                    $query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
+                )
+            )
+            ->where($query->expr()->eq('c.id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if (!$row) {
+            throw new CollectionException('Collection not found');
+        }
+
+        $access = $row['access'] === null ? null : (bool) $row['access'];
+        if ($user instanceof IUser) {
+            return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access);
+        }
+
+        return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access);
+    }
+
+    /**
+     * @param IUser $user
+     * @param string $filter
+     * @param int $limit
+     * @param int $start
+     * @return ICollection[]
+     * @since 16.0.0
+     */
+    public function searchCollections(IUser $user, string $filter, int $limit = 50, int $start = 0): array {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('c.*', 'a.access')
+            ->from(self::TABLE_COLLECTIONS, 'c')
+            ->leftJoin(
+                'c', self::TABLE_ACCESS_CACHE, 'a',
+                $query->expr()->andX(
+                    $query->expr()->eq('c.id', 'a.collection_id'),
+                    $query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
+                )
+            )
+            ->where($query->expr()->eq('a.access', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
+            ->orderBy('c.id')
+            ->setMaxResults($limit)
+            ->setFirstResult($start);
+
+        if ($filter !== '') {
+            $query->where($query->expr()->iLike('c.name', $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($filter) . '%')));
+        }
+
+        $result = $query->execute();
+        $collections = [];
+
+        $foundResults = 0;
+        while ($row = $result->fetch()) {
+            $foundResults++;
+            $access = $row['access'] === null ? null : (bool) $row['access'];
+            $collection = new Collection($this, $this->connection, (int)$row['id'], (string)$row['name'], $user, $access);
+            if ($collection->canAccess($user)) {
+                $collections[] = $collection;
+            }
+        }
+        $result->closeCursor();
+
+        if (empty($collections) && $foundResults === $limit) {
+            return $this->searchCollections($user, $filter, $limit, $start + $limit);
+        }
+
+        return $collections;
+    }
+
+    /**
+     * @param string $name
+     * @return ICollection
+     * @since 16.0.0
+     */
+    public function newCollection(string $name): ICollection {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::TABLE_COLLECTIONS)
+            ->values([
+                'name' => $query->createNamedParameter($name),
+            ]);
+        $query->execute();
+
+        return new Collection($this, $this->connection, $query->getLastInsertId(), $name);
+    }
+
+    /**
+     * @param string $type
+     * @param string $id
+     * @return IResource
+     * @since 16.0.0
+     */
+    public function createResource(string $type, string $id): IResource {
+        return new Resource($this, $this->connection, $type, $id);
+    }
+
+    /**
+     * @param string $type
+     * @param string $id
+     * @param IUser|null $user
+     * @return IResource
+     * @throws ResourceException
+     * @since 16.0.0
+     */
+    public function getResourceForUser(string $type, string $id, ?IUser $user): IResource {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('r.*', 'a.access')
+            ->from(self::TABLE_RESOURCES, 'r')
+            ->leftJoin(
+                'r', self::TABLE_ACCESS_CACHE, 'a',
+                $query->expr()->andX(
+                    $query->expr()->eq('r.resource_id', 'a.resource_id'),
+                    $query->expr()->eq('r.resource_type', 'a.resource_type'),
+                    $query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
+                )
+            )
+            ->where($query->expr()->eq('r.resource_type', $query->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
+            ->andWhere($query->expr()->eq('r.resource_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if (!$row) {
+            throw new ResourceException('Resource not found');
+        }
+
+        $access = $row['access'] === null ? null : (bool) $row['access'];
+        if ($user instanceof IUser) {
+            return new Resource($this, $this->connection, $type, $id, $user, $access);
+        }
+
+        return new Resource($this, $this->connection, $type, $id, null, $access);
+    }
+
+    /**
+     * @param ICollection $collection
+     * @param IUser|null $user
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResourcesByCollectionForUser(ICollection $collection, ?IUser $user): array {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('r.*', 'a.access')
+            ->from(self::TABLE_RESOURCES, 'r')
+            ->leftJoin(
+                'r', self::TABLE_ACCESS_CACHE, 'a',
+                $query->expr()->andX(
+                    $query->expr()->eq('r.resource_id', 'a.resource_id'),
+                    $query->expr()->eq('r.resource_type', 'a.resource_type'),
+                    $query->expr()->eq('a.user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR))
+                )
+            )
+            ->where($query->expr()->eq('r.collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)));
+
+        $resources = [];
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $access = $row['access'] === null ? null : (bool) $row['access'];
+            $resources[] = new Resource($this, $this->connection, $row['resource_type'], $row['resource_id'], $user, $access);
+        }
+        $result->closeCursor();
+
+        return $resources;
+    }
+
+    /**
+     * Get the rich object data of a resource
+     *
+     * @param IResource $resource
+     * @return array
+     * @since 16.0.0
+     */
+    public function getResourceRichObject(IResource $resource): array {
+        foreach ($this->providerManager->getResourceProviders() as $provider) {
+            if ($provider->getType() === $resource->getType()) {
+                try {
+                    return $provider->getResourceRichObject($resource);
+                } catch (ResourceException $e) {
+                }
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IResource $resource
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessResource(IResource $resource, ?IUser $user): bool {
+        $access = $this->checkAccessCacheForUserByResource($resource, $user);
+        if (\is_bool($access)) {
+            return $access;
+        }
+
+        $access = false;
+        foreach ($this->providerManager->getResourceProviders() as $provider) {
+            if ($provider->getType() === $resource->getType()) {
+                try {
+                    if ($provider->canAccessResource($resource, $user)) {
+                        $access = true;
+                        break;
+                    }
+                } catch (ResourceException $e) {
+                }
+            }
+        }
+
+        $this->cacheAccessForResource($resource, $user, $access);
+        return $access;
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param ICollection $collection
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessCollection(ICollection $collection, ?IUser $user): bool {
+        $access = $this->checkAccessCacheForUserByCollection($collection, $user);
+        if (\is_bool($access)) {
+            return $access;
+        }
+
+        $access = null;
+        // Access is granted when a user can access all resources
+        foreach ($collection->getResources() as $resource) {
+            if (!$resource->canAccess($user)) {
+                $access = false;
+                break;
+            }
+
+            $access = true;
+        }
+
+        $this->cacheAccessForCollection($collection, $user, $access);
+        return $access;
+    }
+
+    protected function checkAccessCacheForUserByResource(IResource $resource, ?IUser $user): ?bool {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('access')
+            ->from(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+            ->setMaxResults(1);
+
+        $hasAccess = null;
+        $result = $query->execute();
+        if ($row = $result->fetch()) {
+            $hasAccess = (bool) $row['access'];
+        }
+        $result->closeCursor();
+
+        return $hasAccess;
+    }
+
+    protected function checkAccessCacheForUserByCollection(ICollection $collection, ?IUser $user): ?bool {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->select('access')
+            ->from(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+            ->setMaxResults(1);
+
+        $hasAccess = null;
+        $result = $query->execute();
+        if ($row = $result->fetch()) {
+            $hasAccess = (bool) $row['access'];
+        }
+        $result->closeCursor();
+
+        return $hasAccess;
+    }
+
+    public function cacheAccessForResource(IResource $resource, ?IUser $user, bool $access): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->insert(self::TABLE_ACCESS_CACHE)
+            ->values([
+                'user_id' => $query->createNamedParameter($userId),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
+            ]);
+        try {
+            $query->execute();
+        } catch (UniqueConstraintViolationException $e) {
+        }
+    }
+
+    public function cacheAccessForCollection(ICollection $collection, ?IUser $user, bool $access): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->insert(self::TABLE_ACCESS_CACHE)
+            ->values([
+                'user_id' => $query->createNamedParameter($userId),
+                'collection_id' => $query->createNamedParameter($collection->getId()),
+                'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
+            ]);
+        try {
+            $query->execute();
+        } catch (UniqueConstraintViolationException $e) {
+        }
+    }
+
+    public function invalidateAccessCacheForUser(?IUser $user): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+        $query->execute();
+    }
+
+    public function invalidateAccessCacheForResource(IResource $resource): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)));
+        $query->execute();
+
+        foreach ($resource->getCollections() as $collection) {
+            $this->invalidateAccessCacheForCollection($collection);
+        }
+    }
+
+    public function invalidateAccessCacheForAllCollections(): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->neq('collection_id', $query->createNamedParameter(0)));
+        $query->execute();
+    }
+
+    public function invalidateAccessCacheForCollection(ICollection $collection): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())));
+        $query->execute();
+    }
+
+    public function invalidateAccessCacheForProvider(IProvider $provider): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)));
+        $query->execute();
+    }
+
+    public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
+            ->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+        $query->execute();
+
+        foreach ($resource->getCollections() as $collection) {
+            $this->invalidateAccessCacheForCollectionByUser($collection, $user);
+        }
+    }
+
+    protected function invalidateAccessCacheForCollectionByUser(ICollection $collection, ?IUser $user): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())))
+            ->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+        $query->execute();
+    }
+
+    public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void {
+        $query = $this->connection->getQueryBuilder();
+        $userId = $user instanceof IUser ? $user->getUID() : '';
+
+        $query->delete(self::TABLE_ACCESS_CACHE)
+            ->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+        $query->execute();
+    }
+
+    /**
+     * @param string $provider
+     */
+    public function registerResourceProvider(string $provider): void {
+        $this->logger->debug('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated', ['provider' => $provider]);
+        $this->providerManager->registerResourceProvider($provider);
+    }
+
+    /**
+     * Get the resource type of the provider
+     *
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return '';
+    }
 }

lib/private/Collaboration/Resources/ProviderManager.php

Indentation +30 added lines, -30 removed lines

@@ -34,41 +34,41 @@
 
 class ProviderManager implements IProviderManager {
 
-	/** @var string[] */
-	protected $providers = [];
+    /** @var string[] */
+    protected $providers = [];
 
-	/** @var IProvider[] */
-	protected $providerInstances = [];
+    /** @var IProvider[] */
+    protected $providerInstances = [];
 
-	/** @var IServerContainer */
-	protected $serverContainer;
+    /** @var IServerContainer */
+    protected $serverContainer;
 
-	/** @var LoggerInterface */
-	protected $logger;
+    /** @var LoggerInterface */
+    protected $logger;
 
-	public function __construct(IServerContainer $serverContainer, LoggerInterface $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->logger = $logger;
-	}
+    public function __construct(IServerContainer $serverContainer, LoggerInterface $logger) {
+        $this->serverContainer = $serverContainer;
+        $this->logger = $logger;
+    }
 
-	public function getResourceProviders(): array {
-		if ($this->providers !== []) {
-			foreach ($this->providers as $provider) {
-				try {
-					$this->providerInstances[] = $this->serverContainer->query($provider);
-				} catch (QueryException $e) {
-					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
-						'exception' => $e,
-					]);
-				}
-			}
-			$this->providers = [];
-		}
+    public function getResourceProviders(): array {
+        if ($this->providers !== []) {
+            foreach ($this->providers as $provider) {
+                try {
+                    $this->providerInstances[] = $this->serverContainer->query($provider);
+                } catch (QueryException $e) {
+                    $this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                }
+            }
+            $this->providers = [];
+        }
 
-		return $this->providerInstances;
-	}
+        return $this->providerInstances;
+    }
 
-	public function registerResourceProvider(string $provider): void {
-		$this->providers[] = $provider;
-	}
+    public function registerResourceProvider(string $provider): void {
+        $this->providers[] = $provider;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 				try {
 					$this->providerInstances[] = $this->serverContainer->query($provider);
 				} catch (QueryException $e) {
-					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
+					$this->logger->error("Could not query resource provider $provider: ".$e->getMessage(), [
 						'exception' => $e,
 					]);
 				}

lib/private/Setup.php

Indentation +541 added lines, -541 removed lines

@@ -64,545 +64,545 @@
 use Psr\Log\LoggerInterface;
 
 class Setup {
-	/** @var SystemConfig */
-	protected $config;
-	/** @var IniGetWrapper */
-	protected $iniWrapper;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var LoggerInterface */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
-	/** @var Installer */
-	protected $installer;
-
-	public function __construct(
-		SystemConfig $config,
-		IniGetWrapper $iniWrapper,
-		IL10N $l10n,
-		Defaults $defaults,
-		LoggerInterface $logger,
-		ISecureRandom $random,
-		Installer $installer
-	) {
-		$this->config = $config;
-		$this->iniWrapper = $iniWrapper;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-		$this->logger = $logger;
-		$this->random = $random;
-		$this->installer = $installer;
-	}
-
-	protected static $dbSetupClasses = [
-		'mysql' => \OC\Setup\MySQL::class,
-		'pgsql' => \OC\Setup\PostgreSQL::class,
-		'oci' => \OC\Setup\OCI::class,
-		'sqlite' => \OC\Setup\Sqlite::class,
-		'sqlite3' => \OC\Setup\Sqlite::class,
-	];
-
-	/**
-	 * Wrapper around the "class_exists" PHP function to be able to mock it
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function class_exists($name) {
-		return class_exists($name);
-	}
-
-	/**
-	 * Wrapper around the "is_callable" PHP function to be able to mock it
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function is_callable($name) {
-		return is_callable($name);
-	}
-
-	/**
-	 * Wrapper around \PDO::getAvailableDrivers
-	 *
-	 * @return array
-	 */
-	protected function getAvailableDbDriversForPdo() {
-		return \PDO::getAvailableDrivers();
-	}
-
-	/**
-	 * Get the available and supported databases of this instance
-	 *
-	 * @param bool $allowAllDatabases
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getSupportedDatabases($allowAllDatabases = false) {
-		$availableDatabases = [
-			'sqlite' => [
-				'type' => 'pdo',
-				'call' => 'sqlite',
-				'name' => 'SQLite',
-			],
-			'mysql' => [
-				'type' => 'pdo',
-				'call' => 'mysql',
-				'name' => 'MySQL/MariaDB',
-			],
-			'pgsql' => [
-				'type' => 'pdo',
-				'call' => 'pgsql',
-				'name' => 'PostgreSQL',
-			],
-			'oci' => [
-				'type' => 'function',
-				'call' => 'oci_connect',
-				'name' => 'Oracle',
-			],
-		];
-		if ($allowAllDatabases) {
-			$configuredDatabases = array_keys($availableDatabases);
-		} else {
-			$configuredDatabases = $this->config->getValue('supportedDatabases',
-				['sqlite', 'mysql', 'pgsql']);
-		}
-		if (!is_array($configuredDatabases)) {
-			throw new Exception('Supported databases are not properly configured.');
-		}
-
-		$supportedDatabases = [];
-
-		foreach ($configuredDatabases as $database) {
-			if (array_key_exists($database, $availableDatabases)) {
-				$working = false;
-				$type = $availableDatabases[$database]['type'];
-				$call = $availableDatabases[$database]['call'];
-
-				if ($type === 'function') {
-					$working = $this->is_callable($call);
-				} elseif ($type === 'pdo') {
-					$working = in_array($call, $this->getAvailableDbDriversForPdo(), true);
-				}
-				if ($working) {
-					$supportedDatabases[$database] = $availableDatabases[$database]['name'];
-				}
-			}
-		}
-
-		return $supportedDatabases;
-	}
-
-	/**
-	 * Gathers system information like database type and does
-	 * a few system checks.
-	 *
-	 * @return array of system info, including an "errors" value
-	 * in case of errors/warnings
-	 */
-	public function getSystemInfo($allowAllDatabases = false) {
-		$databases = $this->getSupportedDatabases($allowAllDatabases);
-
-		$dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
-
-		$errors = [];
-
-		// Create data directory to test whether the .htaccess works
-		// Notice that this is not necessarily the same data directory as the one
-		// that will effectively be used.
-		if (!file_exists($dataDir)) {
-			@mkdir($dataDir);
-		}
-		$htAccessWorking = true;
-		if (is_dir($dataDir) && is_writable($dataDir)) {
-			// Protect data directory here, so we can test if the protection is working
-			self::protectDataDirectory();
-
-			try {
-				$util = new \OC_Util();
-				$htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
-			} catch (\OC\HintException $e) {
-				$errors[] = [
-					'error' => $e->getMessage(),
-					'exception' => $e,
-					'hint' => $e->getHint(),
-				];
-				$htAccessWorking = false;
-			}
-		}
-
-		if (\OC_Util::runningOnMac()) {
-			$errors[] = [
-				'error' => $this->l10n->t(
-					'Mac OS X is not supported and %s will not work properly on this platform. ' .
-					'Use it at your own risk! ',
-					[$this->defaults->getName()]
-				),
-				'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
-			];
-		}
-
-		if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
-			$errors[] = [
-				'error' => $this->l10n->t(
-					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
-					'This will lead to problems with files over 4 GB and is highly discouraged.',
-					[$this->defaults->getName()]
-				),
-				'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'),
-			];
-		}
-
-		return [
-			'hasSQLite' => isset($databases['sqlite']),
-			'hasMySQL' => isset($databases['mysql']),
-			'hasPostgreSQL' => isset($databases['pgsql']),
-			'hasOracle' => isset($databases['oci']),
-			'databases' => $databases,
-			'directory' => $dataDir,
-			'htaccessWorking' => $htAccessWorking,
-			'errors' => $errors,
-		];
-	}
-
-	/**
-	 * @param $options
-	 * @return array
-	 */
-	public function install($options) {
-		$l = $this->l10n;
-
-		$error = [];
-		$dbType = $options['dbtype'];
-
-		if (empty($options['adminlogin'])) {
-			$error[] = $l->t('Set an admin username.');
-		}
-		if (empty($options['adminpass'])) {
-			$error[] = $l->t('Set an admin password.');
-		}
-		if (empty($options['directory'])) {
-			$options['directory'] = \OC::$SERVERROOT . "/data";
-		}
-
-		if (!isset(self::$dbSetupClasses[$dbType])) {
-			$dbType = 'sqlite';
-		}
-
-		$username = htmlspecialchars_decode($options['adminlogin']);
-		$password = htmlspecialchars_decode($options['adminpass']);
-		$dataDir = htmlspecialchars_decode($options['directory']);
-
-		$class = self::$dbSetupClasses[$dbType];
-		/** @var \OC\Setup\AbstractDatabase $dbSetup */
-		$dbSetup = new $class($l, $this->config, $this->logger, $this->random);
-		$error = array_merge($error, $dbSetup->validate($options));
-
-		// validate the data directory
-		if ((!is_dir($dataDir) && !mkdir($dataDir)) || !is_writable($dataDir)) {
-			$error[] = $l->t("Can't create or write into the data directory %s", [$dataDir]);
-		}
-
-		if (!empty($error)) {
-			return $error;
-		}
-
-		$request = \OC::$server->getRequest();
-
-		//no errors, good
-		if (isset($options['trusted_domains'])
-			&& is_array($options['trusted_domains'])) {
-			$trustedDomains = $options['trusted_domains'];
-		} else {
-			$trustedDomains = [$request->getInsecureServerHost()];
-		}
-
-		//use sqlite3 when available, otherwise sqlite2 will be used.
-		if ($dbType === 'sqlite' && class_exists('SQLite3')) {
-			$dbType = 'sqlite3';
-		}
-
-		//generate a random salt that is used to salt the local user passwords
-		$salt = $this->random->generate(30);
-		// generate a secret
-		$secret = $this->random->generate(48);
-
-		//write the config file
-		$newConfigValues = [
-			'passwordsalt' => $salt,
-			'secret' => $secret,
-			'trusted_domains' => $trustedDomains,
-			'datadirectory' => $dataDir,
-			'dbtype' => $dbType,
-			'version' => implode('.', \OCP\Util::getVersion()),
-		];
-
-		if ($this->config->getValue('overwrite.cli.url', null) === null) {
-			$newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
-		}
-
-		$this->config->setValues($newConfigValues);
-
-		$dbSetup->initialize($options);
-		try {
-			$dbSetup->setupDatabase($username);
-		} catch (\OC\DatabaseSetupException $e) {
-			$error[] = [
-				'error' => $e->getMessage(),
-				'exception' => $e,
-				'hint' => $e->getHint(),
-			];
-			return $error;
-		} catch (Exception $e) {
-			$error[] = [
-				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
-				'exception' => $e,
-				'hint' => '',
-			];
-			return $error;
-		}
-		try {
-			// apply necessary migrations
-			$dbSetup->runMigrations();
-		} catch (Exception $e) {
-			$error[] = [
-				'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
-				'exception' => $e,
-				'hint' => '',
-			];
-			return $error;
-		}
-
-		//create the user and group
-		$user = null;
-		try {
-			$user = \OC::$server->getUserManager()->createUser($username, $password);
-			if (!$user) {
-				$error[] = "User <$username> could not be created.";
-			}
-		} catch (Exception $exception) {
-			$error[] = $exception->getMessage();
-		}
-
-		if (empty($error)) {
-			$config = \OC::$server->getConfig();
-			$config->setAppValue('core', 'installedat', microtime(true));
-			$config->setAppValue('core', 'lastupdatedat', microtime(true));
-			$config->setAppValue('core', 'vendor', $this->getVendor());
-
-			$group = \OC::$server->getGroupManager()->createGroup('admin');
-			if ($group instanceof IGroup) {
-				$group->addUser($user);
-			}
-
-			// Install shipped apps and specified app bundles
-			Installer::installShippedApps();
-			$bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
-			$defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
-			foreach ($defaultInstallationBundles as $bundle) {
-				try {
-					$this->installer->installAppBundle($bundle);
-				} catch (Exception $e) {
-				}
-			}
-
-			// create empty file in data dir, so we can later find
-			// out that this is indeed an ownCloud data directory
-			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
-
-			// Update .htaccess files
-			self::updateHtaccess();
-			self::protectDataDirectory();
-
-			self::installBackgroundJobs();
-
-			//and we are done
-			$config->setSystemValue('installed', true);
-
-			// Create a session token for the newly created user
-			// The token provider requires a working db, so it's not injected on setup
-			/* @var $userSession User\Session */
-			$userSession = \OC::$server->getUserSession();
-			$defaultTokenProvider = \OC::$server->query(DefaultTokenProvider::class);
-			$userSession->setTokenProvider($defaultTokenProvider);
-			$userSession->login($username, $password);
-			$userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
-
-			$session = $userSession->getSession();
-			$session->set('last-password-confirm', \OC::$server->query(ITimeFactory::class)->getTime());
-
-			// Set email for admin
-			if (!empty($options['adminemail'])) {
-				$config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']);
-			}
-		}
-
-		return $error;
-	}
-
-	public static function installBackgroundJobs() {
-		$jobList = \OC::$server->getJobList();
-		$jobList->add(DefaultTokenCleanupJob::class);
-		$jobList->add(Rotate::class);
-		$jobList->add(BackgroundCleanupJob::class);
-	}
-
-	/**
-	 * @return string Absolute path to htaccess
-	 */
-	private function pathToHtaccess() {
-		return \OC::$SERVERROOT . '/.htaccess';
-	}
-
-	/**
-	 * Find webroot from config
-	 *
-	 * @param SystemConfig $config
-	 * @return string
-	 * @throws InvalidArgumentException when invalid value for overwrite.cli.url
-	 */
-	private static function findWebRoot(SystemConfig $config): string {
-		// For CLI read the value from overwrite.cli.url
-		if (\OC::$CLI) {
-			$webRoot = $config->getValue('overwrite.cli.url', '');
-			if ($webRoot === '') {
-				throw new InvalidArgumentException('overwrite.cli.url is empty');
-			}
-			if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
-				throw new InvalidArgumentException('invalid value for overwrite.cli.url');
-			}
-			$webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
-		} else {
-			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
-		}
-
-		return $webRoot;
-	}
-
-	/**
-	 * Append the correct ErrorDocument path for Apache hosts
-	 *
-	 * @return bool True when success, False otherwise
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public static function updateHtaccess() {
-		$config = \OC::$server->getSystemConfig();
-
-		try {
-			$webRoot = self::findWebRoot($config);
-		} catch (InvalidArgumentException $e) {
-			return false;
-		}
-
-		$setupHelper = new \OC\Setup(
-			$config,
-			\OC::$server->get(IniGetWrapper::class),
-			\OC::$server->getL10N('lib'),
-			\OC::$server->query(Defaults::class),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
-		);
-
-		$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
-		$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
-		$htaccessContent = explode($content, $htaccessContent, 2)[0];
-
-		//custom 403 error page
-		$content .= "\nErrorDocument 403 " . $webRoot . '/';
-
-		//custom 404 error page
-		$content .= "\nErrorDocument 404 " . $webRoot . '/';
-
-		// Add rewrite rules if the RewriteBase is configured
-		$rewriteBase = $config->getValue('htaccess.RewriteBase', '');
-		if ($rewriteBase !== '') {
-			$content .= "\n<IfModule mod_rewrite.c>";
-			$content .= "\n  Options -MultiViews";
-			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4|mp3|ogg|wav)$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
-			$content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/richdocumentscode(_arm64)?/proxy.php$";
-			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteBase " . $rewriteBase;
-			$content .= "\n  <IfModule mod_env.c>";
-			$content .= "\n    SetEnv front_controller_active true";
-			$content .= "\n    <IfModule mod_dir.c>";
-			$content .= "\n      DirectorySlash off";
-			$content .= "\n    </IfModule>";
-			$content .= "\n  </IfModule>";
-			$content .= "\n</IfModule>";
-		}
-
-		if ($content !== '') {
-			//suppress errors in case we don't have permissions for it
-			return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n");
-		}
-
-		return false;
-	}
-
-	public static function protectDataDirectory() {
-		//Require all denied
-		$now = date('Y-m-d H:i:s');
-		$content = "# Generated by Nextcloud on $now\n";
-		$content .= "# Section for Apache 2.4 to 2.6\n";
-		$content .= "<IfModule mod_authz_core.c>\n";
-		$content .= "  Require all denied\n";
-		$content .= "</IfModule>\n";
-		$content .= "<IfModule mod_access_compat.c>\n";
-		$content .= "  Order Allow,Deny\n";
-		$content .= "  Deny from all\n";
-		$content .= "  Satisfy All\n";
-		$content .= "</IfModule>\n\n";
-		$content .= "# Section for Apache 2.2\n";
-		$content .= "<IfModule !mod_authz_core.c>\n";
-		$content .= "  <IfModule !mod_access_compat.c>\n";
-		$content .= "    <IfModule mod_authz_host.c>\n";
-		$content .= "      Order Allow,Deny\n";
-		$content .= "      Deny from all\n";
-		$content .= "    </IfModule>\n";
-		$content .= "    Satisfy All\n";
-		$content .= "  </IfModule>\n";
-		$content .= "</IfModule>\n\n";
-		$content .= "# Section for Apache 2.2 to 2.6\n";
-		$content .= "<IfModule mod_autoindex.c>\n";
-		$content .= "  IndexIgnore *\n";
-		$content .= "</IfModule>";
-
-		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		file_put_contents($baseDir . '/.htaccess', $content);
-		file_put_contents($baseDir . '/index.html', '');
-	}
-
-	/**
-	 * Return vendor from which this version was published
-	 *
-	 * @return string Get the vendor
-	 *
-	 * Copy of \OC\Updater::getVendor()
-	 */
-	private function getVendor() {
-		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
-		/** @var string $vendor */
-		return (string)$vendor;
-	}
+    /** @var SystemConfig */
+    protected $config;
+    /** @var IniGetWrapper */
+    protected $iniWrapper;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var LoggerInterface */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
+    /** @var Installer */
+    protected $installer;
+
+    public function __construct(
+        SystemConfig $config,
+        IniGetWrapper $iniWrapper,
+        IL10N $l10n,
+        Defaults $defaults,
+        LoggerInterface $logger,
+        ISecureRandom $random,
+        Installer $installer
+    ) {
+        $this->config = $config;
+        $this->iniWrapper = $iniWrapper;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+        $this->logger = $logger;
+        $this->random = $random;
+        $this->installer = $installer;
+    }
+
+    protected static $dbSetupClasses = [
+        'mysql' => \OC\Setup\MySQL::class,
+        'pgsql' => \OC\Setup\PostgreSQL::class,
+        'oci' => \OC\Setup\OCI::class,
+        'sqlite' => \OC\Setup\Sqlite::class,
+        'sqlite3' => \OC\Setup\Sqlite::class,
+    ];
+
+    /**
+     * Wrapper around the "class_exists" PHP function to be able to mock it
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function class_exists($name) {
+        return class_exists($name);
+    }
+
+    /**
+     * Wrapper around the "is_callable" PHP function to be able to mock it
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function is_callable($name) {
+        return is_callable($name);
+    }
+
+    /**
+     * Wrapper around \PDO::getAvailableDrivers
+     *
+     * @return array
+     */
+    protected function getAvailableDbDriversForPdo() {
+        return \PDO::getAvailableDrivers();
+    }
+
+    /**
+     * Get the available and supported databases of this instance
+     *
+     * @param bool $allowAllDatabases
+     * @return array
+     * @throws Exception
+     */
+    public function getSupportedDatabases($allowAllDatabases = false) {
+        $availableDatabases = [
+            'sqlite' => [
+                'type' => 'pdo',
+                'call' => 'sqlite',
+                'name' => 'SQLite',
+            ],
+            'mysql' => [
+                'type' => 'pdo',
+                'call' => 'mysql',
+                'name' => 'MySQL/MariaDB',
+            ],
+            'pgsql' => [
+                'type' => 'pdo',
+                'call' => 'pgsql',
+                'name' => 'PostgreSQL',
+            ],
+            'oci' => [
+                'type' => 'function',
+                'call' => 'oci_connect',
+                'name' => 'Oracle',
+            ],
+        ];
+        if ($allowAllDatabases) {
+            $configuredDatabases = array_keys($availableDatabases);
+        } else {
+            $configuredDatabases = $this->config->getValue('supportedDatabases',
+                ['sqlite', 'mysql', 'pgsql']);
+        }
+        if (!is_array($configuredDatabases)) {
+            throw new Exception('Supported databases are not properly configured.');
+        }
+
+        $supportedDatabases = [];
+
+        foreach ($configuredDatabases as $database) {
+            if (array_key_exists($database, $availableDatabases)) {
+                $working = false;
+                $type = $availableDatabases[$database]['type'];
+                $call = $availableDatabases[$database]['call'];
+
+                if ($type === 'function') {
+                    $working = $this->is_callable($call);
+                } elseif ($type === 'pdo') {
+                    $working = in_array($call, $this->getAvailableDbDriversForPdo(), true);
+                }
+                if ($working) {
+                    $supportedDatabases[$database] = $availableDatabases[$database]['name'];
+                }
+            }
+        }
+
+        return $supportedDatabases;
+    }
+
+    /**
+     * Gathers system information like database type and does
+     * a few system checks.
+     *
+     * @return array of system info, including an "errors" value
+     * in case of errors/warnings
+     */
+    public function getSystemInfo($allowAllDatabases = false) {
+        $databases = $this->getSupportedDatabases($allowAllDatabases);
+
+        $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
+
+        $errors = [];
+
+        // Create data directory to test whether the .htaccess works
+        // Notice that this is not necessarily the same data directory as the one
+        // that will effectively be used.
+        if (!file_exists($dataDir)) {
+            @mkdir($dataDir);
+        }
+        $htAccessWorking = true;
+        if (is_dir($dataDir) && is_writable($dataDir)) {
+            // Protect data directory here, so we can test if the protection is working
+            self::protectDataDirectory();
+
+            try {
+                $util = new \OC_Util();
+                $htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
+            } catch (\OC\HintException $e) {
+                $errors[] = [
+                    'error' => $e->getMessage(),
+                    'exception' => $e,
+                    'hint' => $e->getHint(),
+                ];
+                $htAccessWorking = false;
+            }
+        }
+
+        if (\OC_Util::runningOnMac()) {
+            $errors[] = [
+                'error' => $this->l10n->t(
+                    'Mac OS X is not supported and %s will not work properly on this platform. ' .
+                    'Use it at your own risk! ',
+                    [$this->defaults->getName()]
+                ),
+                'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
+            ];
+        }
+
+        if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
+            $errors[] = [
+                'error' => $this->l10n->t(
+                    'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
+                    'This will lead to problems with files over 4 GB and is highly discouraged.',
+                    [$this->defaults->getName()]
+                ),
+                'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'),
+            ];
+        }
+
+        return [
+            'hasSQLite' => isset($databases['sqlite']),
+            'hasMySQL' => isset($databases['mysql']),
+            'hasPostgreSQL' => isset($databases['pgsql']),
+            'hasOracle' => isset($databases['oci']),
+            'databases' => $databases,
+            'directory' => $dataDir,
+            'htaccessWorking' => $htAccessWorking,
+            'errors' => $errors,
+        ];
+    }
+
+    /**
+     * @param $options
+     * @return array
+     */
+    public function install($options) {
+        $l = $this->l10n;
+
+        $error = [];
+        $dbType = $options['dbtype'];
+
+        if (empty($options['adminlogin'])) {
+            $error[] = $l->t('Set an admin username.');
+        }
+        if (empty($options['adminpass'])) {
+            $error[] = $l->t('Set an admin password.');
+        }
+        if (empty($options['directory'])) {
+            $options['directory'] = \OC::$SERVERROOT . "/data";
+        }
+
+        if (!isset(self::$dbSetupClasses[$dbType])) {
+            $dbType = 'sqlite';
+        }
+
+        $username = htmlspecialchars_decode($options['adminlogin']);
+        $password = htmlspecialchars_decode($options['adminpass']);
+        $dataDir = htmlspecialchars_decode($options['directory']);
+
+        $class = self::$dbSetupClasses[$dbType];
+        /** @var \OC\Setup\AbstractDatabase $dbSetup */
+        $dbSetup = new $class($l, $this->config, $this->logger, $this->random);
+        $error = array_merge($error, $dbSetup->validate($options));
+
+        // validate the data directory
+        if ((!is_dir($dataDir) && !mkdir($dataDir)) || !is_writable($dataDir)) {
+            $error[] = $l->t("Can't create or write into the data directory %s", [$dataDir]);
+        }
+
+        if (!empty($error)) {
+            return $error;
+        }
+
+        $request = \OC::$server->getRequest();
+
+        //no errors, good
+        if (isset($options['trusted_domains'])
+            && is_array($options['trusted_domains'])) {
+            $trustedDomains = $options['trusted_domains'];
+        } else {
+            $trustedDomains = [$request->getInsecureServerHost()];
+        }
+
+        //use sqlite3 when available, otherwise sqlite2 will be used.
+        if ($dbType === 'sqlite' && class_exists('SQLite3')) {
+            $dbType = 'sqlite3';
+        }
+
+        //generate a random salt that is used to salt the local user passwords
+        $salt = $this->random->generate(30);
+        // generate a secret
+        $secret = $this->random->generate(48);
+
+        //write the config file
+        $newConfigValues = [
+            'passwordsalt' => $salt,
+            'secret' => $secret,
+            'trusted_domains' => $trustedDomains,
+            'datadirectory' => $dataDir,
+            'dbtype' => $dbType,
+            'version' => implode('.', \OCP\Util::getVersion()),
+        ];
+
+        if ($this->config->getValue('overwrite.cli.url', null) === null) {
+            $newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
+        }
+
+        $this->config->setValues($newConfigValues);
+
+        $dbSetup->initialize($options);
+        try {
+            $dbSetup->setupDatabase($username);
+        } catch (\OC\DatabaseSetupException $e) {
+            $error[] = [
+                'error' => $e->getMessage(),
+                'exception' => $e,
+                'hint' => $e->getHint(),
+            ];
+            return $error;
+        } catch (Exception $e) {
+            $error[] = [
+                'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+                'exception' => $e,
+                'hint' => '',
+            ];
+            return $error;
+        }
+        try {
+            // apply necessary migrations
+            $dbSetup->runMigrations();
+        } catch (Exception $e) {
+            $error[] = [
+                'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
+                'exception' => $e,
+                'hint' => '',
+            ];
+            return $error;
+        }
+
+        //create the user and group
+        $user = null;
+        try {
+            $user = \OC::$server->getUserManager()->createUser($username, $password);
+            if (!$user) {
+                $error[] = "User <$username> could not be created.";
+            }
+        } catch (Exception $exception) {
+            $error[] = $exception->getMessage();
+        }
+
+        if (empty($error)) {
+            $config = \OC::$server->getConfig();
+            $config->setAppValue('core', 'installedat', microtime(true));
+            $config->setAppValue('core', 'lastupdatedat', microtime(true));
+            $config->setAppValue('core', 'vendor', $this->getVendor());
+
+            $group = \OC::$server->getGroupManager()->createGroup('admin');
+            if ($group instanceof IGroup) {
+                $group->addUser($user);
+            }
+
+            // Install shipped apps and specified app bundles
+            Installer::installShippedApps();
+            $bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
+            $defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
+            foreach ($defaultInstallationBundles as $bundle) {
+                try {
+                    $this->installer->installAppBundle($bundle);
+                } catch (Exception $e) {
+                }
+            }
+
+            // create empty file in data dir, so we can later find
+            // out that this is indeed an ownCloud data directory
+            file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
+
+            // Update .htaccess files
+            self::updateHtaccess();
+            self::protectDataDirectory();
+
+            self::installBackgroundJobs();
+
+            //and we are done
+            $config->setSystemValue('installed', true);
+
+            // Create a session token for the newly created user
+            // The token provider requires a working db, so it's not injected on setup
+            /* @var $userSession User\Session */
+            $userSession = \OC::$server->getUserSession();
+            $defaultTokenProvider = \OC::$server->query(DefaultTokenProvider::class);
+            $userSession->setTokenProvider($defaultTokenProvider);
+            $userSession->login($username, $password);
+            $userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
+
+            $session = $userSession->getSession();
+            $session->set('last-password-confirm', \OC::$server->query(ITimeFactory::class)->getTime());
+
+            // Set email for admin
+            if (!empty($options['adminemail'])) {
+                $config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']);
+            }
+        }
+
+        return $error;
+    }
+
+    public static function installBackgroundJobs() {
+        $jobList = \OC::$server->getJobList();
+        $jobList->add(DefaultTokenCleanupJob::class);
+        $jobList->add(Rotate::class);
+        $jobList->add(BackgroundCleanupJob::class);
+    }
+
+    /**
+     * @return string Absolute path to htaccess
+     */
+    private function pathToHtaccess() {
+        return \OC::$SERVERROOT . '/.htaccess';
+    }
+
+    /**
+     * Find webroot from config
+     *
+     * @param SystemConfig $config
+     * @return string
+     * @throws InvalidArgumentException when invalid value for overwrite.cli.url
+     */
+    private static function findWebRoot(SystemConfig $config): string {
+        // For CLI read the value from overwrite.cli.url
+        if (\OC::$CLI) {
+            $webRoot = $config->getValue('overwrite.cli.url', '');
+            if ($webRoot === '') {
+                throw new InvalidArgumentException('overwrite.cli.url is empty');
+            }
+            if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
+                throw new InvalidArgumentException('invalid value for overwrite.cli.url');
+            }
+            $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
+        } else {
+            $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
+        }
+
+        return $webRoot;
+    }
+
+    /**
+     * Append the correct ErrorDocument path for Apache hosts
+     *
+     * @return bool True when success, False otherwise
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public static function updateHtaccess() {
+        $config = \OC::$server->getSystemConfig();
+
+        try {
+            $webRoot = self::findWebRoot($config);
+        } catch (InvalidArgumentException $e) {
+            return false;
+        }
+
+        $setupHelper = new \OC\Setup(
+            $config,
+            \OC::$server->get(IniGetWrapper::class),
+            \OC::$server->getL10N('lib'),
+            \OC::$server->query(Defaults::class),
+            \OC::$server->get(LoggerInterface::class),
+            \OC::$server->getSecureRandom(),
+            \OC::$server->query(Installer::class)
+        );
+
+        $htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
+        $content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
+        $htaccessContent = explode($content, $htaccessContent, 2)[0];
+
+        //custom 403 error page
+        $content .= "\nErrorDocument 403 " . $webRoot . '/';
+
+        //custom 404 error page
+        $content .= "\nErrorDocument 404 " . $webRoot . '/';
+
+        // Add rewrite rules if the RewriteBase is configured
+        $rewriteBase = $config->getValue('htaccess.RewriteBase', '');
+        if ($rewriteBase !== '') {
+            $content .= "\n<IfModule mod_rewrite.c>";
+            $content .= "\n  Options -MultiViews";
+            $content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4|mp3|ogg|wav)$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
+            $content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/richdocumentscode(_arm64)?/proxy.php$";
+            $content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteBase " . $rewriteBase;
+            $content .= "\n  <IfModule mod_env.c>";
+            $content .= "\n    SetEnv front_controller_active true";
+            $content .= "\n    <IfModule mod_dir.c>";
+            $content .= "\n      DirectorySlash off";
+            $content .= "\n    </IfModule>";
+            $content .= "\n  </IfModule>";
+            $content .= "\n</IfModule>";
+        }
+
+        if ($content !== '') {
+            //suppress errors in case we don't have permissions for it
+            return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n");
+        }
+
+        return false;
+    }
+
+    public static function protectDataDirectory() {
+        //Require all denied
+        $now = date('Y-m-d H:i:s');
+        $content = "# Generated by Nextcloud on $now\n";
+        $content .= "# Section for Apache 2.4 to 2.6\n";
+        $content .= "<IfModule mod_authz_core.c>\n";
+        $content .= "  Require all denied\n";
+        $content .= "</IfModule>\n";
+        $content .= "<IfModule mod_access_compat.c>\n";
+        $content .= "  Order Allow,Deny\n";
+        $content .= "  Deny from all\n";
+        $content .= "  Satisfy All\n";
+        $content .= "</IfModule>\n\n";
+        $content .= "# Section for Apache 2.2\n";
+        $content .= "<IfModule !mod_authz_core.c>\n";
+        $content .= "  <IfModule !mod_access_compat.c>\n";
+        $content .= "    <IfModule mod_authz_host.c>\n";
+        $content .= "      Order Allow,Deny\n";
+        $content .= "      Deny from all\n";
+        $content .= "    </IfModule>\n";
+        $content .= "    Satisfy All\n";
+        $content .= "  </IfModule>\n";
+        $content .= "</IfModule>\n\n";
+        $content .= "# Section for Apache 2.2 to 2.6\n";
+        $content .= "<IfModule mod_autoindex.c>\n";
+        $content .= "  IndexIgnore *\n";
+        $content .= "</IfModule>";
+
+        $baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        file_put_contents($baseDir . '/.htaccess', $content);
+        file_put_contents($baseDir . '/index.html', '');
+    }
+
+    /**
+     * Return vendor from which this version was published
+     *
+     * @return string Get the vendor
+     *
+     * Copy of \OC\Updater::getVendor()
+     */
+    private function getVendor() {
+        // this should really be a JSON file
+        require \OC::$SERVERROOT . '/version.php';
+        /** @var string $vendor */
+        return (string)$vendor;
+    }
 }

lib/private/Setup/AbstractDatabase.php

Indentation +104 added lines, -104 removed lines

@@ -39,118 +39,118 @@
 
 abstract class AbstractDatabase {
 
-	/** @var IL10N */
-	protected $trans;
-	/** @var string */
-	protected $dbUser;
-	/** @var string */
-	protected $dbPassword;
-	/** @var string */
-	protected $dbName;
-	/** @var string */
-	protected $dbHost;
-	/** @var string */
-	protected $dbPort;
-	/** @var string */
-	protected $tablePrefix;
-	/** @var SystemConfig */
-	protected $config;
-	/** @var LoggerInterface */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var IL10N */
+    protected $trans;
+    /** @var string */
+    protected $dbUser;
+    /** @var string */
+    protected $dbPassword;
+    /** @var string */
+    protected $dbName;
+    /** @var string */
+    protected $dbHost;
+    /** @var string */
+    protected $dbPort;
+    /** @var string */
+    protected $tablePrefix;
+    /** @var SystemConfig */
+    protected $config;
+    /** @var LoggerInterface */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
 
-	public function __construct(IL10N $trans, SystemConfig $config, LoggerInterface $logger, ISecureRandom $random) {
-		$this->trans = $trans;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
+    public function __construct(IL10N $trans, SystemConfig $config, LoggerInterface $logger, ISecureRandom $random) {
+        $this->trans = $trans;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
 
-	public function validate($config) {
-		$errors = [];
-		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
-		} elseif (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
-		} elseif (empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
-		}
-		if (substr_count($config['dbname'], '.') >= 1) {
-			$errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = [];
+        if (empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
+        } elseif (empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
+        } elseif (empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
+        }
+        if (substr_count($config['dbname'], '.') >= 1) {
+            $errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
+        }
+        return $errors;
+    }
 
-	public function initialize($config) {
-		$dbUser = $config['dbuser'];
-		$dbPass = $config['dbpass'];
-		$dbName = $config['dbname'];
-		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
-		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+    public function initialize($config) {
+        $dbUser = $config['dbuser'];
+        $dbPass = $config['dbpass'];
+        $dbName = $config['dbname'];
+        $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+        $dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
+        $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
-		$this->config->setValues([
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix' => $dbTablePrefix,
-		]);
+        $this->config->setValues([
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix' => $dbTablePrefix,
+        ]);
 
-		$this->dbUser = $dbUser;
-		$this->dbPassword = $dbPass;
-		$this->dbName = $dbName;
-		$this->dbHost = $dbHost;
-		$this->dbPort = $dbPort;
-		$this->tablePrefix = $dbTablePrefix;
-	}
+        $this->dbUser = $dbUser;
+        $this->dbPassword = $dbPass;
+        $this->dbName = $dbName;
+        $this->dbHost = $dbHost;
+        $this->dbPort = $dbPort;
+        $this->tablePrefix = $dbTablePrefix;
+    }
 
-	/**
-	 * @param array $configOverwrite
-	 * @return \OC\DB\Connection
-	 */
-	protected function connect(array $configOverwrite = []): Connection {
-		$connectionParams = [
-			'host' => $this->dbHost,
-			'user' => $this->dbUser,
-			'password' => $this->dbPassword,
-			'tablePrefix' => $this->tablePrefix,
-			'dbname' => $this->dbName
-		];
+    /**
+     * @param array $configOverwrite
+     * @return \OC\DB\Connection
+     */
+    protected function connect(array $configOverwrite = []): Connection {
+        $connectionParams = [
+            'host' => $this->dbHost,
+            'user' => $this->dbUser,
+            'password' => $this->dbPassword,
+            'tablePrefix' => $this->tablePrefix,
+            'dbname' => $this->dbName
+        ];
 
-		// adding port support through installer
-		if (!empty($this->dbPort)) {
-			if (ctype_digit($this->dbPort)) {
-				$connectionParams['port'] = $this->dbPort;
-			} else {
-				$connectionParams['unix_socket'] = $this->dbPort;
-			}
-		} elseif (strpos($this->dbHost, ':')) {
-			// Host variable may carry a port or socket.
-			[$host, $portOrSocket] = explode(':', $this->dbHost, 2);
-			if (ctype_digit($portOrSocket)) {
-				$connectionParams['port'] = $portOrSocket;
-			} else {
-				$connectionParams['unix_socket'] = $portOrSocket;
-			}
-			$connectionParams['host'] = $host;
-		}
+        // adding port support through installer
+        if (!empty($this->dbPort)) {
+            if (ctype_digit($this->dbPort)) {
+                $connectionParams['port'] = $this->dbPort;
+            } else {
+                $connectionParams['unix_socket'] = $this->dbPort;
+            }
+        } elseif (strpos($this->dbHost, ':')) {
+            // Host variable may carry a port or socket.
+            [$host, $portOrSocket] = explode(':', $this->dbHost, 2);
+            if (ctype_digit($portOrSocket)) {
+                $connectionParams['port'] = $portOrSocket;
+            } else {
+                $connectionParams['unix_socket'] = $portOrSocket;
+            }
+            $connectionParams['host'] = $host;
+        }
 
-		$connectionParams = array_merge($connectionParams, $configOverwrite);
-		$cf = new ConnectionFactory($this->config);
-		return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
-	}
+        $connectionParams = array_merge($connectionParams, $configOverwrite);
+        $cf = new ConnectionFactory($this->config);
+        return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+    }
 
-	/**
-	 * @param string $userName
-	 */
-	abstract public function setupDatabase($userName);
+    /**
+     * @param string $userName
+     */
+    abstract public function setupDatabase($userName);
 
-	public function runMigrations() {
-		if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
-			return;
-		}
-		$ms = new MigrationService('core', \OC::$server->get(Connection::class));
-		$ms->migrate('latest', true);
-	}
+    public function runMigrations() {
+        if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
+            return;
+        }
+        $ms = new MigrationService('core', \OC::$server->get(Connection::class));
+        $ms->migrate('latest', true);
+    }
 }

lib/private/Setup/PostgreSQL.php

Indentation +137 added lines, -137 removed lines

@@ -34,141 +34,141 @@
 use OC\DB\QueryBuilder\Literal;
 
 class PostgreSQL extends AbstractDatabase {
-	public $dbprettyname = 'PostgreSQL';
-
-	/**
-	 * @param string $username
-	 * @throws \OC\DatabaseSetupException
-	 */
-	public function setupDatabase($username) {
-		try {
-			$connection = $this->connect([
-				'dbname' => 'postgres'
-			]);
-			//check for roles creation rights in postgresql
-			$builder = $connection->getQueryBuilder();
-			$builder->automaticTablePrefix(false);
-			$query = $builder
-				->select('rolname')
-				->from('pg_roles')
-				->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
-				->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
-
-			try {
-				$result = $query->execute();
-				$canCreateRoles = $result->rowCount() > 0;
-			} catch (DatabaseException $e) {
-				$canCreateRoles = false;
-			}
-
-			if ($canCreateRoles) {
-				//use the admin login data for the new database user
-
-				//add prefix to the postgresql user name to prevent collisions
-				$this->dbUser = 'oc_' . strtolower($username);
-				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
-
-				$this->createDBUser($connection);
-			}
-
-			$this->config->setValues([
-				'dbuser' => $this->dbUser,
-				'dbpassword' => $this->dbPassword,
-			]);
-
-			//create the database
-			$this->createDatabase($connection);
-			// the connection to dbname=postgres is not needed anymore
-			$connection->close();
-		} catch (\Exception $e) {
-			$this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [
-				'exception' => $e,
-			]);
-			$this->config->setValues([
-				'dbuser' => $this->dbUser,
-				'dbpassword' => $this->dbPassword,
-			]);
-		}
-
-		// connect to the database (dbname=$this->dbname) and check if it needs to be filled
-		$this->dbUser = $this->config->getValue('dbuser');
-		$this->dbPassword = $this->config->getValue('dbpassword');
-		$connection = $this->connect();
-		try {
-			$connection->connect();
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), [
-				'exception' => $e,
-			]);
-			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
-				$this->trans->t('You need to enter details of an existing account.'), 0, $e);
-		}
-	}
-
-	private function createDatabase(Connection $connection) {
-		if (!$this->databaseExists($connection)) {
-			//The database does not exists... let's create it
-			$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
-			try {
-				$query->execute();
-			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to create database', [
-					'exception' => $e,
-				]);
-			}
-		} else {
-			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
-			try {
-				$query->execute();
-			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to restrict database permissions', [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	private function userExists(Connection $connection) {
-		$builder = $connection->getQueryBuilder();
-		$builder->automaticTablePrefix(false);
-		$query = $builder->select('*')
-			->from('pg_roles')
-			->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
-		$result = $query->execute();
-		return $result->rowCount() > 0;
-	}
-
-	private function databaseExists(Connection $connection) {
-		$builder = $connection->getQueryBuilder();
-		$builder->automaticTablePrefix(false);
-		$query = $builder->select('datname')
-			->from('pg_database')
-			->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName)));
-		$result = $query->execute();
-		return $result->rowCount() > 0;
-	}
-
-	private function createDBUser(Connection $connection) {
-		$dbUser = $this->dbUser;
-		try {
-			$i = 1;
-			while ($this->userExists($connection)) {
-				$i++;
-				$this->dbUser = $dbUser . $i;
-			}
-
-			// create the user
-			$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
-			$query->execute();
-			if ($this->databaseExists($connection)) {
-				$query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
-				$query->execute();
-			}
-		} catch (DatabaseException $e) {
-			$this->logger->error('Error while trying to create database user', [
-				'exception' => $e,
-			]);
-		}
-	}
+    public $dbprettyname = 'PostgreSQL';
+
+    /**
+     * @param string $username
+     * @throws \OC\DatabaseSetupException
+     */
+    public function setupDatabase($username) {
+        try {
+            $connection = $this->connect([
+                'dbname' => 'postgres'
+            ]);
+            //check for roles creation rights in postgresql
+            $builder = $connection->getQueryBuilder();
+            $builder->automaticTablePrefix(false);
+            $query = $builder
+                ->select('rolname')
+                ->from('pg_roles')
+                ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
+                ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
+
+            try {
+                $result = $query->execute();
+                $canCreateRoles = $result->rowCount() > 0;
+            } catch (DatabaseException $e) {
+                $canCreateRoles = false;
+            }
+
+            if ($canCreateRoles) {
+                //use the admin login data for the new database user
+
+                //add prefix to the postgresql user name to prevent collisions
+                $this->dbUser = 'oc_' . strtolower($username);
+                //create a new password so we don't need to store the admin config in the config file
+                $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
+
+                $this->createDBUser($connection);
+            }
+
+            $this->config->setValues([
+                'dbuser' => $this->dbUser,
+                'dbpassword' => $this->dbPassword,
+            ]);
+
+            //create the database
+            $this->createDatabase($connection);
+            // the connection to dbname=postgres is not needed anymore
+            $connection->close();
+        } catch (\Exception $e) {
+            $this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [
+                'exception' => $e,
+            ]);
+            $this->config->setValues([
+                'dbuser' => $this->dbUser,
+                'dbpassword' => $this->dbPassword,
+            ]);
+        }
+
+        // connect to the database (dbname=$this->dbname) and check if it needs to be filled
+        $this->dbUser = $this->config->getValue('dbuser');
+        $this->dbPassword = $this->config->getValue('dbpassword');
+        $connection = $this->connect();
+        try {
+            $connection->connect();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), [
+                'exception' => $e,
+            ]);
+            throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+                $this->trans->t('You need to enter details of an existing account.'), 0, $e);
+        }
+    }
+
+    private function createDatabase(Connection $connection) {
+        if (!$this->databaseExists($connection)) {
+            //The database does not exists... let's create it
+            $query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
+            try {
+                $query->execute();
+            } catch (DatabaseException $e) {
+                $this->logger->error('Error while trying to create database', [
+                    'exception' => $e,
+                ]);
+            }
+        } else {
+            $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
+            try {
+                $query->execute();
+            } catch (DatabaseException $e) {
+                $this->logger->error('Error while trying to restrict database permissions', [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    private function userExists(Connection $connection) {
+        $builder = $connection->getQueryBuilder();
+        $builder->automaticTablePrefix(false);
+        $query = $builder->select('*')
+            ->from('pg_roles')
+            ->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
+        $result = $query->execute();
+        return $result->rowCount() > 0;
+    }
+
+    private function databaseExists(Connection $connection) {
+        $builder = $connection->getQueryBuilder();
+        $builder->automaticTablePrefix(false);
+        $query = $builder->select('datname')
+            ->from('pg_database')
+            ->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName)));
+        $result = $query->execute();
+        return $result->rowCount() > 0;
+    }
+
+    private function createDBUser(Connection $connection) {
+        $dbUser = $this->dbUser;
+        try {
+            $i = 1;
+            while ($this->userExists($connection)) {
+                $i++;
+                $this->dbUser = $dbUser . $i;
+            }
+
+            // create the user
+            $query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
+            $query->execute();
+            if ($this->databaseExists($connection)) {
+                $query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
+                $query->execute();
+            }
+        } catch (DatabaseException $e) {
+            $this->logger->error('Error while trying to create database user', [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -65,9 +65,9 @@ 
 				//use the admin login data for the new database user
 
 				//add prefix to the postgresql user name to prevent collisions
-				$this->dbUser = 'oc_' . strtolower($username);
+				$this->dbUser = 'oc_'.strtolower($username);
 				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
+				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
 				$this->createDBUser($connection);
 			}
@@ -109,7 +109,7 @@ 
 	private function createDatabase(Connection $connection) {
 		if (!$this->databaseExists($connection)) {
 			//The database does not exists... let's create it
-			$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
+			$query = $connection->prepare("CREATE DATABASE ".addslashes($this->dbName)." OWNER ".addslashes($this->dbUser));
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
@@ -118,7 +118,7 @@ 
 				]);
 			}
 		} else {
-			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
+			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE ".addslashes($this->dbName)." FROM PUBLIC");
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
@@ -155,14 +155,14 @@ 
 			$i = 1;
 			while ($this->userExists($connection)) {
 				$i++;
-				$this->dbUser = $dbUser . $i;
+				$this->dbUser = $dbUser.$i;
 			}
 
 			// create the user
-			$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
+			$query = $connection->prepare("CREATE USER ".addslashes($this->dbUser)." CREATEDB PASSWORD '".addslashes($this->dbPassword)."'");
 			$query->execute();
 			if ($this->databaseExists($connection)) {
-				$query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
+				$query = $connection->prepare('GRANT CONNECT ON DATABASE '.addslashes($this->dbName).' TO '.addslashes($this->dbUser));
 				$query->execute();
 			}
 		} catch (DatabaseException $e) {