nextcloud / server

lib/private/ServerContainer.php

Indentation +72 added lines, -72 removed lines

@@ -34,85 +34,85 @@
  * @package OC
  */
 class ServerContainer extends SimpleContainer {
-	/** @var DIContainer[] */
-	protected $appContainers;
+    /** @var DIContainer[] */
+    protected $appContainers;
 
-	/** @var string[] */
-	protected $namespaces;
+    /** @var string[] */
+    protected $namespaces;
 
-	/**
-	 * ServerContainer constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->appContainers = [];
-		$this->namespaces = [];
-	}
+    /**
+     * ServerContainer constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->appContainers = [];
+        $this->namespaces = [];
+    }
 
-	/**
-	 * @param string $appName
-	 * @param string $appNamespace
-	 */
-	public function registerNamespace($appName, $appNamespace) {
-		// Cut of OCA\ and lowercase
-		$appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
-		$this->namespaces[$appNamespace] = $appName;
-	}
+    /**
+     * @param string $appName
+     * @param string $appNamespace
+     */
+    public function registerNamespace($appName, $appNamespace) {
+        // Cut of OCA\ and lowercase
+        $appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
+        $this->namespaces[$appNamespace] = $appName;
+    }
 
-	/**
-	 * @param string $appName
-	 * @param DIContainer $container
-	 */
-	public function registerAppContainer($appName, DIContainer $container) {
-		$this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
-	}
+    /**
+     * @param string $appName
+     * @param DIContainer $container
+     */
+    public function registerAppContainer($appName, DIContainer $container) {
+        $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
+    }
 
-	/**
-	 * @param string $namespace
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	protected function getAppContainer($namespace) {
-		if (isset($this->appContainers[$namespace])) {
-			return $this->appContainers[$namespace];
-		}
+    /**
+     * @param string $namespace
+     * @return DIContainer
+     * @throws QueryException
+     */
+    protected function getAppContainer($namespace) {
+        if (isset($this->appContainers[$namespace])) {
+            return $this->appContainers[$namespace];
+        }
 
-		if (isset($this->namespaces[$namespace])) {
-			return new DIContainer($this->namespaces[$namespace]);
-		}
-		throw new QueryException();
-	}
+        if (isset($this->namespaces[$namespace])) {
+            return new DIContainer($this->namespaces[$namespace]);
+        }
+        throw new QueryException();
+    }
 
-	/**
-	 * @param string $name name of the service to query for
-	 * @return mixed registered service for the given $name
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function query($name) {
-		$name = $this->sanitizeName($name);
+    /**
+     * @param string $name name of the service to query for
+     * @return mixed registered service for the given $name
+     * @throws QueryException if the query could not be resolved
+     */
+    public function query($name) {
+        $name = $this->sanitizeName($name);
 
-		// In case the service starts with OCA\ we try to find the service in
-		// the apps container first.
-		if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
-			$segments = explode('\\', $name);
-			try {
-				$appContainer = $this->getAppContainer(strtolower($segments[1]));
-				return $appContainer->queryNoFallback($name);
-			} catch (QueryException $e) {
-				// Didn't find the service or the respective app container,
-				// ignore it and fall back to the core container.
-			}
-		} else if (strpos($name, 'OC\\Settings\\') === 0 && substr_count($name, '\\') >= 3) {
-			$segments = explode('\\', $name);
-			try {
-				$appContainer = $this->getAppContainer(strtolower($segments[1]));
-				return $appContainer->queryNoFallback($name);
-			} catch (QueryException $e) {
-				// Didn't find the service or the respective app container,
-				// ignore it and fall back to the core container.
-			}
-		}
+        // In case the service starts with OCA\ we try to find the service in
+        // the apps container first.
+        if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
+            $segments = explode('\\', $name);
+            try {
+                $appContainer = $this->getAppContainer(strtolower($segments[1]));
+                return $appContainer->queryNoFallback($name);
+            } catch (QueryException $e) {
+                // Didn't find the service or the respective app container,
+                // ignore it and fall back to the core container.
+            }
+        } else if (strpos($name, 'OC\\Settings\\') === 0 && substr_count($name, '\\') >= 3) {
+            $segments = explode('\\', $name);
+            try {
+                $appContainer = $this->getAppContainer(strtolower($segments[1]));
+                return $appContainer->queryNoFallback($name);
+            } catch (QueryException $e) {
+                // Didn't find the service or the respective app container,
+                // ignore it and fall back to the core container.
+            }
+        }
 
-		return parent::query($name);
-	}
+        return parent::query($name);
+    }
 }

lib/base.php

Indentation +991 added lines, -991 removed lines

@@ -59,997 +59,997 @@
  * OC_autoload!
  */
 class OC {
-	/**
-	 * Associative array for autoloading. classname => filename
-	 */
-	public static $CLASSPATH = array();
-	/**
-	 * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
-	 */
-	public static $SERVERROOT = '';
-	/**
-	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
-	 */
-	private static $SUBURI = '';
-	/**
-	 * the Nextcloud root path for http requests (e.g. nextcloud/)
-	 */
-	public static $WEBROOT = '';
-	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
-	 * web path in 'url'
-	 */
-	public static $APPSROOTS = array();
-
-	/**
-	 * @var string
-	 */
-	public static $configDir;
-
-	/**
-	 * requested app
-	 */
-	public static $REQUESTEDAPP = '';
-
-	/**
-	 * check if Nextcloud runs in cli mode
-	 */
-	public static $CLI = false;
-
-	/**
-	 * @var \OC\Autoloader $loader
-	 */
-	public static $loader = null;
-
-	/** @var \Composer\Autoload\ClassLoader $composerAutoloader */
-	public static $composerAutoloader = null;
-
-	/**
-	 * @var \OC\Server
-	 */
-	public static $server = null;
-
-	/**
-	 * @var \OC\Config
-	 */
-	private static $config = null;
-
-	/**
-	 * @throws \RuntimeException when the 3rdparty directory is missing or
-	 * the app path list is empty or contains an invalid path
-	 */
-	public static function initPaths() {
-		if(defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
-		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
-		}
-		self::$config = new \OC\Config(self::$configDir);
-
-		OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
-		/**
-		 * FIXME: The following lines are required because we can't yet instantiiate
-		 *        \OC::$server->getRequest() since \OC::$server does not yet exist.
-		 */
-		$params = [
-			'server' => [
-				'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'],
-				'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
-			],
-		];
-		$fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
-		$scriptName = $fakeRequest->getScriptName();
-		if (substr($scriptName, -1) == '/') {
-			$scriptName .= 'index.php';
-			//make sure suburi follows the same rules as scriptName
-			if (substr(OC::$SUBURI, -9) != 'index.php') {
-				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
-				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
-			}
-		}
-
-
-		if (OC::$CLI) {
-			OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-		} else {
-			if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
-				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
-
-				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
-				}
-			} else {
-				// The scriptName is not ending with OC::$SUBURI
-				// This most likely means that we are calling from CLI.
-				// However some cron jobs still need to generate
-				// a web URL, so we use overwritewebroot as a fallback.
-				OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-			}
-
-			// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
-			// slash which is required by URL generation.
-			if($_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
-					substr($_SERVER['REQUEST_URI'], -1) !== '/') {
-				header('Location: '.\OC::$WEBROOT.'/');
-				exit();
-			}
-		}
-
-		// search the apps folder
-		$config_paths = self::$config->getValue('apps_paths', array());
-		if (!empty($config_paths)) {
-			foreach ($config_paths as $paths) {
-				if (isset($paths['url']) && isset($paths['path'])) {
-					$paths['url'] = rtrim($paths['url'], '/');
-					$paths['path'] = rtrim($paths['path'], '/');
-					OC::$APPSROOTS[] = $paths;
-				}
-			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
-		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
-			OC::$APPSROOTS[] = array(
-				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
-				'url' => '/apps',
-				'writable' => true
-			);
-		}
-
-		if (empty(OC::$APPSROOTS)) {
-			throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
-				. ' or the folder above. You can also configure the location in the config.php file.');
-		}
-		$paths = array();
-		foreach (OC::$APPSROOTS as $path) {
-			$paths[] = $path['path'];
-			if (!is_dir($path['path'])) {
-				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
-					. ' Nextcloud folder or the folder above. You can also configure the location in the'
-					. ' config.php file.', $path['path']));
-			}
-		}
-
-		// set the right include path
-		set_include_path(
-			implode(PATH_SEPARATOR, $paths)
-		);
-	}
-
-	public static function checkConfig() {
-		$l = \OC::$server->getL10N('lib');
-
-		// Create config if it does not already exist
-		$configFilePath = self::$configDir .'/config.php';
-		if(!file_exists($configFilePath)) {
-			@touch($configFilePath);
-		}
-
-		// Check if config is writable
-		$configFileWritable = is_writable($configFilePath);
-		if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
-			|| !$configFileWritable && self::checkUpgrade(false)) {
-
-			$urlGenerator = \OC::$server->getURLGenerator();
-
-			if (self::$CLI) {
-				echo $l->t('Cannot write into "config" directory!')."\n";
-				echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
-				echo "\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
-				exit;
-			} else {
-				OC_Template::printErrorPage(
-					$l->t('Cannot write into "config" directory!'),
-					$l->t('This can usually be fixed by '
-					. '%sgiving the webserver write access to the config directory%s.',
-					 array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
-				);
-			}
-		}
-	}
-
-	public static function checkInstalled() {
-		if (defined('OC_CONSOLE')) {
-			return;
-		}
-		// Redirect to installer if not installed
-		if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
-			if (OC::$CLI) {
-				throw new Exception('Not installed');
-			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
-			}
-			exit();
-		}
-	}
-
-	public static function checkMaintenanceMode() {
-		// Allow ajax update script to execute without being stopped
-		if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = new OC_Template('', 'update.user', 'guest');
-			OC_Util::addScript('maintenance-check');
-			$template->printPage();
-			die();
-		}
-	}
-
-	/**
-	 * Checks if the version requires an update and shows
-	 * @param bool $showTemplate Whether an update screen should get shown
-	 * @return bool|void
-	 */
-	public static function checkUpgrade($showTemplate = true) {
-		if (\OCP\Util::needUpgrade()) {
-			$systemConfig = \OC::$server->getSystemConfig();
-			if ($showTemplate && !$systemConfig->getValue('maintenance', false)) {
-				self::printUpgradePage();
-				exit();
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Prints the upgrade page
-	 */
-	private static function printUpgradePage() {
-		$systemConfig = \OC::$server->getSystemConfig();
-
-		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
-		$tooBig = false;
-		if (!$disableWebUpdater) {
-			$apps = \OC::$server->getAppManager();
-			$tooBig = $apps->isInstalled('user_ldap') || $apps->isInstalled('user_shibboleth');
-			if (!$tooBig) {
-				// count users
-				$stats = \OC::$server->getUserManager()->countUsers();
-				$totalUsers = array_sum($stats);
-				$tooBig = ($totalUsers > 50);
-			}
-		}
-		if ($disableWebUpdater || $tooBig) {
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = new OC_Template('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'nextcloud'); // for now
-			$template->assign('version', OC_Util::getVersionString());
-			$template->assign('tooBig', $tooBig);
-
-			$template->printPage();
-			die();
-		}
-
-		// check whether this is a core update or apps update
-		$installedVersion = $systemConfig->getValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
-		// if not a core upgrade, then it's apps upgrade
-		$isAppsOnlyUpgrade = (version_compare($currentVersion, $installedVersion, '='));
-
-		$oldTheme = $systemConfig->getValue('theme');
-		$systemConfig->setValue('theme', '');
-		OC_Util::addScript('config'); // needed for web root
-		OC_Util::addScript('update');
-
-		/** @var \OC\App\AppManager $appManager */
-		$appManager = \OC::$server->getAppManager();
-
-		$tmpl = new OC_Template('', 'update.admin', 'guest');
-		$tmpl->assign('version', OC_Util::getVersionString());
-		$tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
-
-		// get third party apps
-		$ocVersion = \OCP\Util::getVersion();
-		$incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
-		$incompatibleShippedApps = [];
-		foreach ($incompatibleApps as $appInfo) {
-			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
-			}
-		}
-
-		if (!empty($incompatibleShippedApps)) {
-			$l = \OC::$server->getL10N('core');
-			$hint = $l->t('The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
-		}
-
-		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
-		$tmpl->assign('incompatibleAppsList', $incompatibleApps);
-		$tmpl->assign('productName', 'Nextcloud'); // for now
-		$tmpl->assign('oldTheme', $oldTheme);
-		$tmpl->printPage();
-	}
-
-	public static function initSession() {
-		// prevents javascript from accessing php session cookies
-		ini_set('session.cookie_httponly', true);
-
-		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
-		ini_set('session.cookie_path', $cookie_path);
-
-		// Let the session name be changed in the initSession Hook
-		$sessionName = OC_Util::getInstanceId();
-
-		try {
-			// Allow session apps to create a custom session object
-			$useCustomSession = false;
-			$session = self::$server->getSession();
-			OC_Hook::emit('OC', 'initSession', array('session' => &$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
-			if (!$useCustomSession) {
-				// set the session name to the instance id - which is unique
-				$session = new \OC\Session\Internal($sessionName);
-			}
-
-			$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
-			$session = $cryptoWrapper->wrapSession($session);
-			self::$server->setSession($session);
-
-			// if session can't be started break with http 500 error
-		} catch (Exception $e) {
-			\OCP\Util::logException('base', $e);
-			//show the user a detailed error page
-			OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-			OC_Template::printExceptionErrorPage($e);
-			die();
-		}
-
-		$sessionLifeTime = self::getSessionLifeTime();
-
-		// session timeout
-		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
-			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
-			}
-			\OC::$server->getUserSession()->logout();
-		}
-
-		$session->set('LAST_ACTIVITY', time());
-	}
-
-	/**
-	 * @return string
-	 */
-	private static function getSessionLifeTime() {
-		return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
-	}
-
-	public static function loadAppClassPaths() {
-		foreach (OC_App::getEnabledApps() as $app) {
-			$appPath = OC_App::getAppPath($app);
-			if ($appPath === false) {
-				continue;
-			}
-
-			$file = $appPath . '/appinfo/classpath.php';
-			if (file_exists($file)) {
-				require_once $file;
-			}
-		}
-	}
-
-	/**
-	 * Try to set some values to the required Nextcloud default
-	 */
-	public static function setRequiredIniValues() {
-		@ini_set('default_charset', 'UTF-8');
-		@ini_set('gd.jpeg_ignore_warning', 1);
-	}
-
-	/**
-	 * Send the same site cookies
-	 */
-	private static function sendSameSiteCookies() {
-		$cookieParams = session_get_cookie_params();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
-
-	/**
-	 * Same Site cookie to further mitigate CSRF attacks. This cookie has to
-	 * be set in every request if cookies are sent to add a second level of
-	 * defense against CSRF.
-	 *
-	 * If the cookie is not sent this will set the cookie and reload the page.
-	 * We use an additional cookie since we want to protect logout CSRF and
-	 * also we can't directly interfere with PHP's session mechanism.
-	 */
-	private static function performSameSiteCookieProtection() {
-		$request = \OC::$server->getRequest();
-
-		// Some user agents are notorious and don't really properly follow HTTP
-		// specifications. For those, have an automated opt-out. Since the protection
-		// for remote.php is applied in base.php as starting point we need to opt out
-		// here.
-		$incompatibleUserAgents = [
-			// OS X Finder
-			'/^WebDAVFS/',
-		];
-		if($request->isUserAgent($incompatibleUserAgents)) {
-			return;
-		}
-
-		if(count($_COOKIE) > 0) {
-			$requestUri = $request->getScriptName();
-			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript)-1];
-			// FIXME: In a SAML scenario we don't get any strict or lax cookie
-			// send for the ACS endpoint. Since we have some legacy code in Nextcloud
-			// (direct PHP files) the enforcement of lax cookies is performed here
-			// instead of the middleware.
-			//
-			// This means we cannot exclude some routes from the cookie validation,
-			// which normally is not a problem but is a little bit cumbersome for
-			// this use-case.
-			// Once the old legacy PHP endpoints have been removed we can move
-			// the verification into a middleware and also adds some exemptions.
-			//
-			// Questions about this code? Ask Lukas ;-)
-			$currentUrl = substr(explode('?',$request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT));
-			if($currentUrl === '/index.php/apps/user_saml/saml/acs' || $currentUrl === '/apps/user_saml/saml/acs') {
-				return;
-			}
-			// For the "index.php" endpoint only a lax cookie is required.
-			if($processingScript === 'index.php') {
-				if(!$request->passesLaxCookieCheck()) {
-					self::sendSameSiteCookies();
-					header('Location: '.$_SERVER['REQUEST_URI']);
-					exit();
-				}
-			} else {
-				// All other endpoints require the lax and the strict cookie
-				if(!$request->passesStrictCookieCheck()) {
-					self::sendSameSiteCookies();
-					// Debug mode gets access to the resources without strict cookie
-					// due to the fact that the SabreDAV browser also lives there.
-					if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
-						http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
-						exit();
-					}
-				}
-			}
-		} elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
-			self::sendSameSiteCookies();
-		}
-	}
-
-	public static function init() {
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
-
-		// register autoloader
-		$loaderStart = microtime(true);
-		require_once __DIR__ . '/autoloader.php';
-		self::$loader = new \OC\Autoloader([
-			OC::$SERVERROOT . '/lib/private/legacy',
-		]);
-		if (defined('PHPUNIT_RUN')) {
-			self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-		}
-		spl_autoload_register(array(self::$loader, 'load'));
-		$loaderEnd = microtime(true);
-
-		self::$CLI = (php_sapi_name() == 'cli');
-
-		// Add default composer PSR-4 autoloader
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
-
-		try {
-			self::initPaths();
-			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
-			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
-			}
-			require_once $vendorAutoLoad;
-
-		} catch (\RuntimeException $e) {
-			if (!self::$CLI) {
-				$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
-				$protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1';
-				header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE);
-			}
-			// we can't use the template error page here, because this needs the
-			// DI container which isn't available yet
-			print($e->getMessage());
-			exit();
-		}
-
-		// setup the basic server
-		self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
-		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
-		\OC::$server->getEventLogger()->start('boot', 'Initialize');
-
-		// Don't display errors and log them
-		error_reporting(E_ALL | E_STRICT);
-		@ini_set('display_errors', 0);
-		@ini_set('log_errors', 1);
-
-		if(!date_default_timezone_set('UTC')) {
-			throw new \RuntimeException('Could not set timezone to UTC');
-		};
-
-		//try to configure php to enable big file uploads.
-		//this doesn´t work always depending on the webserver and php configuration.
-		//Let´s try to overwrite some defaults anyway
-
-		//try to set the maximum execution time to 60min
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(3600);
-		}
-		@ini_set('max_execution_time', 3600);
-		@ini_set('max_input_time', 3600);
-
-		//try to set the maximum filesize to 10G
-		@ini_set('upload_max_filesize', '10G');
-		@ini_set('post_max_size', '10G');
-		@ini_set('file_uploads', '50');
-
-		self::setRequiredIniValues();
-		self::handleAuthHeaders();
-		self::registerAutoloaderCache();
-
-		// initialize intl fallback is necessary
-		\Patchwork\Utf8\Bootup::initIntl();
-		OC_Util::isSetLocaleWorking();
-
-		if (!defined('PHPUNIT_RUN')) {
-			OC\Log\ErrorHandler::setLogger(\OC::$server->getLogger());
-			$debug = \OC::$server->getConfig()->getSystemValue('debug', false);
-			OC\Log\ErrorHandler::register($debug);
-		}
-
-		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
-		OC_App::loadApps(array('session'));
-		if (!self::$CLI) {
-			self::initSession();
-		}
-		\OC::$server->getEventLogger()->end('init_session');
-		self::checkConfig();
-		self::checkInstalled();
-
-		OC_Response::addSecurityHeaders();
-		if(self::$server->getRequest()->getServerProtocol() === 'https') {
-			ini_set('session.cookie_secure', true);
-		}
-
-		self::performSameSiteCookieProtection();
-
-		if (!defined('OC_CONSOLE')) {
-			$errors = OC_Util::checkServer(\OC::$server->getSystemConfig());
-			if (count($errors) > 0) {
-				if (self::$CLI) {
-					// Convert l10n string into regular string for usage in database
-					$staticErrors = [];
-					foreach ($errors as $error) {
-						echo $error['error'] . "\n";
-						echo $error['hint'] . "\n\n";
-						$staticErrors[] = [
-							'error' => (string)$error['error'],
-							'hint' => (string)$error['hint'],
-						];
-					}
-
-					try {
-						\OC::$server->getConfig()->setAppValue('core', 'cronErrors', json_encode($staticErrors));
-					} catch (\Exception $e) {
-						echo('Writing to database failed');
-					}
-					exit(1);
-				} else {
-					OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-					OC_Util::addStyle('guest');
-					OC_Template::printGuestPage('', 'error', array('errors' => $errors));
-					exit;
-				}
-			} elseif (self::$CLI && \OC::$server->getConfig()->getSystemValue('installed', false)) {
-				\OC::$server->getConfig()->deleteAppValue('core', 'cronErrors');
-			}
-		}
-		//try to set the session lifetime
-		$sessionLifeTime = self::getSessionLifeTime();
-		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
-
-		$systemConfig = \OC::$server->getSystemConfig();
-
-		// User and Groups
-		if (!$systemConfig->getValue("installed", false)) {
-			self::$server->getSession()->set('user_id', '');
-		}
-
-		OC_User::useBackend(new \OC\User\Database());
-		\OC::$server->getGroupManager()->addBackend(new \OC\Group\Database());
-
-		// Subscribe to the hook
-		\OCP\Util::connectHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			'\OC\User\Database',
-			'preLoginNameUsedAsUserName'
-		);
-
-		//setup extra user backends
-		if (!self::checkUpgrade(false)) {
-			OC_User::setupBackends();
-		} else {
-			// Run upgrades in incognito mode
-			OC_User::setIncognitoMode(true);
-		}
-
-		self::registerCacheHooks();
-		self::registerFilesystemHooks();
-		self::registerShareHooks();
-		self::registerLogRotate();
-		self::registerEncryptionWrapper();
-		self::registerEncryptionHooks();
-		self::registerAccountHooks();
-		self::registerSettingsHooks();
-
-		$settings = new \OC\Settings\Application();
-		$settings->register();
-
-		//make sure temporary files are cleaned up
-		$tmpManager = \OC::$server->getTempManager();
-		register_shutdown_function(array($tmpManager, 'clean'));
-		$lockProvider = \OC::$server->getLockingProvider();
-		register_shutdown_function(array($lockProvider, 'releaseAll'));
-
-		// Check whether the sample configuration has been copied
-		if($systemConfig->getValue('copied_sample_config', false)) {
-			$l = \OC::$server->getL10N('lib');
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			OC_Template::printErrorPage(
-				$l->t('Sample configuration detected'),
-				$l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php')
-			);
-			return;
-		}
-
-		$request = \OC::$server->getRequest();
-		$host = $request->getInsecureServerHost();
-		/**
-		 * if the host passed in headers isn't trusted
-		 * FIXME: Should not be in here at all :see_no_evil:
-		 */
-		if (!OC::$CLI
-			// overwritehost is always trusted, workaround to not have to make
-			// \OC\AppFramework\Http\Request::getOverwriteHost public
-			&& self::$server->getConfig()->getSystemValue('overwritehost') === ''
-			&& !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host)
-			&& self::$server->getConfig()->getSystemValue('installed', false)
-		) {
-			// Allow access to CSS resources
-			$isScssRequest = false;
-			if(strpos($request->getPathInfo(), '/css/') === 0) {
-				$isScssRequest = true;
-			}
-
-			if (!$isScssRequest) {
-				header('HTTP/1.1 400 Bad Request');
-				header('Status: 400 Bad Request');
-
-				\OC::$server->getLogger()->warning(
-					'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
-					[
-						'app' => 'core',
-						'remoteAddress' => $request->getRemoteAddress(),
-						'host' => $host,
-					]
-				);
-
-				$tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
-				$tmpl->assign('domain', $host);
-				$tmpl->printPage();
-
-				exit();
-			}
-		}
-		\OC::$server->getEventLogger()->end('boot');
-	}
-
-	/**
-	 * register hooks for the cache
-	 */
-	public static function registerCacheHooks() {
-		//don't try to do this before we are properly setup
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {
-
-			// NOTE: This will be replaced to use OCP
-			$userSession = self::$server->getUserSession();
-			$userSession->listen('\OC\User', 'postLogin', function () {
-				try {
-					$cache = new \OC\Cache\File();
-					$cache->gc();
-				} catch (\OC\ServerNotAvailableException $e) {
-					// not a GC exception, pass it on
-					throw $e;
-				} catch (\Exception $e) {
-					// a GC exception should not prevent users from using OC,
-					// so log the exception
-					\OC::$server->getLogger()->warning('Exception when running cache gc: ' . $e->getMessage(), array('app' => 'core'));
-				}
-			});
-		}
-	}
-
-	public static function registerSettingsHooks() {
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_DISABLE, function($event) {
-			/** @var \OCP\App\ManagerEvent $event */
-			\OC::$server->getSettingsManager()->onAppDisabled($event->getAppID());
-		});
-		$dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_UPDATE, function($event) {
-			/** @var \OCP\App\ManagerEvent $event */
-			$jobList = \OC::$server->getJobList();
-			$job = 'OC\\Settings\\RemoveOrphaned';
-			if(!($jobList->has($job, null))) {
-				$jobList->add($job);
-			}
-		});
-	}
-
-	private static function registerEncryptionWrapper() {
-		$manager = self::$server->getEncryptionManager();
-		\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage');
-	}
-
-	private static function registerEncryptionHooks() {
-		$enabled = self::$server->getEncryptionManager()->isEnabled();
-		if ($enabled) {
-			\OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
-			\OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
-			\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OC\Encryption\HookManager', 'postRename');
-			\OCP\Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 'OC\Encryption\HookManager', 'postRestore');
-		}
-	}
-
-	private static function registerAccountHooks() {
-		$hookHandler = new \OC\Accounts\Hooks(\OC::$server->getLogger());
-		\OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
-	}
-
-	/**
-	 * register hooks for the cache
-	 */
-	public static function registerLogRotate() {
-		$systemConfig = \OC::$server->getSystemConfig();
-		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
-			//don't try to do this before we are properly setup
-			//use custom logfile path if defined, otherwise use default of nextcloud.log in data directory
-			\OC::$server->getJobList()->add('OC\Log\Rotate');
-		}
-	}
-
-	/**
-	 * register hooks for the filesystem
-	 */
-	public static function registerFilesystemHooks() {
-		// Check for blacklisted files
-		OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
-		OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
-	}
-
-	/**
-	 * register hooks for sharing
-	 */
-	public static function registerShareHooks() {
-		if (\OC::$server->getSystemConfig()->getValue('installed')) {
-			OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share20\Hooks', 'post_deleteUser');
-			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share20\Hooks', 'post_removeFromGroup');
-			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share20\Hooks', 'post_deleteGroup');
-		}
-	}
-
-	protected static function registerAutoloaderCache() {
-		// The class loader takes an optional low-latency cache, which MUST be
-		// namespaced. The instanceid is used for namespacing, but might be
-		// unavailable at this point. Furthermore, it might not be possible to
-		// generate an instanceid via \OC_Util::getInstanceId() because the
-		// config file may not be writable. As such, we only register a class
-		// loader cache if instanceid is available without trying to create one.
-		$instanceId = \OC::$server->getSystemConfig()->getValue('instanceid', null);
-		if ($instanceId) {
-			try {
-				$memcacheFactory = \OC::$server->getMemCacheFactory();
-				self::$loader->setMemoryCache($memcacheFactory->createLocal('Autoloader'));
-			} catch (\Exception $ex) {
-			}
-		}
-	}
-
-	/**
-	 * Handle the request
-	 */
-	public static function handleRequest() {
-
-		\OC::$server->getEventLogger()->start('handle_request', 'Handle request');
-		$systemConfig = \OC::$server->getSystemConfig();
-		// load all the classpaths from the enabled apps so they are available
-		// in the routing files of each app
-		OC::loadAppClassPaths();
-
-		// Check if Nextcloud is installed or in maintenance (update) mode
-		if (!$systemConfig->getValue('installed', false)) {
-			\OC::$server->getSession()->clear();
-			$setupHelper = new OC\Setup(\OC::$server->getSystemConfig(), \OC::$server->getIniWrapper(),
-				\OC::$server->getL10N('lib'), \OC::$server->query(\OCP\Defaults::class), \OC::$server->getLogger(),
-				\OC::$server->getSecureRandom());
-			$controller = new OC\Core\Controller\SetupController($setupHelper);
-			$controller->run($_POST);
-			exit();
-		}
-
-		$request = \OC::$server->getRequest();
-		$requestPath = $request->getRawPathInfo();
-		if ($requestPath === '/heartbeat') {
-			return;
-		}
-		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode();
-			self::checkUpgrade();
-		}
-
-		// emergency app disabling
-		if ($requestPath === '/disableapp'
-			&& $request->getMethod() === 'POST'
-			&& ((string)$request->getParam('appid')) !== ''
-		) {
-			\OCP\JSON::callCheck();
-			\OCP\JSON::checkAdminUser();
-			$appId = (string)$request->getParam('appid');
-			$appId = \OC_App::cleanAppId($appId);
-
-			\OC_App::disable($appId);
-			\OC_JSON::success();
-			exit();
-		}
-
-		// Always load authentication apps
-		OC_App::loadApps(['authentication']);
-
-		// Load minimum set of apps
-		if (!self::checkUpgrade(false)
-			&& !$systemConfig->getValue('maintenance', false)) {
-			// For logged-in users: Load everything
-			if(\OC::$server->getUserSession()->isLoggedIn()) {
-				OC_App::loadApps();
-			} else {
-				// For guests: Load only filesystem and logging
-				OC_App::loadApps(array('filesystem', 'logging'));
-				self::handleLogin($request);
-			}
-		}
-
-		if (!self::$CLI) {
-			try {
-				if (!$systemConfig->getValue('maintenance', false) && !self::checkUpgrade(false)) {
-					OC_App::loadApps(array('filesystem', 'logging'));
-					OC_App::loadApps();
-				}
-				OC_Util::setupFS();
-				OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
-				return;
-			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-				//header('HTTP/1.0 404 Not Found');
-			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-				OC_Response::setStatus(405);
-				return;
-			}
-		}
-
-		// Handle WebDAV
-		if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
-			// not allowed any more to prevent people
-			// mounting this root directly.
-			// Users need to mount remote.php/webdav instead.
-			header('HTTP/1.1 405 Method Not Allowed');
-			header('Status: 405 Method Not Allowed');
-			return;
-		}
-
-		// Someone is logged in
-		if (\OC::$server->getUserSession()->isLoggedIn()) {
-			OC_App::loadApps();
-			OC_User::setupBackends();
-			OC_Util::setupFS();
-			// FIXME
-			// Redirect to default application
-			OC_Util::redirectToDefaultPage();
-		} else {
-			// Not handled and not logged in
-			header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-	}
-
-	/**
-	 * Check login: apache auth, auth token, basic auth
-	 *
-	 * @param OCP\IRequest $request
-	 * @return boolean
-	 */
-	static function handleLogin(OCP\IRequest $request) {
-		$userSession = self::$server->getUserSession();
-		if (OC_User::handleApacheAuth()) {
-			return true;
-		}
-		if ($userSession->tryTokenLogin($request)) {
-			return true;
-		}
-		if (isset($_COOKIE['nc_username'])
-			&& isset($_COOKIE['nc_token'])
-			&& isset($_COOKIE['nc_session_id'])
-			&& $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
-			return true;
-		}
-		if ($userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler())) {
-			return true;
-		}
-		return false;
-	}
-
-	protected static function handleAuthHeaders() {
-		//copy http auth headers for apache+php-fcgid work around
-		if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
-			$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
-		}
-
-		// Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
-		$vars = array(
-			'HTTP_AUTHORIZATION', // apache+php-cgi work around
-			'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
-		);
-		foreach ($vars as $var) {
-			if (isset($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
-				list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-				$_SERVER['PHP_AUTH_USER'] = $name;
-				$_SERVER['PHP_AUTH_PW'] = $password;
-				break;
-			}
-		}
-	}
+    /**
+     * Associative array for autoloading. classname => filename
+     */
+    public static $CLASSPATH = array();
+    /**
+     * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
+     */
+    public static $SERVERROOT = '';
+    /**
+     * the current request path relative to the Nextcloud root (e.g. files/index.php)
+     */
+    private static $SUBURI = '';
+    /**
+     * the Nextcloud root path for http requests (e.g. nextcloud/)
+     */
+    public static $WEBROOT = '';
+    /**
+     * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
+     * web path in 'url'
+     */
+    public static $APPSROOTS = array();
+
+    /**
+     * @var string
+     */
+    public static $configDir;
+
+    /**
+     * requested app
+     */
+    public static $REQUESTEDAPP = '';
+
+    /**
+     * check if Nextcloud runs in cli mode
+     */
+    public static $CLI = false;
+
+    /**
+     * @var \OC\Autoloader $loader
+     */
+    public static $loader = null;
+
+    /** @var \Composer\Autoload\ClassLoader $composerAutoloader */
+    public static $composerAutoloader = null;
+
+    /**
+     * @var \OC\Server
+     */
+    public static $server = null;
+
+    /**
+     * @var \OC\Config
+     */
+    private static $config = null;
+
+    /**
+     * @throws \RuntimeException when the 3rdparty directory is missing or
+     * the app path list is empty or contains an invalid path
+     */
+    public static function initPaths() {
+        if(defined('PHPUNIT_CONFIG_DIR')) {
+            self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
+        } elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
+            self::$configDir = OC::$SERVERROOT . '/tests/config/';
+        } elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+            self::$configDir = rtrim($dir, '/') . '/';
+        } else {
+            self::$configDir = OC::$SERVERROOT . '/config/';
+        }
+        self::$config = new \OC\Config(self::$configDir);
+
+        OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
+        /**
+         * FIXME: The following lines are required because we can't yet instantiiate
+         *        \OC::$server->getRequest() since \OC::$server does not yet exist.
+         */
+        $params = [
+            'server' => [
+                'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'],
+                'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
+            ],
+        ];
+        $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
+        $scriptName = $fakeRequest->getScriptName();
+        if (substr($scriptName, -1) == '/') {
+            $scriptName .= 'index.php';
+            //make sure suburi follows the same rules as scriptName
+            if (substr(OC::$SUBURI, -9) != 'index.php') {
+                if (substr(OC::$SUBURI, -1) != '/') {
+                    OC::$SUBURI = OC::$SUBURI . '/';
+                }
+                OC::$SUBURI = OC::$SUBURI . 'index.php';
+            }
+        }
+
+
+        if (OC::$CLI) {
+            OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+        } else {
+            if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
+                OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
+
+                if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
+                    OC::$WEBROOT = '/' . OC::$WEBROOT;
+                }
+            } else {
+                // The scriptName is not ending with OC::$SUBURI
+                // This most likely means that we are calling from CLI.
+                // However some cron jobs still need to generate
+                // a web URL, so we use overwritewebroot as a fallback.
+                OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+            }
+
+            // Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
+            // slash which is required by URL generation.
+            if($_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
+                    substr($_SERVER['REQUEST_URI'], -1) !== '/') {
+                header('Location: '.\OC::$WEBROOT.'/');
+                exit();
+            }
+        }
+
+        // search the apps folder
+        $config_paths = self::$config->getValue('apps_paths', array());
+        if (!empty($config_paths)) {
+            foreach ($config_paths as $paths) {
+                if (isset($paths['url']) && isset($paths['path'])) {
+                    $paths['url'] = rtrim($paths['url'], '/');
+                    $paths['path'] = rtrim($paths['path'], '/');
+                    OC::$APPSROOTS[] = $paths;
+                }
+            }
+        } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+            OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
+        } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+            OC::$APPSROOTS[] = array(
+                'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
+                'url' => '/apps',
+                'writable' => true
+            );
+        }
+
+        if (empty(OC::$APPSROOTS)) {
+            throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
+                . ' or the folder above. You can also configure the location in the config.php file.');
+        }
+        $paths = array();
+        foreach (OC::$APPSROOTS as $path) {
+            $paths[] = $path['path'];
+            if (!is_dir($path['path'])) {
+                throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
+                    . ' Nextcloud folder or the folder above. You can also configure the location in the'
+                    . ' config.php file.', $path['path']));
+            }
+        }
+
+        // set the right include path
+        set_include_path(
+            implode(PATH_SEPARATOR, $paths)
+        );
+    }
+
+    public static function checkConfig() {
+        $l = \OC::$server->getL10N('lib');
+
+        // Create config if it does not already exist
+        $configFilePath = self::$configDir .'/config.php';
+        if(!file_exists($configFilePath)) {
+            @touch($configFilePath);
+        }
+
+        // Check if config is writable
+        $configFileWritable = is_writable($configFilePath);
+        if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
+            || !$configFileWritable && self::checkUpgrade(false)) {
+
+            $urlGenerator = \OC::$server->getURLGenerator();
+
+            if (self::$CLI) {
+                echo $l->t('Cannot write into "config" directory!')."\n";
+                echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
+                echo "\n";
+                echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
+                exit;
+            } else {
+                OC_Template::printErrorPage(
+                    $l->t('Cannot write into "config" directory!'),
+                    $l->t('This can usually be fixed by '
+                    . '%sgiving the webserver write access to the config directory%s.',
+                        array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
+                );
+            }
+        }
+    }
+
+    public static function checkInstalled() {
+        if (defined('OC_CONSOLE')) {
+            return;
+        }
+        // Redirect to installer if not installed
+        if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
+            if (OC::$CLI) {
+                throw new Exception('Not installed');
+            } else {
+                $url = OC::$WEBROOT . '/index.php';
+                header('Location: ' . $url);
+            }
+            exit();
+        }
+    }
+
+    public static function checkMaintenanceMode() {
+        // Allow ajax update script to execute without being stopped
+        if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
+            // send http status 503
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = new OC_Template('', 'update.user', 'guest');
+            OC_Util::addScript('maintenance-check');
+            $template->printPage();
+            die();
+        }
+    }
+
+    /**
+     * Checks if the version requires an update and shows
+     * @param bool $showTemplate Whether an update screen should get shown
+     * @return bool|void
+     */
+    public static function checkUpgrade($showTemplate = true) {
+        if (\OCP\Util::needUpgrade()) {
+            $systemConfig = \OC::$server->getSystemConfig();
+            if ($showTemplate && !$systemConfig->getValue('maintenance', false)) {
+                self::printUpgradePage();
+                exit();
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Prints the upgrade page
+     */
+    private static function printUpgradePage() {
+        $systemConfig = \OC::$server->getSystemConfig();
+
+        $disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+        $tooBig = false;
+        if (!$disableWebUpdater) {
+            $apps = \OC::$server->getAppManager();
+            $tooBig = $apps->isInstalled('user_ldap') || $apps->isInstalled('user_shibboleth');
+            if (!$tooBig) {
+                // count users
+                $stats = \OC::$server->getUserManager()->countUsers();
+                $totalUsers = array_sum($stats);
+                $tooBig = ($totalUsers > 50);
+            }
+        }
+        if ($disableWebUpdater || $tooBig) {
+            // send http status 503
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = new OC_Template('', 'update.use-cli', 'guest');
+            $template->assign('productName', 'nextcloud'); // for now
+            $template->assign('version', OC_Util::getVersionString());
+            $template->assign('tooBig', $tooBig);
+
+            $template->printPage();
+            die();
+        }
+
+        // check whether this is a core update or apps update
+        $installedVersion = $systemConfig->getValue('version', '0.0.0');
+        $currentVersion = implode('.', \OCP\Util::getVersion());
+
+        // if not a core upgrade, then it's apps upgrade
+        $isAppsOnlyUpgrade = (version_compare($currentVersion, $installedVersion, '='));
+
+        $oldTheme = $systemConfig->getValue('theme');
+        $systemConfig->setValue('theme', '');
+        OC_Util::addScript('config'); // needed for web root
+        OC_Util::addScript('update');
+
+        /** @var \OC\App\AppManager $appManager */
+        $appManager = \OC::$server->getAppManager();
+
+        $tmpl = new OC_Template('', 'update.admin', 'guest');
+        $tmpl->assign('version', OC_Util::getVersionString());
+        $tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
+
+        // get third party apps
+        $ocVersion = \OCP\Util::getVersion();
+        $incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
+        $incompatibleShippedApps = [];
+        foreach ($incompatibleApps as $appInfo) {
+            if ($appManager->isShipped($appInfo['id'])) {
+                $incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+            }
+        }
+
+        if (!empty($incompatibleShippedApps)) {
+            $l = \OC::$server->getL10N('core');
+            $hint = $l->t('The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
+            throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
+        }
+
+        $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
+        $tmpl->assign('incompatibleAppsList', $incompatibleApps);
+        $tmpl->assign('productName', 'Nextcloud'); // for now
+        $tmpl->assign('oldTheme', $oldTheme);
+        $tmpl->printPage();
+    }
+
+    public static function initSession() {
+        // prevents javascript from accessing php session cookies
+        ini_set('session.cookie_httponly', true);
+
+        // set the cookie path to the Nextcloud directory
+        $cookie_path = OC::$WEBROOT ? : '/';
+        ini_set('session.cookie_path', $cookie_path);
+
+        // Let the session name be changed in the initSession Hook
+        $sessionName = OC_Util::getInstanceId();
+
+        try {
+            // Allow session apps to create a custom session object
+            $useCustomSession = false;
+            $session = self::$server->getSession();
+            OC_Hook::emit('OC', 'initSession', array('session' => &$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
+            if (!$useCustomSession) {
+                // set the session name to the instance id - which is unique
+                $session = new \OC\Session\Internal($sessionName);
+            }
+
+            $cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+            $session = $cryptoWrapper->wrapSession($session);
+            self::$server->setSession($session);
+
+            // if session can't be started break with http 500 error
+        } catch (Exception $e) {
+            \OCP\Util::logException('base', $e);
+            //show the user a detailed error page
+            OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+            OC_Template::printExceptionErrorPage($e);
+            die();
+        }
+
+        $sessionLifeTime = self::getSessionLifeTime();
+
+        // session timeout
+        if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
+            if (isset($_COOKIE[session_name()])) {
+                setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
+            }
+            \OC::$server->getUserSession()->logout();
+        }
+
+        $session->set('LAST_ACTIVITY', time());
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSessionLifeTime() {
+        return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
+    }
+
+    public static function loadAppClassPaths() {
+        foreach (OC_App::getEnabledApps() as $app) {
+            $appPath = OC_App::getAppPath($app);
+            if ($appPath === false) {
+                continue;
+            }
+
+            $file = $appPath . '/appinfo/classpath.php';
+            if (file_exists($file)) {
+                require_once $file;
+            }
+        }
+    }
+
+    /**
+     * Try to set some values to the required Nextcloud default
+     */
+    public static function setRequiredIniValues() {
+        @ini_set('default_charset', 'UTF-8');
+        @ini_set('gd.jpeg_ignore_warning', 1);
+    }
+
+    /**
+     * Send the same site cookies
+     */
+    private static function sendSameSiteCookies() {
+        $cookieParams = session_get_cookie_params();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
+
+    /**
+     * Same Site cookie to further mitigate CSRF attacks. This cookie has to
+     * be set in every request if cookies are sent to add a second level of
+     * defense against CSRF.
+     *
+     * If the cookie is not sent this will set the cookie and reload the page.
+     * We use an additional cookie since we want to protect logout CSRF and
+     * also we can't directly interfere with PHP's session mechanism.
+     */
+    private static function performSameSiteCookieProtection() {
+        $request = \OC::$server->getRequest();
+
+        // Some user agents are notorious and don't really properly follow HTTP
+        // specifications. For those, have an automated opt-out. Since the protection
+        // for remote.php is applied in base.php as starting point we need to opt out
+        // here.
+        $incompatibleUserAgents = [
+            // OS X Finder
+            '/^WebDAVFS/',
+        ];
+        if($request->isUserAgent($incompatibleUserAgents)) {
+            return;
+        }
+
+        if(count($_COOKIE) > 0) {
+            $requestUri = $request->getScriptName();
+            $processingScript = explode('/', $requestUri);
+            $processingScript = $processingScript[count($processingScript)-1];
+            // FIXME: In a SAML scenario we don't get any strict or lax cookie
+            // send for the ACS endpoint. Since we have some legacy code in Nextcloud
+            // (direct PHP files) the enforcement of lax cookies is performed here
+            // instead of the middleware.
+            //
+            // This means we cannot exclude some routes from the cookie validation,
+            // which normally is not a problem but is a little bit cumbersome for
+            // this use-case.
+            // Once the old legacy PHP endpoints have been removed we can move
+            // the verification into a middleware and also adds some exemptions.
+            //
+            // Questions about this code? Ask Lukas ;-)
+            $currentUrl = substr(explode('?',$request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT));
+            if($currentUrl === '/index.php/apps/user_saml/saml/acs' || $currentUrl === '/apps/user_saml/saml/acs') {
+                return;
+            }
+            // For the "index.php" endpoint only a lax cookie is required.
+            if($processingScript === 'index.php') {
+                if(!$request->passesLaxCookieCheck()) {
+                    self::sendSameSiteCookies();
+                    header('Location: '.$_SERVER['REQUEST_URI']);
+                    exit();
+                }
+            } else {
+                // All other endpoints require the lax and the strict cookie
+                if(!$request->passesStrictCookieCheck()) {
+                    self::sendSameSiteCookies();
+                    // Debug mode gets access to the resources without strict cookie
+                    // due to the fact that the SabreDAV browser also lives there.
+                    if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+                        http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
+                        exit();
+                    }
+                }
+            }
+        } elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+            self::sendSameSiteCookies();
+        }
+    }
+
+    public static function init() {
+        // calculate the root directories
+        OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+
+        // register autoloader
+        $loaderStart = microtime(true);
+        require_once __DIR__ . '/autoloader.php';
+        self::$loader = new \OC\Autoloader([
+            OC::$SERVERROOT . '/lib/private/legacy',
+        ]);
+        if (defined('PHPUNIT_RUN')) {
+            self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+        }
+        spl_autoload_register(array(self::$loader, 'load'));
+        $loaderEnd = microtime(true);
+
+        self::$CLI = (php_sapi_name() == 'cli');
+
+        // Add default composer PSR-4 autoloader
+        self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+
+        try {
+            self::initPaths();
+            // setup 3rdparty autoloader
+            $vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
+            if (!file_exists($vendorAutoLoad)) {
+                throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
+            }
+            require_once $vendorAutoLoad;
+
+        } catch (\RuntimeException $e) {
+            if (!self::$CLI) {
+                $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
+                $protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1';
+                header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE);
+            }
+            // we can't use the template error page here, because this needs the
+            // DI container which isn't available yet
+            print($e->getMessage());
+            exit();
+        }
+
+        // setup the basic server
+        self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
+        \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
+        \OC::$server->getEventLogger()->start('boot', 'Initialize');
+
+        // Don't display errors and log them
+        error_reporting(E_ALL | E_STRICT);
+        @ini_set('display_errors', 0);
+        @ini_set('log_errors', 1);
+
+        if(!date_default_timezone_set('UTC')) {
+            throw new \RuntimeException('Could not set timezone to UTC');
+        };
+
+        //try to configure php to enable big file uploads.
+        //this doesn´t work always depending on the webserver and php configuration.
+        //Let´s try to overwrite some defaults anyway
+
+        //try to set the maximum execution time to 60min
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(3600);
+        }
+        @ini_set('max_execution_time', 3600);
+        @ini_set('max_input_time', 3600);
+
+        //try to set the maximum filesize to 10G
+        @ini_set('upload_max_filesize', '10G');
+        @ini_set('post_max_size', '10G');
+        @ini_set('file_uploads', '50');
+
+        self::setRequiredIniValues();
+        self::handleAuthHeaders();
+        self::registerAutoloaderCache();
+
+        // initialize intl fallback is necessary
+        \Patchwork\Utf8\Bootup::initIntl();
+        OC_Util::isSetLocaleWorking();
+
+        if (!defined('PHPUNIT_RUN')) {
+            OC\Log\ErrorHandler::setLogger(\OC::$server->getLogger());
+            $debug = \OC::$server->getConfig()->getSystemValue('debug', false);
+            OC\Log\ErrorHandler::register($debug);
+        }
+
+        \OC::$server->getEventLogger()->start('init_session', 'Initialize session');
+        OC_App::loadApps(array('session'));
+        if (!self::$CLI) {
+            self::initSession();
+        }
+        \OC::$server->getEventLogger()->end('init_session');
+        self::checkConfig();
+        self::checkInstalled();
+
+        OC_Response::addSecurityHeaders();
+        if(self::$server->getRequest()->getServerProtocol() === 'https') {
+            ini_set('session.cookie_secure', true);
+        }
+
+        self::performSameSiteCookieProtection();
+
+        if (!defined('OC_CONSOLE')) {
+            $errors = OC_Util::checkServer(\OC::$server->getSystemConfig());
+            if (count($errors) > 0) {
+                if (self::$CLI) {
+                    // Convert l10n string into regular string for usage in database
+                    $staticErrors = [];
+                    foreach ($errors as $error) {
+                        echo $error['error'] . "\n";
+                        echo $error['hint'] . "\n\n";
+                        $staticErrors[] = [
+                            'error' => (string)$error['error'],
+                            'hint' => (string)$error['hint'],
+                        ];
+                    }
+
+                    try {
+                        \OC::$server->getConfig()->setAppValue('core', 'cronErrors', json_encode($staticErrors));
+                    } catch (\Exception $e) {
+                        echo('Writing to database failed');
+                    }
+                    exit(1);
+                } else {
+                    OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+                    OC_Util::addStyle('guest');
+                    OC_Template::printGuestPage('', 'error', array('errors' => $errors));
+                    exit;
+                }
+            } elseif (self::$CLI && \OC::$server->getConfig()->getSystemValue('installed', false)) {
+                \OC::$server->getConfig()->deleteAppValue('core', 'cronErrors');
+            }
+        }
+        //try to set the session lifetime
+        $sessionLifeTime = self::getSessionLifeTime();
+        @ini_set('gc_maxlifetime', (string)$sessionLifeTime);
+
+        $systemConfig = \OC::$server->getSystemConfig();
+
+        // User and Groups
+        if (!$systemConfig->getValue("installed", false)) {
+            self::$server->getSession()->set('user_id', '');
+        }
+
+        OC_User::useBackend(new \OC\User\Database());
+        \OC::$server->getGroupManager()->addBackend(new \OC\Group\Database());
+
+        // Subscribe to the hook
+        \OCP\Util::connectHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            '\OC\User\Database',
+            'preLoginNameUsedAsUserName'
+        );
+
+        //setup extra user backends
+        if (!self::checkUpgrade(false)) {
+            OC_User::setupBackends();
+        } else {
+            // Run upgrades in incognito mode
+            OC_User::setIncognitoMode(true);
+        }
+
+        self::registerCacheHooks();
+        self::registerFilesystemHooks();
+        self::registerShareHooks();
+        self::registerLogRotate();
+        self::registerEncryptionWrapper();
+        self::registerEncryptionHooks();
+        self::registerAccountHooks();
+        self::registerSettingsHooks();
+
+        $settings = new \OC\Settings\Application();
+        $settings->register();
+
+        //make sure temporary files are cleaned up
+        $tmpManager = \OC::$server->getTempManager();
+        register_shutdown_function(array($tmpManager, 'clean'));
+        $lockProvider = \OC::$server->getLockingProvider();
+        register_shutdown_function(array($lockProvider, 'releaseAll'));
+
+        // Check whether the sample configuration has been copied
+        if($systemConfig->getValue('copied_sample_config', false)) {
+            $l = \OC::$server->getL10N('lib');
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            OC_Template::printErrorPage(
+                $l->t('Sample configuration detected'),
+                $l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php')
+            );
+            return;
+        }
+
+        $request = \OC::$server->getRequest();
+        $host = $request->getInsecureServerHost();
+        /**
+         * if the host passed in headers isn't trusted
+         * FIXME: Should not be in here at all :see_no_evil:
+         */
+        if (!OC::$CLI
+            // overwritehost is always trusted, workaround to not have to make
+            // \OC\AppFramework\Http\Request::getOverwriteHost public
+            && self::$server->getConfig()->getSystemValue('overwritehost') === ''
+            && !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host)
+            && self::$server->getConfig()->getSystemValue('installed', false)
+        ) {
+            // Allow access to CSS resources
+            $isScssRequest = false;
+            if(strpos($request->getPathInfo(), '/css/') === 0) {
+                $isScssRequest = true;
+            }
+
+            if (!$isScssRequest) {
+                header('HTTP/1.1 400 Bad Request');
+                header('Status: 400 Bad Request');
+
+                \OC::$server->getLogger()->warning(
+                    'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
+                    [
+                        'app' => 'core',
+                        'remoteAddress' => $request->getRemoteAddress(),
+                        'host' => $host,
+                    ]
+                );
+
+                $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
+                $tmpl->assign('domain', $host);
+                $tmpl->printPage();
+
+                exit();
+            }
+        }
+        \OC::$server->getEventLogger()->end('boot');
+    }
+
+    /**
+     * register hooks for the cache
+     */
+    public static function registerCacheHooks() {
+        //don't try to do this before we are properly setup
+        if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {
+
+            // NOTE: This will be replaced to use OCP
+            $userSession = self::$server->getUserSession();
+            $userSession->listen('\OC\User', 'postLogin', function () {
+                try {
+                    $cache = new \OC\Cache\File();
+                    $cache->gc();
+                } catch (\OC\ServerNotAvailableException $e) {
+                    // not a GC exception, pass it on
+                    throw $e;
+                } catch (\Exception $e) {
+                    // a GC exception should not prevent users from using OC,
+                    // so log the exception
+                    \OC::$server->getLogger()->warning('Exception when running cache gc: ' . $e->getMessage(), array('app' => 'core'));
+                }
+            });
+        }
+    }
+
+    public static function registerSettingsHooks() {
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_DISABLE, function($event) {
+            /** @var \OCP\App\ManagerEvent $event */
+            \OC::$server->getSettingsManager()->onAppDisabled($event->getAppID());
+        });
+        $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_UPDATE, function($event) {
+            /** @var \OCP\App\ManagerEvent $event */
+            $jobList = \OC::$server->getJobList();
+            $job = 'OC\\Settings\\RemoveOrphaned';
+            if(!($jobList->has($job, null))) {
+                $jobList->add($job);
+            }
+        });
+    }
+
+    private static function registerEncryptionWrapper() {
+        $manager = self::$server->getEncryptionManager();
+        \OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage');
+    }
+
+    private static function registerEncryptionHooks() {
+        $enabled = self::$server->getEncryptionManager()->isEnabled();
+        if ($enabled) {
+            \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
+            \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
+            \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OC\Encryption\HookManager', 'postRename');
+            \OCP\Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 'OC\Encryption\HookManager', 'postRestore');
+        }
+    }
+
+    private static function registerAccountHooks() {
+        $hookHandler = new \OC\Accounts\Hooks(\OC::$server->getLogger());
+        \OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
+    }
+
+    /**
+     * register hooks for the cache
+     */
+    public static function registerLogRotate() {
+        $systemConfig = \OC::$server->getSystemConfig();
+        if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
+            //don't try to do this before we are properly setup
+            //use custom logfile path if defined, otherwise use default of nextcloud.log in data directory
+            \OC::$server->getJobList()->add('OC\Log\Rotate');
+        }
+    }
+
+    /**
+     * register hooks for the filesystem
+     */
+    public static function registerFilesystemHooks() {
+        // Check for blacklisted files
+        OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
+        OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
+    }
+
+    /**
+     * register hooks for sharing
+     */
+    public static function registerShareHooks() {
+        if (\OC::$server->getSystemConfig()->getValue('installed')) {
+            OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share20\Hooks', 'post_deleteUser');
+            OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share20\Hooks', 'post_removeFromGroup');
+            OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share20\Hooks', 'post_deleteGroup');
+        }
+    }
+
+    protected static function registerAutoloaderCache() {
+        // The class loader takes an optional low-latency cache, which MUST be
+        // namespaced. The instanceid is used for namespacing, but might be
+        // unavailable at this point. Furthermore, it might not be possible to
+        // generate an instanceid via \OC_Util::getInstanceId() because the
+        // config file may not be writable. As such, we only register a class
+        // loader cache if instanceid is available without trying to create one.
+        $instanceId = \OC::$server->getSystemConfig()->getValue('instanceid', null);
+        if ($instanceId) {
+            try {
+                $memcacheFactory = \OC::$server->getMemCacheFactory();
+                self::$loader->setMemoryCache($memcacheFactory->createLocal('Autoloader'));
+            } catch (\Exception $ex) {
+            }
+        }
+    }
+
+    /**
+     * Handle the request
+     */
+    public static function handleRequest() {
+
+        \OC::$server->getEventLogger()->start('handle_request', 'Handle request');
+        $systemConfig = \OC::$server->getSystemConfig();
+        // load all the classpaths from the enabled apps so they are available
+        // in the routing files of each app
+        OC::loadAppClassPaths();
+
+        // Check if Nextcloud is installed or in maintenance (update) mode
+        if (!$systemConfig->getValue('installed', false)) {
+            \OC::$server->getSession()->clear();
+            $setupHelper = new OC\Setup(\OC::$server->getSystemConfig(), \OC::$server->getIniWrapper(),
+                \OC::$server->getL10N('lib'), \OC::$server->query(\OCP\Defaults::class), \OC::$server->getLogger(),
+                \OC::$server->getSecureRandom());
+            $controller = new OC\Core\Controller\SetupController($setupHelper);
+            $controller->run($_POST);
+            exit();
+        }
+
+        $request = \OC::$server->getRequest();
+        $requestPath = $request->getRawPathInfo();
+        if ($requestPath === '/heartbeat') {
+            return;
+        }
+        if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
+            self::checkMaintenanceMode();
+            self::checkUpgrade();
+        }
+
+        // emergency app disabling
+        if ($requestPath === '/disableapp'
+            && $request->getMethod() === 'POST'
+            && ((string)$request->getParam('appid')) !== ''
+        ) {
+            \OCP\JSON::callCheck();
+            \OCP\JSON::checkAdminUser();
+            $appId = (string)$request->getParam('appid');
+            $appId = \OC_App::cleanAppId($appId);
+
+            \OC_App::disable($appId);
+            \OC_JSON::success();
+            exit();
+        }
+
+        // Always load authentication apps
+        OC_App::loadApps(['authentication']);
+
+        // Load minimum set of apps
+        if (!self::checkUpgrade(false)
+            && !$systemConfig->getValue('maintenance', false)) {
+            // For logged-in users: Load everything
+            if(\OC::$server->getUserSession()->isLoggedIn()) {
+                OC_App::loadApps();
+            } else {
+                // For guests: Load only filesystem and logging
+                OC_App::loadApps(array('filesystem', 'logging'));
+                self::handleLogin($request);
+            }
+        }
+
+        if (!self::$CLI) {
+            try {
+                if (!$systemConfig->getValue('maintenance', false) && !self::checkUpgrade(false)) {
+                    OC_App::loadApps(array('filesystem', 'logging'));
+                    OC_App::loadApps();
+                }
+                OC_Util::setupFS();
+                OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
+                return;
+            } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+                //header('HTTP/1.0 404 Not Found');
+            } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+                OC_Response::setStatus(405);
+                return;
+            }
+        }
+
+        // Handle WebDAV
+        if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+            // not allowed any more to prevent people
+            // mounting this root directly.
+            // Users need to mount remote.php/webdav instead.
+            header('HTTP/1.1 405 Method Not Allowed');
+            header('Status: 405 Method Not Allowed');
+            return;
+        }
+
+        // Someone is logged in
+        if (\OC::$server->getUserSession()->isLoggedIn()) {
+            OC_App::loadApps();
+            OC_User::setupBackends();
+            OC_Util::setupFS();
+            // FIXME
+            // Redirect to default application
+            OC_Util::redirectToDefaultPage();
+        } else {
+            // Not handled and not logged in
+            header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+    }
+
+    /**
+     * Check login: apache auth, auth token, basic auth
+     *
+     * @param OCP\IRequest $request
+     * @return boolean
+     */
+    static function handleLogin(OCP\IRequest $request) {
+        $userSession = self::$server->getUserSession();
+        if (OC_User::handleApacheAuth()) {
+            return true;
+        }
+        if ($userSession->tryTokenLogin($request)) {
+            return true;
+        }
+        if (isset($_COOKIE['nc_username'])
+            && isset($_COOKIE['nc_token'])
+            && isset($_COOKIE['nc_session_id'])
+            && $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
+            return true;
+        }
+        if ($userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler())) {
+            return true;
+        }
+        return false;
+    }
+
+    protected static function handleAuthHeaders() {
+        //copy http auth headers for apache+php-fcgid work around
+        if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+        }
+
+        // Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
+        $vars = array(
+            'HTTP_AUTHORIZATION', // apache+php-cgi work around
+            'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
+        );
+        foreach ($vars as $var) {
+            if (isset($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
+                list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+                $_SERVER['PHP_AUTH_USER'] = $name;
+                $_SERVER['PHP_AUTH_PW'] = $password;
+                break;
+            }
+        }
+    }
 }
 
 OC::init();

settings/Activity/Provider.php

Indentation +144 added lines, -144 removed lines

@@ -31,148 +31,148 @@
 
 class Provider implements IProvider {
 
-	const PASSWORD_CHANGED_BY = 'password_changed_by';
-	const PASSWORD_CHANGED_SELF = 'password_changed_self';
-	const PASSWORD_RESET = 'password_changed';
-	const EMAIL_CHANGED_BY = 'email_changed_by';
-	const EMAIL_CHANGED_SELF = 'email_changed_self';
-	const EMAIL_CHANGED = 'email_changed';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'settings') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('settings', $language);
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
-
-		if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_RESET) {
-			$subject = $this->l->t('Your password was reset by an administrator');
-
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email was changed by an administrator');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::PASSWORD_CHANGED_SELF:
-			case self::PASSWORD_RESET:
-			case self::EMAIL_CHANGED_SELF:
-			case self::EMAIL_CHANGED:
-				return [];
-			case self::PASSWORD_CHANGED_BY:
-			case self::EMAIL_CHANGED_BY:
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		}
-
-		return $uid;
-	}
+    const PASSWORD_CHANGED_BY = 'password_changed_by';
+    const PASSWORD_CHANGED_SELF = 'password_changed_self';
+    const PASSWORD_RESET = 'password_changed';
+    const EMAIL_CHANGED_BY = 'email_changed_by';
+    const EMAIL_CHANGED_SELF = 'email_changed_self';
+    const EMAIL_CHANGED = 'email_changed';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'settings') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('settings', $language);
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
+
+        if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_RESET) {
+            $subject = $this->l->t('Your password was reset by an administrator');
+
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your email');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your email');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED) {
+            $subject = $this->l->t('Your email was changed by an administrator');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::PASSWORD_CHANGED_SELF:
+            case self::PASSWORD_RESET:
+            case self::EMAIL_CHANGED_SELF:
+            case self::EMAIL_CHANGED:
+                return [];
+            case self::PASSWORD_CHANGED_BY:
+            case self::EMAIL_CHANGED_BY:
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        }
+
+        return $uid;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}
 

lib/private/User/User.php

Doc Comments +5 added lines

@@ -436,6 +436,11 @@
 		return $url;
 	}
 
+	/**
+	 * @param string $feature
+	 * @param string $value
+	 * @param string $oldValue
+	 */
 	public function triggerChange($feature, $value = null, $oldValue = null) {
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));

Indentation +399 added lines, -399 removed lines

@@ -42,403 +42,403 @@
 use \OCP\IUserBackend;
 
 class User implements IUser {
-	/** @var string $uid */
-	private $uid;
-
-	/** @var string $displayName */
-	private $displayName;
-
-	/** @var UserInterface $backend */
-	private $backend;
-
-	/** @var bool $enabled */
-	private $enabled;
-
-	/** @var Emitter|Manager $emitter */
-	private $emitter;
-
-	/** @var string $home */
-	private $home;
-
-	/** @var int $lastLogin */
-	private $lastLogin;
-
-	/** @var \OCP\IConfig $config */
-	private $config;
-
-	/** @var IAvatarManager */
-	private $avatarManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * @param string $uid
-	 * @param UserInterface $backend
-	 * @param \OC\Hooks\Emitter $emitter
-	 * @param IConfig|null $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct($uid, $backend, $emitter = null, IConfig $config = null, $urlGenerator = null) {
-		$this->uid = $uid;
-		$this->backend = $backend;
-		$this->emitter = $emitter;
-		if(is_null($config)) {
-			$config = \OC::$server->getConfig();
-		}
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
-		$this->enabled = ($enabled === 'true');
-		$this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
-		if (is_null($this->urlGenerator)) {
-			$this->urlGenerator = \OC::$server->getURLGenerator();
-		}
-	}
-
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
-
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 */
-	public function getDisplayName() {
-		if (!isset($this->displayName)) {
-			$displayName = '';
-			if ($this->backend and $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
-				// get display name and strip whitespace from the beginning and end of it
-				$backendDisplayName = $this->backend->getDisplayName($this->uid);
-				if (is_string($backendDisplayName)) {
-					$displayName = trim($backendDisplayName);
-				}
-			}
-
-			if (!empty($displayName)) {
-				$this->displayName = $displayName;
-			} else {
-				$this->displayName = $this->uid;
-			}
-		}
-		return $this->displayName;
-	}
-
-	/**
-	 * set the displayname for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 */
-	public function setDisplayName($displayName) {
-		$displayName = trim($displayName);
-		if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
-			$result = $this->backend->setDisplayName($this->uid, $displayName);
-			if ($result) {
-				$this->displayName = $displayName;
-				$this->triggerChange('displayName', $displayName);
-			}
-			return $result !== false;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * set the email address of the user
-	 *
-	 * @param string|null $mailAddress
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setEMailAddress($mailAddress) {
-		$oldMailAddress = $this->getEMailAddress();
-		if($mailAddress === '') {
-			$this->config->deleteUserValue($this->uid, 'settings', 'email');
-		} else {
-			$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
-		}
-		$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
-	}
-
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 */
-	public function getLastLogin() {
-		return $this->lastLogin;
-	}
-
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 */
-	public function updateLastLoginTimestamp() {
-		$firstTimeLogin = ($this->lastLogin === 0);
-		$this->lastLogin = time();
-		$this->config->setUserValue(
-			$this->uid, 'login', 'lastLogin', $this->lastLogin);
-
-		return $firstTimeLogin;
-	}
-
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'preDelete', array($this));
-		}
-		// get the home now because it won't return it after user deletion
-		$homePath = $this->getHome();
-		$result = $this->backend->deleteUser($this->uid);
-		if ($result) {
-
-			// FIXME: Feels like an hack - suggestions?
-
-			$groupManager = \OC::$server->getGroupManager();
-			// We have to delete the user from all groups
-			foreach ($groupManager->getUserGroupIds($this) as $groupId) {
-				$group = $groupManager->get($groupId);
-				if ($group) {
-					\OC_Hook::emit("OC_Group", "pre_removeFromGroup", ["run" => true, "uid" => $this->uid, "gid" => $groupId]);
-					$group->removeUser($this);
-					\OC_Hook::emit("OC_User", "post_removeFromGroup", ["uid" => $this->uid, "gid" => $groupId]);
-				}
-			}
-			// Delete the user's keys in preferences
-			\OC::$server->getConfig()->deleteAllUserValues($this->uid);
-
-			// Delete user files in /data/
-			if ($homePath !== false) {
-				// FIXME: this operates directly on FS, should use View instead...
-				// also this is not testable/mockable...
-				\OC_Helper::rmdirr($homePath);
-			}
-
-			// Delete the users entry in the storage table
-			Storage::remove('home::' . $this->uid);
-
-			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
-			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
-
-			$notification = \OC::$server->getNotificationManager()->createNotification();
-			$notification->setUser($this->uid);
-			\OC::$server->getNotificationManager()->markProcessed($notification);
-
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\User', 'postDelete', array($this));
-			}
-		}
-		return !($result === false);
-	}
-
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 */
-	public function setPassword($password, $recoveryPassword = null) {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
-		}
-		if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
-			$result = $this->backend->setPassword($this->uid, $password);
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
-			}
-			return !($result === false);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 */
-	public function getHome() {
-		if (!$this->home) {
-			if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
-				$this->home = $home;
-			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
-			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
-			}
-		}
-		return $this->home;
-	}
-
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 */
-	public function getBackendClassName() {
-		if($this->backend instanceof IUserBackend) {
-			return $this->backend->getBackendName();
-		}
-		return get_class($this->backend);
-	}
-
-	/**
-	 * check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 */
-	public function canChangeAvatar() {
-		if ($this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
-			return $this->backend->canChangeAvatar($this->uid);
-		}
-		return true;
-	}
-
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 */
-	public function canChangePassword() {
-		return $this->backend->implementsActions(Backend::SET_PASSWORD);
-	}
-
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 */
-	public function canChangeDisplayName() {
-		if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
-			return false;
-		}
-		return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
-	}
-
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 */
-	public function isEnabled() {
-		return $this->enabled;
-	}
-
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 */
-	public function setEnabled($enabled) {
-		$this->enabled = $enabled;
-		$enabled = ($enabled) ? 'true' : 'false';
-		$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
-	}
-
-	/**
-	 * get the users email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress() {
-		return $this->config->getUserValue($this->uid, 'settings', 'email', null);
-	}
-
-	/**
-	 * get the users' quota
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota() {
-		$quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
-		if($quota === 'default') {
-			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
-		}
-		return $quota;
-	}
-
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota) {
-		if($quota !== 'none' and $quota !== 'default') {
-			$quota = OC_Helper::computerFileSize($quota);
-			$quota = OC_Helper::humanFileSize($quota);
-		}
-		$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
-		$this->triggerChange('quota', $quota);
-	}
-
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size) {
-		// delay the initialization
-		if (is_null($this->avatarManager)) {
-			$this->avatarManager = \OC::$server->getAvatarManager();
-		}
-
-		$avatar = $this->avatarManager->getAvatar($this->uid);
-		$image = $avatar->get(-1);
-		if ($image) {
-			return $image;
-		}
-
-		return null;
-	}
-
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId() {
-		$uid = $this->getUID();
-		$server = $this->urlGenerator->getAbsoluteURL('/');
-		$server =  rtrim( $this->removeProtocolFromUrl($server), '/');
-		return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
-	}
-
-	/**
-	 * @param string $url
-	 * @return string
-	 */
-	private function removeProtocolFromUrl($url) {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			return substr($url, strlen('http://'));
-		}
-
-		return $url;
-	}
-
-	public function triggerChange($feature, $value = null, $oldValue = null) {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
-		}
-	}
+    /** @var string $uid */
+    private $uid;
+
+    /** @var string $displayName */
+    private $displayName;
+
+    /** @var UserInterface $backend */
+    private $backend;
+
+    /** @var bool $enabled */
+    private $enabled;
+
+    /** @var Emitter|Manager $emitter */
+    private $emitter;
+
+    /** @var string $home */
+    private $home;
+
+    /** @var int $lastLogin */
+    private $lastLogin;
+
+    /** @var \OCP\IConfig $config */
+    private $config;
+
+    /** @var IAvatarManager */
+    private $avatarManager;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * @param string $uid
+     * @param UserInterface $backend
+     * @param \OC\Hooks\Emitter $emitter
+     * @param IConfig|null $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct($uid, $backend, $emitter = null, IConfig $config = null, $urlGenerator = null) {
+        $this->uid = $uid;
+        $this->backend = $backend;
+        $this->emitter = $emitter;
+        if(is_null($config)) {
+            $config = \OC::$server->getConfig();
+        }
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
+        $this->enabled = ($enabled === 'true');
+        $this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
+        if (is_null($this->urlGenerator)) {
+            $this->urlGenerator = \OC::$server->getURLGenerator();
+        }
+    }
+
+    /**
+     * get the user id
+     *
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
+
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+        if (!isset($this->displayName)) {
+            $displayName = '';
+            if ($this->backend and $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
+                // get display name and strip whitespace from the beginning and end of it
+                $backendDisplayName = $this->backend->getDisplayName($this->uid);
+                if (is_string($backendDisplayName)) {
+                    $displayName = trim($backendDisplayName);
+                }
+            }
+
+            if (!empty($displayName)) {
+                $this->displayName = $displayName;
+            } else {
+                $this->displayName = $this->uid;
+            }
+        }
+        return $this->displayName;
+    }
+
+    /**
+     * set the displayname for the user
+     *
+     * @param string $displayName
+     * @return bool
+     */
+    public function setDisplayName($displayName) {
+        $displayName = trim($displayName);
+        if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
+            $result = $this->backend->setDisplayName($this->uid, $displayName);
+            if ($result) {
+                $this->displayName = $displayName;
+                $this->triggerChange('displayName', $displayName);
+            }
+            return $result !== false;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * set the email address of the user
+     *
+     * @param string|null $mailAddress
+     * @return void
+     * @since 9.0.0
+     */
+    public function setEMailAddress($mailAddress) {
+        $oldMailAddress = $this->getEMailAddress();
+        if($mailAddress === '') {
+            $this->config->deleteUserValue($this->uid, 'settings', 'email');
+        } else {
+            $this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
+        }
+        $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
+    }
+
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     */
+    public function getLastLogin() {
+        return $this->lastLogin;
+    }
+
+    /**
+     * updates the timestamp of the most recent login of this user
+     */
+    public function updateLastLoginTimestamp() {
+        $firstTimeLogin = ($this->lastLogin === 0);
+        $this->lastLogin = time();
+        $this->config->setUserValue(
+            $this->uid, 'login', 'lastLogin', $this->lastLogin);
+
+        return $firstTimeLogin;
+    }
+
+    /**
+     * Delete the user
+     *
+     * @return bool
+     */
+    public function delete() {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'preDelete', array($this));
+        }
+        // get the home now because it won't return it after user deletion
+        $homePath = $this->getHome();
+        $result = $this->backend->deleteUser($this->uid);
+        if ($result) {
+
+            // FIXME: Feels like an hack - suggestions?
+
+            $groupManager = \OC::$server->getGroupManager();
+            // We have to delete the user from all groups
+            foreach ($groupManager->getUserGroupIds($this) as $groupId) {
+                $group = $groupManager->get($groupId);
+                if ($group) {
+                    \OC_Hook::emit("OC_Group", "pre_removeFromGroup", ["run" => true, "uid" => $this->uid, "gid" => $groupId]);
+                    $group->removeUser($this);
+                    \OC_Hook::emit("OC_User", "post_removeFromGroup", ["uid" => $this->uid, "gid" => $groupId]);
+                }
+            }
+            // Delete the user's keys in preferences
+            \OC::$server->getConfig()->deleteAllUserValues($this->uid);
+
+            // Delete user files in /data/
+            if ($homePath !== false) {
+                // FIXME: this operates directly on FS, should use View instead...
+                // also this is not testable/mockable...
+                \OC_Helper::rmdirr($homePath);
+            }
+
+            // Delete the users entry in the storage table
+            Storage::remove('home::' . $this->uid);
+
+            \OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
+            \OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
+
+            $notification = \OC::$server->getNotificationManager()->createNotification();
+            $notification->setUser($this->uid);
+            \OC::$server->getNotificationManager()->markProcessed($notification);
+
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\User', 'postDelete', array($this));
+            }
+        }
+        return !($result === false);
+    }
+
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     */
+    public function setPassword($password, $recoveryPassword = null) {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
+        }
+        if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
+            $result = $this->backend->setPassword($this->uid, $password);
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
+            }
+            return !($result === false);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     */
+    public function getHome() {
+        if (!$this->home) {
+            if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+                $this->home = $home;
+            } elseif ($this->config) {
+                $this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+            } else {
+                $this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+            }
+        }
+        return $this->home;
+    }
+
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     */
+    public function getBackendClassName() {
+        if($this->backend instanceof IUserBackend) {
+            return $this->backend->getBackendName();
+        }
+        return get_class($this->backend);
+    }
+
+    /**
+     * check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     */
+    public function canChangeAvatar() {
+        if ($this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
+            return $this->backend->canChangeAvatar($this->uid);
+        }
+        return true;
+    }
+
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     */
+    public function canChangePassword() {
+        return $this->backend->implementsActions(Backend::SET_PASSWORD);
+    }
+
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     */
+    public function canChangeDisplayName() {
+        if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
+            return false;
+        }
+        return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
+    }
+
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     */
+    public function isEnabled() {
+        return $this->enabled;
+    }
+
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     */
+    public function setEnabled($enabled) {
+        $this->enabled = $enabled;
+        $enabled = ($enabled) ? 'true' : 'false';
+        $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
+    }
+
+    /**
+     * get the users email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress() {
+        return $this->config->getUserValue($this->uid, 'settings', 'email', null);
+    }
+
+    /**
+     * get the users' quota
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota() {
+        $quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
+        if($quota === 'default') {
+            $quota = $this->config->getAppValue('files', 'default_quota', 'none');
+        }
+        return $quota;
+    }
+
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @since 9.0.0
+     */
+    public function setQuota($quota) {
+        if($quota !== 'none' and $quota !== 'default') {
+            $quota = OC_Helper::computerFileSize($quota);
+            $quota = OC_Helper::humanFileSize($quota);
+        }
+        $this->config->setUserValue($this->uid, 'files', 'quota', $quota);
+        $this->triggerChange('quota', $quota);
+    }
+
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size) {
+        // delay the initialization
+        if (is_null($this->avatarManager)) {
+            $this->avatarManager = \OC::$server->getAvatarManager();
+        }
+
+        $avatar = $this->avatarManager->getAvatar($this->uid);
+        $image = $avatar->get(-1);
+        if ($image) {
+            return $image;
+        }
+
+        return null;
+    }
+
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId() {
+        $uid = $this->getUID();
+        $server = $this->urlGenerator->getAbsoluteURL('/');
+        $server =  rtrim( $this->removeProtocolFromUrl($server), '/');
+        return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
+    }
+
+    /**
+     * @param string $url
+     * @return string
+     */
+    private function removeProtocolFromUrl($url) {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            return substr($url, strlen('http://'));
+        }
+
+        return $url;
+    }
+
+    public function triggerChange($feature, $value = null, $oldValue = null) {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
 		$this->uid = $uid;
 		$this->backend = $backend;
 		$this->emitter = $emitter;
-		if(is_null($config)) {
+		if (is_null($config)) {
 			$config = \OC::$server->getConfig();
 		}
 		$this->config = $config;
@@ -159,7 +159,7 @@ 
 	 */
 	public function setEMailAddress($mailAddress) {
 		$oldMailAddress = $this->getEMailAddress();
-		if($mailAddress === '') {
+		if ($mailAddress === '') {
 			$this->config->deleteUserValue($this->uid, 'settings', 'email');
 		} else {
 			$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
@@ -226,7 +226,7 @@ 
 			}
 
 			// Delete the users entry in the storage table
-			Storage::remove('home::' . $this->uid);
+			Storage::remove('home::'.$this->uid);
 
 			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
 			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
@@ -274,9 +274,9 @@ 
 			if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$this->uid;
 			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+				$this->home = \OC::$SERVERROOT.'/data/'.$this->uid;
 			}
 		}
 		return $this->home;
@@ -288,7 +288,7 @@ 
 	 * @return string
 	 */
 	public function getBackendClassName() {
-		if($this->backend instanceof IUserBackend) {
+		if ($this->backend instanceof IUserBackend) {
 			return $this->backend->getBackendName();
 		}
 		return get_class($this->backend);
@@ -365,7 +365,7 @@ 
 	 */
 	public function getQuota() {
 		$quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
-		if($quota === 'default') {
+		if ($quota === 'default') {
 			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
 		}
 		return $quota;
@@ -379,7 +379,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setQuota($quota) {
-		if($quota !== 'none' and $quota !== 'default') {
+		if ($quota !== 'none' and $quota !== 'default') {
 			$quota = OC_Helper::computerFileSize($quota);
 			$quota = OC_Helper::humanFileSize($quota);
 		}
@@ -418,7 +418,7 @@ 
 	public function getCloudId() {
 		$uid = $this->getUID();
 		$server = $this->urlGenerator->getAbsoluteURL('/');
-		$server =  rtrim( $this->removeProtocolFromUrl($server), '/');
+		$server = rtrim($this->removeProtocolFromUrl($server), '/');
 		return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
 	}
 

settings/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -26,71 +26,71 @@
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l = $l10n;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'personal_settings';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'personal_settings';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Your <strong>password</strong> or <strong>email</strong> was modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Your <strong>password</strong> or <strong>email</strong> was modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 0;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }

settings/Hooks.php

Indentation +130 added lines, -130 removed lines

@@ -32,134 +32,134 @@
 
 class Hooks {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IActivityManager $activityManager, IUserManager $userManager, IUserSession $userSession, IURLGenerator $urlGenerator, IMailer $mailer, IL10N $l) {
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param string $uid
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 */
-	public function onChangePassword($uid) {
-		$user = $this->userManager->get($uid);
-
-		if (!$user instanceof IUser || $user->getEMailAddress() === null) {
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				$text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				$text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_SELF);
-			}
-		} else {
-			$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::PASSWORD_RESET);
-		}
-
-		$this->activityManager->publish($event);
-
-		if ($user->getEMailAddress() !== null) {
-			$template = $this->mailer->createEMailTemplate();
-			$template->addHeader();
-			$template->addHeading($this->l->t('Password changed for %s', $user->getDisplayName()), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$message->setBody($template->renderText(), 'text/plain');
-			$message->setHtmlBody($template->renderHTML());
-
-			$this->mailer->send($message);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $oldMailAddress
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 */
-	public function onChangeEmail(IUser $user, $oldMailAddress) {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				$text = $this->l->t('%1$s changed your email address on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				$text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::EMAIL_CHANGED_SELF);
-			}
-		} else {
-			$text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::EMAIL_CHANGED);
-		}
-		$this->activityManager->publish($event);
-
-
-		if ($oldMailAddress !== null) {
-			$template = $this->mailer->createEMailTemplate();
-			$template->addHeader();
-			$template->addHeading($this->l->t('Email address changed for %s', $user->getDisplayName()), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			if ($user->getEMailAddress()) {
-				$template->addBodyText($this->l->t('The new email address is %s', $user->getEMailAddress()));
-			}
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$message->setBody($template->renderText(), 'text/plain');
-			$message->setHtmlBody($template->renderHTML());
-
-			$this->mailer->send($message);
-		}
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(IActivityManager $activityManager, IUserManager $userManager, IUserSession $userSession, IURLGenerator $urlGenerator, IMailer $mailer, IL10N $l) {
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+        $this->l = $l;
+    }
+
+    /**
+     * @param string $uid
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     */
+    public function onChangePassword($uid) {
+        $user = $this->userManager->get($uid);
+
+        if (!$user instanceof IUser || $user->getEMailAddress() === null) {
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                $text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                $text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_SELF);
+            }
+        } else {
+            $text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::PASSWORD_RESET);
+        }
+
+        $this->activityManager->publish($event);
+
+        if ($user->getEMailAddress() !== null) {
+            $template = $this->mailer->createEMailTemplate();
+            $template->addHeader();
+            $template->addHeading($this->l->t('Password changed for %s', $user->getDisplayName()), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+            $message->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $message->setBody($template->renderText(), 'text/plain');
+            $message->setHtmlBody($template->renderHTML());
+
+            $this->mailer->send($message);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $oldMailAddress
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     */
+    public function onChangeEmail(IUser $user, $oldMailAddress) {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                $text = $this->l->t('%1$s changed your email address on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                $text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::EMAIL_CHANGED_SELF);
+            }
+        } else {
+            $text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::EMAIL_CHANGED);
+        }
+        $this->activityManager->publish($event);
+
+
+        if ($oldMailAddress !== null) {
+            $template = $this->mailer->createEMailTemplate();
+            $template->addHeader();
+            $template->addHeading($this->l->t('Email address changed for %s', $user->getDisplayName()), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            if ($user->getEMailAddress()) {
+                $template->addBodyText($this->l->t('The new email address is %s', $user->getEMailAddress()));
+            }
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$oldMailAddress => $user->getDisplayName()]);
+            $message->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $message->setBody($template->renderText(), 'text/plain');
+            $message->setHtmlBody($template->renderHTML());
+
+            $this->mailer->send($message);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 			$template = $this->mailer->createEMailTemplate();
 			$template->addHeader();
 			$template->addHeading($this->l->t('Password changed for %s', $user->getDisplayName()), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			$template->addFooter();
 
 
@@ -146,7 +146,7 @@ 
 			$template = $this->mailer->createEMailTemplate();
 			$template->addHeader();
 			$template->addHeading($this->l->t('Email address changed for %s', $user->getDisplayName()), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			if ($user->getEMailAddress()) {
 				$template->addBodyText($this->l->t('The new email address is %s', $user->getEMailAddress()));
 			}

settings/Application.php

Indentation +109 added lines, -109 removed lines

@@ -51,123 +51,123 @@
 class Application extends App {
 
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams=[]){
-		parent::__construct('settings', $urlParams);
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams=[]){
+        parent::__construct('settings', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		// Register Middleware
-		$container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$container->registerMiddleWare('SubadminMiddleware');
+        // Register Middleware
+        $container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $container->registerMiddleWare('SubadminMiddleware');
 
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$container->registerService('isAdmin', function() {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$container->registerService('isSubAdmin', function(IContainer $c) {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$container->registerService('userCertificateManager', function(IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager();
-		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager(null);
-		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->query(IProvider::class);
-		});
-		$container->registerService(IManager::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->getSettingsManager();
-		});
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $container->registerService('isAdmin', function() {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $container->registerService('isSubAdmin', function(IContainer $c) {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $container->registerService('userCertificateManager', function(IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager();
+        }, false);
+        $container->registerService('systemCertificateManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager(null);
+        }, false);
+        $container->registerService(IProvider::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->query(IProvider::class);
+        });
+        $container->registerService(IManager::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->getSettingsManager();
+        });
 
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
+        $container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
 
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10N('settings'),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$container->registerService(AppFetcher::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			return new AppFetcher(
-				$server->getAppDataDir('appstore'),
-				$server->getHTTPClientService(),
-				$server->query(TimeFactory::class),
-				$server->getConfig()
-			);
-		});
-		$container->registerService(CategoryFetcher::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			return new CategoryFetcher(
-				$server->getAppDataDir('appstore'),
-				$server->getHTTPClientService(),
-				$server->query(TimeFactory::class),
-				$server->getConfig()
-			);
-		});
-	}
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10N('settings'),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $container->registerService(AppFetcher::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            return new AppFetcher(
+                $server->getAppDataDir('appstore'),
+                $server->getHTTPClientService(),
+                $server->query(TimeFactory::class),
+                $server->getConfig()
+            );
+        });
+        $container->registerService(CategoryFetcher::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            return new CategoryFetcher(
+                $server->getAppDataDir('appstore'),
+                $server->getHTTPClientService(),
+                $server->query(TimeFactory::class),
+                $server->getConfig()
+            );
+        });
+    }
 
-	public function register() {
-		$activityManager = $this->getContainer()->getServer()->getActivityManager();
-		$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
+    public function register() {
+        $activityManager = $this->getContainer()->getServer()->getActivityManager();
+        $activityManager->registerSetting(Setting::class); // FIXME move to info.xml
+        $activityManager->registerProvider(Provider::class); // FIXME move to info.xml
 
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-	}
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
 
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
 }

lib/private/Server.php

Indentation +1594 added lines, -1594 removed lines

@@ -117,1603 +117,1603 @@
  * TODO: hookup all manager classes
  */
 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;
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
-			return new PreviewManager(
-				$c->getConfig(),
-				$c->getRootFolder(),
-				$c->getAppDataDir('preview'),
-				$c->getEventDispatcher(),
-				$c->getSession()->get('user_id')
-			);
-		});
-		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
-			return new \OC\Preview\Watcher(
-				$c->getAppDataDir('preview')
-			);
-		});
-
-		$this->registerService('EncryptionManager', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\Manager(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\File($util);
-		});
-
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-
-			return new Encryption\Keys\Storage($view, $util);
-		});
-		$this->registerService('TagMapper', function (Server $c) {
-			return new TagMapper($c->getDatabaseConnection());
-		});
-
-		$this->registerService(\OCP\ITagManager::class, function (Server $c) {
-			$tagMapper = $c->query('TagMapper');
-			return new TagManager($tagMapper, $c->getUserSession());
-		});
-		$this->registerAlias('TagManager', \OCP\ITagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
-			/** @var \OC\SystemTag\ManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory;
-		});
-		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getManager();
-		});
-		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
-
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function (Server $c) {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root(
-				$manager,
-				$view,
-				null,
-				$c->getUserMountCache(),
-				$this->getLogger(),
-				$this->getUserManager()
-			);
-			$connector = new HookConnector($root, $view);
-			$connector->viewToNode();
-
-			$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
-
-		$this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
-			return new LazyRoot(function() use ($c) {
-				return $c->query('RootFolder');
-			});
-		});
-		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
-
-		$this->registerService(\OCP\IUserManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\User\Manager($config);
-		});
-		$this->registerAlias('UserManager', \OCP\IUserManager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
-				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
-			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
-				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
-				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			return $groupManager;
-		});
-		$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
-
-		$this->registerService(Store::class, function(Server $c) {
-			$session = $c->getSession();
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$tokenProvider = $c->query('OC\Authentication\Token\IProvider');
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->getLogger();
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
-			$dbConnection = $c->getDatabaseConnection();
-			return new Authentication\Token\DefaultTokenMapper($dbConnection);
-		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
-			$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
-			$crypto = $c->getCrypto();
-			$config = $c->getConfig();
-			$logger = $c->getLogger();
-			$timeFactory = new TimeFactory();
-			return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
-		});
-		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
-
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
-			$manager = $c->getUserManager();
-			$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->getSystemConfig()->getValue('installed', false)) {
-				$defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
-			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function () {
-				\OC_Hook::emit('OC_User', 'logout', array());
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
-			});
-			return $userSession;
-		});
-		$this->registerAlias('UserSession', \OCP\IUserSession::class);
-
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
-			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
-		});
-
-		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
-		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
-
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
-			return new \OC\AllConfig(
-				$c->getSystemConfig()
-			);
-		});
-		$this->registerAlias('AllConfig', \OC\AllConfig::class);
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService('SystemConfig', function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
-			return new \OC\AppConfig($c->getDatabaseConnection());
-		});
-		$this->registerAlias('AppConfig', \OC\AppConfig::class);
-		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
-
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->getConfig(),
-				$c->getRequest(),
-				$c->getUserSession(),
-				\OC::$SERVERROOT
-			);
-		});
-		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
-
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
-			$config = $c->getConfig();
-			$cacheFactory = $c->getMemCacheFactory();
-			return new \OC\URLGenerator(
-				$config,
-				$cacheFactory
-			);
-		});
-		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
-
-		$this->registerService('AppHelper', function ($c) {
-			return new \OC\AppHelper();
-		});
-		$this->registerService('AppFetcher', function ($c) {
-			return new AppFetcher(
-				$this->getAppDataDir('appstore'),
-				$this->getHTTPClientService(),
-				$this->query(TimeFactory::class),
-				$this->getConfig()
-			);
-		});
-		$this->registerService('CategoryFetcher', function ($c) {
-			return new CategoryFetcher(
-				$this->getAppDataDir('appstore'),
-				$this->getHTTPClientService(),
-				$this->query(TimeFactory::class),
-				$this->getConfig()
-			);
-		});
-
-		$this->registerService(\OCP\ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		$this->registerAlias('UserCache', \OCP\ICache::class);
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$config = $c->getConfig();
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-
-			return new \OC\Memcache\Factory('', $c->getLogger(),
-				'\\OC\\Memcache\\ArrayCache',
-				'\\OC\\Memcache\\ArrayCache',
-				'\\OC\\Memcache\\ArrayCache'
-			);
-		});
-		$this->registerAlias('MemCacheFactory', Factory::class);
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			return new RedisFactory($systemConfig);
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->getUserSession(),
-				$c->getConfig(),
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('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(\OCP\IAvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->getUserManager(),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
-
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
-			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
-			$logger = Log::getLogClass($logType);
-			call_user_func(array($logger, 'init'));
-
-			return new Log($logger);
-		});
-		$this->registerAlias('Logger', \OCP\ILogger::class);
-
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\BackgroundJob\JobList(
-				$c->getDatabaseConnection(),
-				$config,
-				new TimeFactory()
-			);
-		});
-		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
-
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
-			$cacheFactory = $c->getMemCacheFactory();
-			$logger = $c->getLogger();
-			if ($cacheFactory->isAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
-			} else {
-				$router = new \OC\Route\Router($logger);
-			}
-			return $router;
-		});
-		$this->registerAlias('Router', \OCP\Route\IRouter::class);
-
-		$this->registerService(\OCP\ISearch::class, function ($c) {
-			return new Search();
-		});
-		$this->registerAlias('Search', \OCP\ISearch::class);
-
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
-			return new SecureRandom();
-		});
-		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
-
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
-			return new Crypto($c->getConfig(), $c->getSecureRandom());
-		});
-		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
-
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
-			return new Hasher($c->getConfig());
-		});
-		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
-
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
-			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
-		});
-		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
-
-		$this->registerService(IDBConnection::class, function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			$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;
-		});
-		$this->registerAlias('DatabaseConnection', IDBConnection::class);
-
-		$this->registerService('HTTPHelper', function (Server $c) {
-			$config = $c->getConfig();
-			return new HTTPHelper(
-				$config,
-				$c->getHTTPClientService()
-			);
-		});
-
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
-			$user = \OC_User::getUser();
-			$uid = $user ? $user : null;
-			return new ClientService(
-				$c->getConfig(),
-				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig(), $c->getLogger())
-			);
-		});
-		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
-
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new EventLogger();
-			} else {
-				return new NullEventLogger();
-			}
-		});
-		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
-
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				return new QueryLogger();
-			} else {
-				return new NullQueryLogger();
-			}
-		});
-		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
-
-		$this->registerService(TempManager::class, function (Server $c) {
-			return new TempManager(
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('TempManager', TempManager::class);
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (Server $c) {
-			return new \OC\App\AppManager(
-				$c->getUserSession(),
-				$c->getAppConfig(),
-				$c->getGroupManager(),
-				$c->getMemCacheFactory(),
-				$c->getEventDispatcher()
-			);
-		});
-		$this->registerAlias('AppManager', AppManager::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
-			return new DateTimeZone(
-				$c->getConfig(),
-				$c->getSession()
-			);
-		});
-		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
-
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->getDateTimeZone()->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
-
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->getUserManager());
-			return $mountCache;
-		});
-		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
-
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
-			$loader = \OC\Files\Filesystem::getLoader();
-			$mountCache = $c->query('UserMountCache');
-			$manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
-
-			// builtin providers
-
-			$config = $c->getConfig();
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-
-			return $manager;
-		});
-		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
-
-		$this->registerService('IniWrapper', function ($c) {
-			return new IniGetWrapper();
-		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
-			$jobList = $c->getJobList();
-			return new AsyncBus($jobList);
-		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
-			return new TrustedDomainHelper($this->getConfig());
-		});
-		$this->registerService('Throttler', function(Server $c) {
-			return new Throttler(
-				$c->getDatabaseConnection(),
-				new TimeFactory(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
-			// IConfig and IAppManager requires a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$config = $c->getConfig();
-				$appManager = $c->getAppManager();
-			} else {
-				$config = null;
-				$appManager = null;
-			}
-
-			return new Checker(
-					new EnvironmentHelper(),
-					new FileAccessHelper(),
-					new AppLocator(),
-					$config,
-					$c->getMemCacheFactory(),
-					$appManager,
-					$c->getTempManager()
-			);
-		});
-		$this->registerService(\OCP\IRequest::class, function ($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']
-						: null,
-					'urlParams' => $urlParams,
-				],
-				$this->getSecureRandom(),
-				$this->getConfig(),
-				$this->getCsrfTokenManager(),
-				$stream
-			);
-		});
-		$this->registerAlias('Request', \OCP\IRequest::class);
-
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->query(Defaults::class),
-				$c->getURLGenerator(),
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
-
-		$this->registerService('LDAPProvider', function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if(is_null($factoryClass)) {
-				throw new \Exception('ldapProviderFactory not set');
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService('LockingProvider', function (Server $c) {
-			$ini = $c->getIniWrapper();
-			$config = $c->getConfig();
-			$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->getMemCacheFactory();
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache, $ttl);
-				}
-				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
-			return new \OC\Files\Mount\Manager();
-		});
-		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
-			return new \OC\Files\Type\Detection(
-				$c->getURLGenerator(),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
-			return new \OC\Files\Type\Loader(
-				$c->getDatabaseConnection()
-			);
-		});
-		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
-
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
-			return new Manager(
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
-
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
-			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
-			});
-			return $manager;
-		});
-		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
-
-		$this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getManager();
-		});
-		$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
-
-		$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;
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerService(\OCP\IPreview::class, function (Server $c) {
+            return new PreviewManager(
+                $c->getConfig(),
+                $c->getRootFolder(),
+                $c->getAppDataDir('preview'),
+                $c->getEventDispatcher(),
+                $c->getSession()->get('user_id')
+            );
+        });
+        $this->registerAlias('PreviewManager', \OCP\IPreview::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+            return new \OC\Preview\Watcher(
+                $c->getAppDataDir('preview')
+            );
+        });
+
+        $this->registerService('EncryptionManager', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\Manager(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\File($util);
+        });
+
+        $this->registerService('EncryptionKeyStorage', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+
+            return new Encryption\Keys\Storage($view, $util);
+        });
+        $this->registerService('TagMapper', function (Server $c) {
+            return new TagMapper($c->getDatabaseConnection());
+        });
+
+        $this->registerService(\OCP\ITagManager::class, function (Server $c) {
+            $tagMapper = $c->query('TagMapper');
+            return new TagManager($tagMapper, $c->getUserSession());
+        });
+        $this->registerAlias('TagManager', \OCP\ITagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
+            /** @var \OC\SystemTag\ManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory;
+        });
+        $this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getManager();
+        });
+        $this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
+
+        $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function (Server $c) {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root(
+                $manager,
+                $view,
+                null,
+                $c->getUserMountCache(),
+                $this->getLogger(),
+                $this->getUserManager()
+            );
+            $connector = new HookConnector($root, $view);
+            $connector->viewToNode();
+
+            $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
+
+        $this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
+            return new LazyRoot(function() use ($c) {
+                return $c->query('RootFolder');
+            });
+        });
+        $this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
+
+        $this->registerService(\OCP\IUserManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\User\Manager($config);
+        });
+        $this->registerAlias('UserManager', \OCP\IUserManager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+                \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
+            });
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+                \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+                //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
+                \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            return $groupManager;
+        });
+        $this->registerAlias('GroupManager', \OCP\IGroupManager::class);
+
+        $this->registerService(Store::class, function(Server $c) {
+            $session = $c->getSession();
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $tokenProvider = $c->query('OC\Authentication\Token\IProvider');
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->getLogger();
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
+            $dbConnection = $c->getDatabaseConnection();
+            return new Authentication\Token\DefaultTokenMapper($dbConnection);
+        });
+        $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
+            $mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
+            $crypto = $c->getCrypto();
+            $config = $c->getConfig();
+            $logger = $c->getLogger();
+            $timeFactory = new TimeFactory();
+            return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
+        });
+        $this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
+
+        $this->registerService(\OCP\IUserSession::class, function (Server $c) {
+            $manager = $c->getUserManager();
+            $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->getSystemConfig()->getValue('installed', false)) {
+                $defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+            });
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function () {
+                \OC_Hook::emit('OC_User', 'logout', array());
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
+            });
+            return $userSession;
+        });
+        $this->registerAlias('UserSession', \OCP\IUserSession::class);
+
+        $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+            return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
+        });
+
+        $this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
+        $this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
+
+        $this->registerService(\OC\AllConfig::class, function (Server $c) {
+            return new \OC\AllConfig(
+                $c->getSystemConfig()
+            );
+        });
+        $this->registerAlias('AllConfig', \OC\AllConfig::class);
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService('SystemConfig', function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerService(\OC\AppConfig::class, function (Server $c) {
+            return new \OC\AppConfig($c->getDatabaseConnection());
+        });
+        $this->registerAlias('AppConfig', \OC\AppConfig::class);
+        $this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
+
+        $this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->getConfig(),
+                $c->getRequest(),
+                $c->getUserSession(),
+                \OC::$SERVERROOT
+            );
+        });
+        $this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
+
+        $this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+            $config = $c->getConfig();
+            $cacheFactory = $c->getMemCacheFactory();
+            return new \OC\URLGenerator(
+                $config,
+                $cacheFactory
+            );
+        });
+        $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
+
+        $this->registerService('AppHelper', function ($c) {
+            return new \OC\AppHelper();
+        });
+        $this->registerService('AppFetcher', function ($c) {
+            return new AppFetcher(
+                $this->getAppDataDir('appstore'),
+                $this->getHTTPClientService(),
+                $this->query(TimeFactory::class),
+                $this->getConfig()
+            );
+        });
+        $this->registerService('CategoryFetcher', function ($c) {
+            return new CategoryFetcher(
+                $this->getAppDataDir('appstore'),
+                $this->getHTTPClientService(),
+                $this->query(TimeFactory::class),
+                $this->getConfig()
+            );
+        });
+
+        $this->registerService(\OCP\ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        $this->registerAlias('UserCache', \OCP\ICache::class);
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $config = $c->getConfig();
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+
+            return new \OC\Memcache\Factory('', $c->getLogger(),
+                '\\OC\\Memcache\\ArrayCache',
+                '\\OC\\Memcache\\ArrayCache',
+                '\\OC\\Memcache\\ArrayCache'
+            );
+        });
+        $this->registerAlias('MemCacheFactory', Factory::class);
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            return new RedisFactory($systemConfig);
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->getUserSession(),
+                $c->getConfig(),
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('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(\OCP\IAvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->getUserManager(),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
+
+        $this->registerService(\OCP\ILogger::class, function (Server $c) {
+            $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
+            $logger = Log::getLogClass($logType);
+            call_user_func(array($logger, 'init'));
+
+            return new Log($logger);
+        });
+        $this->registerAlias('Logger', \OCP\ILogger::class);
+
+        $this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\BackgroundJob\JobList(
+                $c->getDatabaseConnection(),
+                $config,
+                new TimeFactory()
+            );
+        });
+        $this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
+
+        $this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
+            $cacheFactory = $c->getMemCacheFactory();
+            $logger = $c->getLogger();
+            if ($cacheFactory->isAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
+            } else {
+                $router = new \OC\Route\Router($logger);
+            }
+            return $router;
+        });
+        $this->registerAlias('Router', \OCP\Route\IRouter::class);
+
+        $this->registerService(\OCP\ISearch::class, function ($c) {
+            return new Search();
+        });
+        $this->registerAlias('Search', \OCP\ISearch::class);
+
+        $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+            return new SecureRandom();
+        });
+        $this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
+
+        $this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+            return new Crypto($c->getConfig(), $c->getSecureRandom());
+        });
+        $this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
+
+        $this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+            return new Hasher($c->getConfig());
+        });
+        $this->registerAlias('Hasher', \OCP\Security\IHasher::class);
+
+        $this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+            return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
+        });
+        $this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
+
+        $this->registerService(IDBConnection::class, function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            $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;
+        });
+        $this->registerAlias('DatabaseConnection', IDBConnection::class);
+
+        $this->registerService('HTTPHelper', function (Server $c) {
+            $config = $c->getConfig();
+            return new HTTPHelper(
+                $config,
+                $c->getHTTPClientService()
+            );
+        });
+
+        $this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
+            $user = \OC_User::getUser();
+            $uid = $user ? $user : null;
+            return new ClientService(
+                $c->getConfig(),
+                new \OC\Security\CertificateManager($uid, new View(), $c->getConfig(), $c->getLogger())
+            );
+        });
+        $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
+
+        $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new EventLogger();
+            } else {
+                return new NullEventLogger();
+            }
+        });
+        $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
+
+        $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                return new QueryLogger();
+            } else {
+                return new NullQueryLogger();
+            }
+        });
+        $this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
+
+        $this->registerService(TempManager::class, function (Server $c) {
+            return new TempManager(
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('TempManager', TempManager::class);
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (Server $c) {
+            return new \OC\App\AppManager(
+                $c->getUserSession(),
+                $c->getAppConfig(),
+                $c->getGroupManager(),
+                $c->getMemCacheFactory(),
+                $c->getEventDispatcher()
+            );
+        });
+        $this->registerAlias('AppManager', AppManager::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+            return new DateTimeZone(
+                $c->getConfig(),
+                $c->getSession()
+            );
+        });
+        $this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
+
+        $this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->getDateTimeZone()->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+        $this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
+
+        $this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->getUserManager());
+            return $mountCache;
+        });
+        $this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
+
+        $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
+            $loader = \OC\Files\Filesystem::getLoader();
+            $mountCache = $c->query('UserMountCache');
+            $manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+
+            // builtin providers
+
+            $config = $c->getConfig();
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+
+            return $manager;
+        });
+        $this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
+
+        $this->registerService('IniWrapper', function ($c) {
+            return new IniGetWrapper();
+        });
+        $this->registerService('AsyncCommandBus', function (Server $c) {
+            $jobList = $c->getJobList();
+            return new AsyncBus($jobList);
+        });
+        $this->registerService('TrustedDomainHelper', function ($c) {
+            return new TrustedDomainHelper($this->getConfig());
+        });
+        $this->registerService('Throttler', function(Server $c) {
+            return new Throttler(
+                $c->getDatabaseConnection(),
+                new TimeFactory(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerService('IntegrityCodeChecker', function (Server $c) {
+            // IConfig and IAppManager requires a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $config = $c->getConfig();
+                $appManager = $c->getAppManager();
+            } else {
+                $config = null;
+                $appManager = null;
+            }
+
+            return new Checker(
+                    new EnvironmentHelper(),
+                    new FileAccessHelper(),
+                    new AppLocator(),
+                    $config,
+                    $c->getMemCacheFactory(),
+                    $appManager,
+                    $c->getTempManager()
+            );
+        });
+        $this->registerService(\OCP\IRequest::class, function ($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']
+                        : null,
+                    'urlParams' => $urlParams,
+                ],
+                $this->getSecureRandom(),
+                $this->getConfig(),
+                $this->getCsrfTokenManager(),
+                $stream
+            );
+        });
+        $this->registerAlias('Request', \OCP\IRequest::class);
+
+        $this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->query(Defaults::class),
+                $c->getURLGenerator(),
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
+
+        $this->registerService('LDAPProvider', function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if(is_null($factoryClass)) {
+                throw new \Exception('ldapProviderFactory not set');
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService('LockingProvider', function (Server $c) {
+            $ini = $c->getIniWrapper();
+            $config = $c->getConfig();
+            $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->getMemCacheFactory();
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    return new MemcacheLockingProvider($memcache, $ttl);
+                }
+                return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
+            return new \OC\Files\Mount\Manager();
+        });
+        $this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+            return new \OC\Files\Type\Detection(
+                $c->getURLGenerator(),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        $this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+            return new \OC\Files\Type\Loader(
+                $c->getDatabaseConnection()
+            );
+        });
+        $this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
+
+        $this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+            return new Manager(
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
+
+        $this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+            $manager = new \OC\CapabilitiesManager($c->getLogger());
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
+            });
+            return $manager;
+        });
+        $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
+
+        $this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getManager();
+        });
+        $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
+
+        $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->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
-				return new ThemingDefaults(
-					$c->getConfig(),
-					$c->getL10N('theming'),
-					$c->getURLGenerator(),
-					new \OC_Defaults(),
-					$c->getAppDataDir('theming'),
-					$c->getMemCacheFactory()
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(EventDispatcher::class, function () {
-			return new EventDispatcher();
-		});
-		$this->registerAlias('EventDispatcher', EventDispatcher::class);
-		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (Server $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->getSecureRandom(),
-				$c->getConfig()
-			);
-
-			return new CryptoWrapper(
-				$c->getConfig(),
-				$c->getCrypto(),
-				$c->getSecureRandom(),
-				$request
-			);
-		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
-			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
-
-			return new CsrfTokenManager(
-				$tokenGenerator,
-				$c->query(SessionStorage::class)
-			);
-		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
-			return new SessionStorage($c->getSession());
-		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
-			return new ContentSecurityPolicyManager();
-		});
-		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
-
-		$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
-			return new ContentSecurityPolicyNonceManager(
-				$c->getCsrfTokenManager(),
-				$c->getRequest()
-			);
-		});
-
-		$this->registerService(\OCP\Share\IManager::class, function(Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
-			/** @var \OCP\Share\IProviderFactory $factory */
-			$factory = new $factoryClass($this);
-
-			$manager = new \OC\Share20\Manager(
-				$c->getLogger(),
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getHasher(),
-				$c->getMountManager(),
-				$c->getGroupManager(),
-				$c->getL10N('core'),
-				$factory,
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getEventDispatcher()
-			);
-
-			return $manager;
-		});
-		$this->registerAlias('ShareManager', \OCP\Share\IManager::class);
-
-		$this->registerService('SettingsManager', function(Server $c) {
-			$manager = new \OC\Settings\Manager(
-				$c->getLogger(),
-				$c->getDatabaseConnection(),
-				$c->getL10N('lib'),
-				$c->getConfig(),
-				$c->getEncryptionManager(),
-				$c->getUserManager(),
-				$c->getLockingProvider(),
-				$c->getRequest(),
-				new \OC\Settings\Mapper($c->getDatabaseConnection()),
-				$c->getURLGenerator()
-			);
-			return $manager;
-		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->getRootFolder(),
-				$c->getSystemConfig()
-			);
-		});
-
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager(function() use ($c) {
-				return $c->getSession();
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
-			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
-		});
-
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
-			return new CloudIdManager();
-		});
-
-		/* To trick DI since we don't extend the DIContainer here */
-		$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
-			return new CleanPreviewsBackgroundJob(
-				$c->getRootFolder(),
-				$c->getLogger(),
-				$c->getJobList(),
-				new TimeFactory()
-			);
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->getThemingDefaults()
-			);
-		});
-		$this->registerAlias('Defaults', \OCP\Defaults::class);
-
-		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
-			return $c->query(\OCP\IUserSession::class)->getSession();
-		});
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 */
-	public function getContactsManager() {
-		return $this->query('ContactsManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 */
-	public function getEncryptionManager() {
-		return $this->query('EncryptionManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->query('EncryptionFileHelper');
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->query('EncryptionKeyStorage');
-	}
-
-	/**
-	 * 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
-	 */
-	public function getRequest() {
-		return $this->query('Request');
-	}
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return \OCP\IPreview
-	 */
-	public function getPreviewManager() {
-		return $this->query('PreviewManager');
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return \OCP\ITagManager
-	 */
-	public function getTagManager() {
-		return $this->query('TagManager');
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return \OCP\SystemTag\ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagManager() {
-		return $this->query('SystemTagManager');
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return \OCP\SystemTag\ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->query('SystemTagObjectMapper');
-	}
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return \OCP\IAvatarManager
-	 */
-	public function getAvatarManager() {
-		return $this->query('AvatarManager');
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 */
-	public function getRootFolder() {
-		return $this->query('LazyRootFolder');
-	}
-
-	/**
-	 * 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 \OCP\Files\IRootFolder
-	 */
-	public function getLazyRootFolder() {
-		return $this->query('LazyRootFolder');
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->getUserSession()->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->getRootFolder();
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * Returns an app-specific view in ownClouds data directory
-	 *
-	 * @return \OCP\Files\Folder
-	 * @deprecated since 9.2.0 use IAppData
-	 */
-	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
-		$root = $this->getRootFolder();
-		if (!$root->nodeExists($dir)) {
-			$folder = $root->newFolder($dir);
-		} else {
-			$folder = $root->get($dir);
-		}
-		return $folder;
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 */
-	public function getUserManager() {
-		return $this->query('UserManager');
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 */
-	public function getGroupManager() {
-		return $this->query('GroupManager');
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 */
-	public function getUserSession() {
-		return $this->query('UserSession');
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 */
-	public function getSession() {
-		return $this->query('UserSession')->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->query(SessionStorage::class)->setSession($session);
-		$this->query('UserSession')->setSession($session);
-		$this->query(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 */
-	public function getNavigationManager() {
-		return $this->query('NavigationManager');
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 */
-	public function getConfig() {
-		return $this->query('AllConfig');
-	}
-
-	/**
-	 * @internal For internal use only
-	 * @return \OC\SystemConfig
-	 */
-	public function getSystemConfig() {
-		return $this->query('SystemConfig');
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return \OCP\IAppConfig
-	 */
-	public function getAppConfig() {
-		return $this->query('AppConfig');
-	}
-
-	/**
-	 * @return \OCP\L10N\IFactory
-	 */
-	public function getL10NFactory() {
-		return $this->query('L10NFactory');
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->getL10NFactory()->get($app, $lang);
-	}
-
-	/**
-	 * @return \OCP\IURLGenerator
-	 */
-	public function getURLGenerator() {
-		return $this->query('URLGenerator');
-	}
-
-	/**
-	 * @return \OCP\IHelper
-	 */
-	public function getHelper() {
-		return $this->query('AppHelper');
-	}
-
-	/**
-	 * @return AppFetcher
-	 */
-	public function getAppFetcher() {
-		return $this->query('AppFetcher');
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return \OCP\ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->query('UserCache');
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 */
-	public function getMemCacheFactory() {
-		return $this->query('MemCacheFactory');
-	}
-
-	/**
-	 * Returns an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 */
-	public function getGetRedisFactory() {
-		return $this->query('RedisFactory');
-	}
-
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getDatabaseConnection() {
-		return $this->query('DatabaseConnection');
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 */
-	public function getActivityManager() {
-		return $this->query('ActivityManager');
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return \OCP\BackgroundJob\IJobList
-	 */
-	public function getJobList() {
-		return $this->query('JobList');
-	}
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return \OCP\ILogger
-	 */
-	public function getLogger() {
-		return $this->query('Logger');
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return \OCP\Route\IRouter
-	 */
-	public function getRouter() {
-		return $this->query('Router');
-	}
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return \OCP\ISearch
-	 */
-	public function getSearch() {
-		return $this->query('Search');
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 */
-	public function getSecureRandom() {
-		return $this->query('SecureRandom');
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return \OCP\Security\ICrypto
-	 */
-	public function getCrypto() {
-		return $this->query('Crypto');
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return \OCP\Security\IHasher
-	 */
-	public function getHasher() {
-		return $this->query('Hasher');
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return \OCP\Security\ICredentialsManager
-	 */
-	public function getCredentialsManager() {
-		return $this->query('CredentialsManager');
-	}
-
-	/**
-	 * Returns an instance of the HTTP helper class
-	 *
-	 * @deprecated Use getHTTPClientService()
-	 * @return \OC\HTTPHelper
-	 */
-	public function getHTTPHelper() {
-		return $this->query('HTTPHelper');
-	}
-
-	/**
-	 * Get the certificate manager for the user
-	 *
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
-	 */
-	public function getCertificateManager($userId = '') {
-		if ($userId === '') {
-			$userSession = $this->getUserSession();
-			$user = $userSession->getUser();
-			if (is_null($user)) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		return new CertificateManager($userId, new View(), $this->getConfig(), $this->getLogger());
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return \OCP\Http\Client\IClientService
-	 */
-	public function getHTTPClientService() {
-		return $this->query('HttpClientService');
-	}
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 */
-	public function createEventSource() {
-		return new \OC_EventSource();
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IEventLogger
-	 */
-	public function getEventLogger() {
-		return $this->query('EventLogger');
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IQueryLogger
-	 */
-	public function getQueryLogger() {
-		return $this->query('QueryLogger');
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 */
-	public function getTempManager() {
-		return $this->query('TempManager');
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 */
-	public function getAppManager() {
-		return $this->query('AppManager');
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return \OCP\Mail\IMailer
-	 */
-	public function getMailer() {
-		return $this->query('Mailer');
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 */
-	public function getOcsClient() {
-		return $this->query('OcsClient');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeZone
-	 */
-	public function getDateTimeZone() {
-		return $this->query('DateTimeZone');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeFormatter
-	 */
-	public function getDateTimeFormatter() {
-		return $this->query('DateTimeFormatter');
-	}
-
-	/**
-	 * @return \OCP\Files\Config\IMountProviderCollection
-	 */
-	public function getMountProviderCollection() {
-		return $this->query('MountConfigManager');
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 */
-	public function getIniWrapper() {
-		return $this->query('IniWrapper');
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 */
-	public function getCommandBus() {
-		return $this->query('AsyncCommandBus');
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->query('TrustedDomainHelper');
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return \OCP\Lock\ILockingProvider
-	 * @since 8.1.0
-	 */
-	public function getLockingProvider() {
-		return $this->query('LockingProvider');
-	}
-
-	/**
-	 * @return \OCP\Files\Mount\IMountManager
-	 **/
-	function getMountManager() {
-		return $this->query('MountManager');
-	}
-
-	/** @return \OCP\Files\Config\IUserMountCache */
-	function getUserMountCache() {
-		return $this->query('UserMountCache');
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return \OCP\Files\IMimeTypeDetector
-	 */
-	public function getMimeTypeDetector() {
-		return $this->query('MimeTypeDetector');
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return \OCP\Files\IMimeTypeLoader
-	 */
-	public function getMimeTypeLoader() {
-		return $this->query('MimeTypeLoader');
-	}
-
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return \OC\CapabilitiesManager
-	 */
-	public function getCapabilitiesManager() {
-		return $this->query('CapabilitiesManager');
-	}
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 */
-	public function getEventDispatcher() {
-		return $this->query('EventDispatcher');
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 */
-	public function getNotificationManager() {
-		return $this->query('NotificationManager');
-	}
-
-	/**
-	 * @return \OCP\Comments\ICommentsManager
-	 */
-	public function getCommentsManager() {
-		return $this->query('CommentsManager');
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 */
-	public function getThemingDefaults() {
-		return $this->query('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->query('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return \OC\Session\CryptoWrapper
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->query('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 */
-	public function getCsrfTokenManager() {
-		return $this->query('CsrfTokenManager');
-	}
-
-	/**
-	 * @return Throttler
-	 */
-	public function getBruteForceThrottler() {
-		return $this->query('Throttler');
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->query('ContentSecurityPolicyManager');
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->query('ContentSecurityPolicyNonceManager');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 */
-	public function getStoragesBackendService() {
-		return $this->query('OCA\\Files_External\\Service\\BackendService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 */
-	public function getGlobalStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 */
-	public function getUserGlobalStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 */
-	public function getUserStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 */
-	public function getShareManager() {
-		return $this->query('ShareManager');
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 */
-	public function getLDAPProvider() {
-		return $this->query('LDAPProvider');
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 */
-	public function getSettingsManager() {
-		return $this->query('SettingsManager');
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->query(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Lockdown\ILockdownManager
-	 */
-	public function getLockdownManager() {
-		return $this->query('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 */
-	public function getCloudIdManager() {
-		return $this->query(ICloudIdManager::class);
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
+                return new ThemingDefaults(
+                    $c->getConfig(),
+                    $c->getL10N('theming'),
+                    $c->getURLGenerator(),
+                    new \OC_Defaults(),
+                    $c->getAppDataDir('theming'),
+                    $c->getMemCacheFactory()
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(EventDispatcher::class, function () {
+            return new EventDispatcher();
+        });
+        $this->registerAlias('EventDispatcher', EventDispatcher::class);
+        $this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (Server $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->getSecureRandom(),
+                $c->getConfig()
+            );
+
+            return new CryptoWrapper(
+                $c->getConfig(),
+                $c->getCrypto(),
+                $c->getSecureRandom(),
+                $request
+            );
+        });
+        $this->registerService('CsrfTokenManager', function (Server $c) {
+            $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
+
+            return new CsrfTokenManager(
+                $tokenGenerator,
+                $c->query(SessionStorage::class)
+            );
+        });
+        $this->registerService(SessionStorage::class, function (Server $c) {
+            return new SessionStorage($c->getSession());
+        });
+        $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+            return new ContentSecurityPolicyManager();
+        });
+        $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
+
+        $this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
+            return new ContentSecurityPolicyNonceManager(
+                $c->getCsrfTokenManager(),
+                $c->getRequest()
+            );
+        });
+
+        $this->registerService(\OCP\Share\IManager::class, function(Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
+            /** @var \OCP\Share\IProviderFactory $factory */
+            $factory = new $factoryClass($this);
+
+            $manager = new \OC\Share20\Manager(
+                $c->getLogger(),
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getHasher(),
+                $c->getMountManager(),
+                $c->getGroupManager(),
+                $c->getL10N('core'),
+                $factory,
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getEventDispatcher()
+            );
+
+            return $manager;
+        });
+        $this->registerAlias('ShareManager', \OCP\Share\IManager::class);
+
+        $this->registerService('SettingsManager', function(Server $c) {
+            $manager = new \OC\Settings\Manager(
+                $c->getLogger(),
+                $c->getDatabaseConnection(),
+                $c->getL10N('lib'),
+                $c->getConfig(),
+                $c->getEncryptionManager(),
+                $c->getUserManager(),
+                $c->getLockingProvider(),
+                $c->getRequest(),
+                new \OC\Settings\Mapper($c->getDatabaseConnection()),
+                $c->getURLGenerator()
+            );
+            return $manager;
+        });
+        $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->getRootFolder(),
+                $c->getSystemConfig()
+            );
+        });
+
+        $this->registerService('LockdownManager', function (Server $c) {
+            return new LockdownManager(function() use ($c) {
+                return $c->getSession();
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+            return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
+        });
+
+        $this->registerService(ICloudIdManager::class, function (Server $c) {
+            return new CloudIdManager();
+        });
+
+        /* To trick DI since we don't extend the DIContainer here */
+        $this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
+            return new CleanPreviewsBackgroundJob(
+                $c->getRootFolder(),
+                $c->getLogger(),
+                $c->getJobList(),
+                new TimeFactory()
+            );
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->getThemingDefaults()
+            );
+        });
+        $this->registerAlias('Defaults', \OCP\Defaults::class);
+
+        $this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
+            return $c->query(\OCP\IUserSession::class)->getSession();
+        });
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     */
+    public function getContactsManager() {
+        return $this->query('ContactsManager');
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     */
+    public function getEncryptionManager() {
+        return $this->query('EncryptionManager');
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->query('EncryptionFileHelper');
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->query('EncryptionKeyStorage');
+    }
+
+    /**
+     * 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
+     */
+    public function getRequest() {
+        return $this->query('Request');
+    }
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return \OCP\IPreview
+     */
+    public function getPreviewManager() {
+        return $this->query('PreviewManager');
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return \OCP\ITagManager
+     */
+    public function getTagManager() {
+        return $this->query('TagManager');
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return \OCP\SystemTag\ISystemTagManager
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagManager() {
+        return $this->query('SystemTagManager');
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return \OCP\SystemTag\ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->query('SystemTagObjectMapper');
+    }
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return \OCP\IAvatarManager
+     */
+    public function getAvatarManager() {
+        return $this->query('AvatarManager');
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return \OCP\Files\IRootFolder
+     */
+    public function getRootFolder() {
+        return $this->query('LazyRootFolder');
+    }
+
+    /**
+     * 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 \OCP\Files\IRootFolder
+     */
+    public function getLazyRootFolder() {
+        return $this->query('LazyRootFolder');
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->getUserSession()->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->getRootFolder();
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * Returns an app-specific view in ownClouds data directory
+     *
+     * @return \OCP\Files\Folder
+     * @deprecated since 9.2.0 use IAppData
+     */
+    public function getAppFolder() {
+        $dir = '/' . \OC_App::getCurrentApp();
+        $root = $this->getRootFolder();
+        if (!$root->nodeExists($dir)) {
+            $folder = $root->newFolder($dir);
+        } else {
+            $folder = $root->get($dir);
+        }
+        return $folder;
+    }
+
+    /**
+     * @return \OC\User\Manager
+     */
+    public function getUserManager() {
+        return $this->query('UserManager');
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     */
+    public function getGroupManager() {
+        return $this->query('GroupManager');
+    }
+
+    /**
+     * @return \OC\User\Session
+     */
+    public function getUserSession() {
+        return $this->query('UserSession');
+    }
+
+    /**
+     * @return \OCP\ISession
+     */
+    public function getSession() {
+        return $this->query('UserSession')->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->query(SessionStorage::class)->setSession($session);
+        $this->query('UserSession')->setSession($session);
+        $this->query(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OC\Authentication\TwoFactorAuth\Manager
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     */
+    public function getNavigationManager() {
+        return $this->query('NavigationManager');
+    }
+
+    /**
+     * @return \OCP\IConfig
+     */
+    public function getConfig() {
+        return $this->query('AllConfig');
+    }
+
+    /**
+     * @internal For internal use only
+     * @return \OC\SystemConfig
+     */
+    public function getSystemConfig() {
+        return $this->query('SystemConfig');
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return \OCP\IAppConfig
+     */
+    public function getAppConfig() {
+        return $this->query('AppConfig');
+    }
+
+    /**
+     * @return \OCP\L10N\IFactory
+     */
+    public function getL10NFactory() {
+        return $this->query('L10NFactory');
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->getL10NFactory()->get($app, $lang);
+    }
+
+    /**
+     * @return \OCP\IURLGenerator
+     */
+    public function getURLGenerator() {
+        return $this->query('URLGenerator');
+    }
+
+    /**
+     * @return \OCP\IHelper
+     */
+    public function getHelper() {
+        return $this->query('AppHelper');
+    }
+
+    /**
+     * @return AppFetcher
+     */
+    public function getAppFetcher() {
+        return $this->query('AppFetcher');
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return \OCP\ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->query('UserCache');
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     */
+    public function getMemCacheFactory() {
+        return $this->query('MemCacheFactory');
+    }
+
+    /**
+     * Returns an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     */
+    public function getGetRedisFactory() {
+        return $this->query('RedisFactory');
+    }
+
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getDatabaseConnection() {
+        return $this->query('DatabaseConnection');
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     */
+    public function getActivityManager() {
+        return $this->query('ActivityManager');
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return \OCP\BackgroundJob\IJobList
+     */
+    public function getJobList() {
+        return $this->query('JobList');
+    }
+
+    /**
+     * Returns a logger instance
+     *
+     * @return \OCP\ILogger
+     */
+    public function getLogger() {
+        return $this->query('Logger');
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return \OCP\Route\IRouter
+     */
+    public function getRouter() {
+        return $this->query('Router');
+    }
+
+    /**
+     * Returns a search instance
+     *
+     * @return \OCP\ISearch
+     */
+    public function getSearch() {
+        return $this->query('Search');
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     */
+    public function getSecureRandom() {
+        return $this->query('SecureRandom');
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return \OCP\Security\ICrypto
+     */
+    public function getCrypto() {
+        return $this->query('Crypto');
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return \OCP\Security\IHasher
+     */
+    public function getHasher() {
+        return $this->query('Hasher');
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return \OCP\Security\ICredentialsManager
+     */
+    public function getCredentialsManager() {
+        return $this->query('CredentialsManager');
+    }
+
+    /**
+     * Returns an instance of the HTTP helper class
+     *
+     * @deprecated Use getHTTPClientService()
+     * @return \OC\HTTPHelper
+     */
+    public function getHTTPHelper() {
+        return $this->query('HTTPHelper');
+    }
+
+    /**
+     * Get the certificate manager for the user
+     *
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
+     * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+     */
+    public function getCertificateManager($userId = '') {
+        if ($userId === '') {
+            $userSession = $this->getUserSession();
+            $user = $userSession->getUser();
+            if (is_null($user)) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        return new CertificateManager($userId, new View(), $this->getConfig(), $this->getLogger());
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return \OCP\Http\Client\IClientService
+     */
+    public function getHTTPClientService() {
+        return $this->query('HttpClientService');
+    }
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     */
+    public function createEventSource() {
+        return new \OC_EventSource();
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IEventLogger
+     */
+    public function getEventLogger() {
+        return $this->query('EventLogger');
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IQueryLogger
+     */
+    public function getQueryLogger() {
+        return $this->query('QueryLogger');
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     */
+    public function getTempManager() {
+        return $this->query('TempManager');
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     */
+    public function getAppManager() {
+        return $this->query('AppManager');
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return \OCP\Mail\IMailer
+     */
+    public function getMailer() {
+        return $this->query('Mailer');
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     */
+    public function getOcsClient() {
+        return $this->query('OcsClient');
+    }
+
+    /**
+     * @return \OCP\IDateTimeZone
+     */
+    public function getDateTimeZone() {
+        return $this->query('DateTimeZone');
+    }
+
+    /**
+     * @return \OCP\IDateTimeFormatter
+     */
+    public function getDateTimeFormatter() {
+        return $this->query('DateTimeFormatter');
+    }
+
+    /**
+     * @return \OCP\Files\Config\IMountProviderCollection
+     */
+    public function getMountProviderCollection() {
+        return $this->query('MountConfigManager');
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     */
+    public function getIniWrapper() {
+        return $this->query('IniWrapper');
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     */
+    public function getCommandBus() {
+        return $this->query('AsyncCommandBus');
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     */
+    public function getTrustedDomainHelper() {
+        return $this->query('TrustedDomainHelper');
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return \OCP\Lock\ILockingProvider
+     * @since 8.1.0
+     */
+    public function getLockingProvider() {
+        return $this->query('LockingProvider');
+    }
+
+    /**
+     * @return \OCP\Files\Mount\IMountManager
+     **/
+    function getMountManager() {
+        return $this->query('MountManager');
+    }
+
+    /** @return \OCP\Files\Config\IUserMountCache */
+    function getUserMountCache() {
+        return $this->query('UserMountCache');
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return \OCP\Files\IMimeTypeDetector
+     */
+    public function getMimeTypeDetector() {
+        return $this->query('MimeTypeDetector');
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return \OCP\Files\IMimeTypeLoader
+     */
+    public function getMimeTypeLoader() {
+        return $this->query('MimeTypeLoader');
+    }
+
+    /**
+     * Get the manager of all the capabilities
+     *
+     * @return \OC\CapabilitiesManager
+     */
+    public function getCapabilitiesManager() {
+        return $this->query('CapabilitiesManager');
+    }
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     */
+    public function getEventDispatcher() {
+        return $this->query('EventDispatcher');
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     */
+    public function getNotificationManager() {
+        return $this->query('NotificationManager');
+    }
+
+    /**
+     * @return \OCP\Comments\ICommentsManager
+     */
+    public function getCommentsManager() {
+        return $this->query('CommentsManager');
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     */
+    public function getThemingDefaults() {
+        return $this->query('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->query('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return \OC\Session\CryptoWrapper
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->query('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     */
+    public function getCsrfTokenManager() {
+        return $this->query('CsrfTokenManager');
+    }
+
+    /**
+     * @return Throttler
+     */
+    public function getBruteForceThrottler() {
+        return $this->query('Throttler');
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->query('ContentSecurityPolicyManager');
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->query('ContentSecurityPolicyNonceManager');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     */
+    public function getStoragesBackendService() {
+        return $this->query('OCA\\Files_External\\Service\\BackendService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     */
+    public function getGlobalStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     */
+    public function getUserGlobalStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     */
+    public function getUserStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     */
+    public function getShareManager() {
+        return $this->query('ShareManager');
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     */
+    public function getLDAPProvider() {
+        return $this->query('LDAPProvider');
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     */
+    public function getSettingsManager() {
+        return $this->query('SettingsManager');
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->query(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Lockdown\ILockdownManager
+     */
+    public function getLockdownManager() {
+        return $this->query('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     */
+    public function getCloudIdManager() {
+        return $this->query(ICloudIdManager::class);
+    }
 }

Spacing +97 added lines, -97 removed lines

@@ -131,7 +131,7 @@ 
 		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
 		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
 
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
+		$this->registerService(\OCP\IPreview::class, function(Server $c) {
 			return new PreviewManager(
 				$c->getConfig(),
 				$c->getRootFolder(),
@@ -142,13 +142,13 @@ 
 		});
 		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(Server $c) {
 			return new \OC\Preview\Watcher(
 				$c->getAppDataDir('preview')
 			);
 		});
 
-		$this->registerService('EncryptionManager', function (Server $c) {
+		$this->registerService('EncryptionManager', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -166,7 +166,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -176,7 +176,7 @@ 
 			return new Encryption\File($util);
 		});
 
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
+		$this->registerService('EncryptionKeyStorage', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -187,32 +187,32 @@ 
 
 			return new Encryption\Keys\Storage($view, $util);
 		});
-		$this->registerService('TagMapper', function (Server $c) {
+		$this->registerService('TagMapper', function(Server $c) {
 			return new TagMapper($c->getDatabaseConnection());
 		});
 
-		$this->registerService(\OCP\ITagManager::class, function (Server $c) {
+		$this->registerService(\OCP\ITagManager::class, function(Server $c) {
 			$tagMapper = $c->query('TagMapper');
 			return new TagManager($tagMapper, $c->getUserSession());
 		});
 		$this->registerAlias('TagManager', \OCP\ITagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
+		$this->registerService('SystemTagManagerFactory', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
 			/** @var \OC\SystemTag\ManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			return $factory;
 		});
-		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getManager();
 		});
 		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
 
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (Server $c) {
+		$this->registerService('RootFolder', function(Server $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -240,30 +240,30 @@ 
 		});
 		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
 
-		$this->registerService(\OCP\IUserManager::class, function (Server $c) {
+		$this->registerService(\OCP\IUserManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\User\Manager($config);
 		});
 		$this->registerAlias('UserManager', \OCP\IUserManager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $gid) {
 				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
 			});
-			$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) {
 				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
 			});
-			$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) {
 				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
 				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
 				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
@@ -283,11 +283,11 @@ 
 			return new Store($session, $logger, $tokenProvider);
 		});
 		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
+		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function(Server $c) {
 			$dbConnection = $c->getDatabaseConnection();
 			return new Authentication\Token\DefaultTokenMapper($dbConnection);
 		});
-		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
+		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function(Server $c) {
 			$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
 			$crypto = $c->getCrypto();
 			$config = $c->getConfig();
@@ -297,7 +297,7 @@ 
 		});
 		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
 
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
+		$this->registerService(\OCP\IUserSession::class, function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -310,40 +310,40 @@ 
 			}
 
 			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
 			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function () {
+			$userSession->listen('\OC\User', 'logout', function() {
 				\OC_Hook::emit('OC_User', 'logout', array());
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
 			});
@@ -351,14 +351,14 @@ 
 		});
 		$this->registerAlias('UserSession', \OCP\IUserSession::class);
 
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function(Server $c) {
 			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
 		});
 
 		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
 		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
 
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
+		$this->registerService(\OC\AllConfig::class, function(Server $c) {
 			return new \OC\AllConfig(
 				$c->getSystemConfig()
 			);
@@ -366,17 +366,17 @@ 
 		$this->registerAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService('SystemConfig', function ($c) use ($config) {
+		$this->registerService('SystemConfig', function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
+		$this->registerService(\OC\AppConfig::class, function(Server $c) {
 			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
 		$this->registerAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+		$this->registerService(\OCP\L10N\IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->getConfig(),
 				$c->getRequest(),
@@ -386,7 +386,7 @@ 
 		});
 		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
 
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+		$this->registerService(\OCP\IURLGenerator::class, function(Server $c) {
 			$config = $c->getConfig();
 			$cacheFactory = $c->getMemCacheFactory();
 			return new \OC\URLGenerator(
@@ -396,10 +396,10 @@ 
 		});
 		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
 
-		$this->registerService('AppHelper', function ($c) {
+		$this->registerService('AppHelper', function($c) {
 			return new \OC\AppHelper();
 		});
-		$this->registerService('AppFetcher', function ($c) {
+		$this->registerService('AppFetcher', function($c) {
 			return new AppFetcher(
 				$this->getAppDataDir('appstore'),
 				$this->getHTTPClientService(),
@@ -407,7 +407,7 @@ 
 				$this->getConfig()
 			);
 		});
-		$this->registerService('CategoryFetcher', function ($c) {
+		$this->registerService('CategoryFetcher', function($c) {
 			return new CategoryFetcher(
 				$this->getAppDataDir('appstore'),
 				$this->getHTTPClientService(),
@@ -416,21 +416,21 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\ICache::class, function ($c) {
+		$this->registerService(\OCP\ICache::class, function($c) {
 			return new Cache\File();
 		});
 		$this->registerAlias('UserCache', \OCP\ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$config = $c->getConfig();
 
 			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				$v = \OC_App::getAppVersions();
-				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
+				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT.'/version.php'));
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path.'-'.\OC::$WEBROOT);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -447,12 +447,12 @@ 
 		$this->registerAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			return new RedisFactory($systemConfig);
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
 				$c->getUserSession(),
@@ -462,14 +462,14 @@ 
 		});
 		$this->registerAlias('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(\OCP\IAvatarManager::class, function (Server $c) {
+		$this->registerService(\OCP\IAvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->getUserManager(),
 				$c->getAppDataDir('avatar'),
@@ -480,7 +480,7 @@ 
 		});
 		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
 
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
+		$this->registerService(\OCP\ILogger::class, function(Server $c) {
 			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
 			$logger = Log::getLogClass($logType);
 			call_user_func(array($logger, 'init'));
@@ -489,7 +489,7 @@ 
 		});
 		$this->registerAlias('Logger', \OCP\ILogger::class);
 
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+		$this->registerService(\OCP\BackgroundJob\IJobList::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList(
 				$c->getDatabaseConnection(),
@@ -499,7 +499,7 @@ 
 		});
 		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
 
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
+		$this->registerService(\OCP\Route\IRouter::class, function(Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			$logger = $c->getLogger();
 			if ($cacheFactory->isAvailable()) {
@@ -511,32 +511,32 @@ 
 		});
 		$this->registerAlias('Router', \OCP\Route\IRouter::class);
 
-		$this->registerService(\OCP\ISearch::class, function ($c) {
+		$this->registerService(\OCP\ISearch::class, function($c) {
 			return new Search();
 		});
 		$this->registerAlias('Search', \OCP\ISearch::class);
 
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+		$this->registerService(\OCP\Security\ISecureRandom::class, function($c) {
 			return new SecureRandom();
 		});
 		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
 
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICrypto::class, function(Server $c) {
 			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
 		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
 
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IHasher::class, function(Server $c) {
 			return new Hasher($c->getConfig());
 		});
 		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
 
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICredentialsManager::class, function(Server $c) {
 			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
 		});
 		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
 
-		$this->registerService(IDBConnection::class, function (Server $c) {
+		$this->registerService(IDBConnection::class, function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -550,7 +550,7 @@ 
 		});
 		$this->registerAlias('DatabaseConnection', IDBConnection::class);
 
-		$this->registerService('HTTPHelper', function (Server $c) {
+		$this->registerService('HTTPHelper', function(Server $c) {
 			$config = $c->getConfig();
 			return new HTTPHelper(
 				$config,
@@ -558,7 +558,7 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
+		$this->registerService(\OCP\Http\Client\IClientService::class, function(Server $c) {
 			$user = \OC_User::getUser();
 			$uid = $user ? $user : null;
 			return new ClientService(
@@ -568,7 +568,7 @@ 
 		});
 		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
 
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new EventLogger();
 			} else {
@@ -577,7 +577,7 @@ 
 		});
 		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
 
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function(Server $c) {
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new QueryLogger();
 			} else {
@@ -586,7 +586,7 @@ 
 		});
 		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
 
-		$this->registerService(TempManager::class, function (Server $c) {
+		$this->registerService(TempManager::class, function(Server $c) {
 			return new TempManager(
 				$c->getLogger(),
 				$c->getConfig()
@@ -595,7 +595,7 @@ 
 		$this->registerAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (Server $c) {
+		$this->registerService(AppManager::class, function(Server $c) {
 			return new \OC\App\AppManager(
 				$c->getUserSession(),
 				$c->getAppConfig(),
@@ -607,7 +607,7 @@ 
 		$this->registerAlias('AppManager', AppManager::class);
 		$this->registerAlias(IAppManager::class, AppManager::class);
 
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeZone::class, function(Server $c) {
 			return new DateTimeZone(
 				$c->getConfig(),
 				$c->getSession()
@@ -615,7 +615,7 @@ 
 		});
 		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
 
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -625,7 +625,7 @@ 
 		});
 		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
 
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function(Server $c) {
 			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->getUserManager());
@@ -633,10 +633,10 @@ 
 		});
 		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
 
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function(Server $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->query('UserMountCache');
-			$manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
 
 			// builtin providers
 
@@ -649,14 +649,14 @@ 
 		});
 		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
 
-		$this->registerService('IniWrapper', function ($c) {
+		$this->registerService('IniWrapper', function($c) {
 			return new IniGetWrapper();
 		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
+		$this->registerService('AsyncCommandBus', function(Server $c) {
 			$jobList = $c->getJobList();
 			return new AsyncBus($jobList);
 		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
+		$this->registerService('TrustedDomainHelper', function($c) {
 			return new TrustedDomainHelper($this->getConfig());
 		});
 		$this->registerService('Throttler', function(Server $c) {
@@ -667,10 +667,10 @@ 
 				$c->getConfig()
 			);
 		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
+		$this->registerService('IntegrityCodeChecker', function(Server $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
-			if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 				$config = $c->getConfig();
 				$appManager = $c->getAppManager();
 			} else {
@@ -688,7 +688,7 @@ 
 					$c->getTempManager()
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
+		$this->registerService(\OCP\IRequest::class, function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -724,7 +724,7 @@ 
 		});
 		$this->registerAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+		$this->registerService(\OCP\Mail\IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->getConfig(),
 				$c->getLogger(),
@@ -738,14 +738,14 @@ 
 		$this->registerService('LDAPProvider', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if(is_null($factoryClass)) {
+			if (is_null($factoryClass)) {
 				throw new \Exception('ldapProviderFactory not set');
 			}
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			$factory = new $factoryClass($this);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService('LockingProvider', function (Server $c) {
+		$this->registerService('LockingProvider', function(Server $c) {
 			$ini = $c->getIniWrapper();
 			$config = $c->getConfig();
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -761,37 +761,37 @@ 
 			return new NoopLockingProvider();
 		});
 
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
+		$this->registerService(\OCP\Files\Mount\IMountManager::class, function() {
 			return new \OC\Files\Mount\Manager();
 		});
 		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function(Server $c) {
 			return new \OC\Files\Type\Loader(
 				$c->getDatabaseConnection()
 			);
 		});
 		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
 
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Notification\IManager::class, function(Server $c) {
 			return new Manager(
 				$c->query(IValidator::class)
 			);
 		});
 		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+		$this->registerService(\OC\CapabilitiesManager::class, function(Server $c) {
 			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
 			return $manager;
@@ -833,13 +833,13 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(EventDispatcher::class, function () {
+		$this->registerService(EventDispatcher::class, function() {
 			return new EventDispatcher();
 		});
 		$this->registerAlias('EventDispatcher', EventDispatcher::class);
 		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
 
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -864,7 +864,7 @@ 
 				$request
 			);
 		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
+		$this->registerService('CsrfTokenManager', function(Server $c) {
 			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
 
 			return new CsrfTokenManager(
@@ -872,10 +872,10 @@ 
 				$c->query(SessionStorage::class)
 			);
 		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
+		$this->registerService(SessionStorage::class, function(Server $c) {
 			return new SessionStorage($c->getSession());
 		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function(Server $c) {
 			return new ContentSecurityPolicyManager();
 		});
 		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
@@ -926,29 +926,29 @@ 
 			);
 			return $manager;
 		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(Server $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->getRootFolder(),
 				$c->getSystemConfig()
 			);
 		});
 
-		$this->registerService('LockdownManager', function (Server $c) {
+		$this->registerService('LockdownManager', function(Server $c) {
 			return new LockdownManager(function() use ($c) {
 				return $c->getSession();
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(Server $c) {
 			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
 		});
 
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
+		$this->registerService(ICloudIdManager::class, function(Server $c) {
 			return new CloudIdManager();
 		});
 
 		/* To trick DI since we don't extend the DIContainer here */
-		$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
+		$this->registerService(CleanPreviewsBackgroundJob::class, function(Server $c) {
 			return new CleanPreviewsBackgroundJob(
 				$c->getRootFolder(),
 				$c->getLogger(),
@@ -963,7 +963,7 @@ 
 		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
 		$this->registerAlias('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()
 			);
@@ -1109,7 +1109,7 @@ 
 	 * @deprecated since 9.2.0 use IAppData
 	 */
 	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
+		$dir = '/'.\OC_App::getCurrentApp();
 		$root = $this->getRootFolder();
 		if (!$root->nodeExists($dir)) {
 			$folder = $root->newFolder($dir);