nextcloud / server

core/Command/Maintenance/Mimetype/UpdateJS.php

Indentation +26 added lines, -26 removed lines

@@ -33,30 +33,30 @@
 
 class UpdateJS extends Command {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-js')
-			->setDescription('Update mimetypelist.js');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// Fetch all the aliases
-		$aliases = $this->mimetypeDetector->getAllAliases();
-
-		// Output the JS
-		$generatedMimetypeFile = new GenerateMimetypeFileBuilder();
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases));
-
-		$output->writeln('<info>mimetypelist.js is updated');
-	}
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
+
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-js')
+            ->setDescription('Update mimetypelist.js');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // Fetch all the aliases
+        $aliases = $this->mimetypeDetector->getAllAliases();
+
+        // Output the JS
+        $generatedMimetypeFile = new GenerateMimetypeFileBuilder();
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases));
+
+        $output->writeln('<info>mimetypelist.js is updated');
+    }
 }

core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php

Indentation +55 added lines, -55 removed lines

@@ -25,68 +25,68 @@ 
 
 class GenerateMimetypeFileBuilder
 {
-	/**
-	 * Generate mime type list file
-	 * @param $aliases
-	 * @return string
-	 */
-	public function generateFile(array $aliases): string {
-		// Remove comments
-		$keys = array_filter(array_keys($aliases), function($k) {
-			return $k[0] === '_';
-		});
-		foreach($keys as $key) {
-			unset($aliases[$key]);
-		}
+    /**
+     * Generate mime type list file
+     * @param $aliases
+     * @return string
+     */
+    public function generateFile(array $aliases): string {
+        // Remove comments
+        $keys = array_filter(array_keys($aliases), function($k) {
+            return $k[0] === '_';
+        });
+        foreach($keys as $key) {
+            unset($aliases[$key]);
+        }
 
-		// Fetch all files
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
+        // Fetch all files
+        $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
-		$files = [];
-		foreach($dir as $fileInfo) {
-			if ($fileInfo->isFile()) {
-				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-				$files[] = $file;
-			}
-		}
+        $files = [];
+        foreach($dir as $fileInfo) {
+            if ($fileInfo->isFile()) {
+                $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                $files[] = $file;
+            }
+        }
 
-		//Remove duplicates
-		$files = array_values(array_unique($files));
-		sort($files);
+        //Remove duplicates
+        $files = array_values(array_unique($files));
+        sort($files);
 
-		// Fetch all themes!
-		$themes = [];
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
-			//Valid theme dir
-			if ($dir->isFile() || $dir->isDot()) {
-				continue;
-			}
+        // Fetch all themes!
+        $themes = [];
+        $dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
+        foreach($dirs as $dir) {
+            //Valid theme dir
+            if ($dir->isFile() || $dir->isDot()) {
+                continue;
+            }
 
-			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
-			// Check if this theme has its own filetype icons
-			if (!file_exists($themeDir)) {
-				continue;
-			}
+            $theme = $dir->getFilename();
+            $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+            // Check if this theme has its own filetype icons
+            if (!file_exists($themeDir)) {
+                continue;
+            }
 
-			$themes[$theme] = [];
-			// Fetch all the theme icons!
-			$themeIt = new \DirectoryIterator($themeDir);
-			foreach ($themeIt as $fileInfo) {
-				if ($fileInfo->isFile()) {
-					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-					$themes[$theme][] = $file;
-				}
-			}
+            $themes[$theme] = [];
+            // Fetch all the theme icons!
+            $themeIt = new \DirectoryIterator($themeDir);
+            foreach ($themeIt as $fileInfo) {
+                if ($fileInfo->isFile()) {
+                    $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                    $themes[$theme][] = $file;
+                }
+            }
 
-			//Remove Duplicates
-			$themes[$theme] = array_values(array_unique($themes[$theme]));
-			sort($themes[$theme]);
-		}
+            //Remove Duplicates
+            $themes[$theme] = array_values(array_unique($themes[$theme]));
+            sort($themes[$theme]);
+        }
 
-		//Generate the JS
-		return '/**
+        //Generate the JS
+        return '/**
 * This file is automatically generated
 * DO NOT EDIT MANUALLY!
 *
@@ -100,6 +100,6 @@ 
 	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
 };
 ';
-	}
+    }
 
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
 		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			unset($aliases[$key]);
 		}
 
@@ -43,7 +43,7 @@ 
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
-		foreach($dir as $fileInfo) {
+		foreach ($dir as $fileInfo) {
 			if ($fileInfo->isFile()) {
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 				$files[] = $file;
@@ -57,14 +57,14 @@ 
 		// Fetch all themes!
 		$themes = [];
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
 				continue;
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -95,9 +95,9 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';
 	}

lib/private/IntegrityCheck/Checker.php

Indentation +536 added lines, -536 removed lines

@@ -54,540 +54,540 @@
  * @package OC\IntegrityCheck
  */
 class Checker {
-	const CACHE_KEY = 'oc.integritycheck.checker';
-	/** @var EnvironmentHelper */
-	private $environmentHelper;
-	/** @var AppLocator */
-	private $appLocator;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
-	/** @var IConfig */
-	private $config;
-	/** @var ICache */
-	private $cache;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
-
-	/**
-	 * @param EnvironmentHelper $environmentHelper
-	 * @param FileAccessHelper $fileAccessHelper
-	 * @param AppLocator $appLocator
-	 * @param IConfig $config
-	 * @param ICacheFactory $cacheFactory
-	 * @param IAppManager $appManager
-	 * @param ITempManager $tempManager
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 */
-	public function __construct(EnvironmentHelper $environmentHelper,
-								FileAccessHelper $fileAccessHelper,
-								AppLocator $appLocator,
-								IConfig $config = null,
-								ICacheFactory $cacheFactory,
-								IAppManager $appManager = null,
-								ITempManager $tempManager,
-								IMimeTypeDetector $mimeTypeDetector) {
-		$this->environmentHelper = $environmentHelper;
-		$this->fileAccessHelper = $fileAccessHelper;
-		$this->appLocator = $appLocator;
-		$this->config = $config;
-		$this->cache = $cacheFactory->createDistributed(self::CACHE_KEY);
-		$this->appManager = $appManager;
-		$this->tempManager = $tempManager;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-	}
-
-	/**
-	 * Whether code signing is enforced or not.
-	 *
-	 * @return bool
-	 */
-	public function isCodeCheckEnforced(): bool {
-		$notSignedChannels = [ '', 'git'];
-		if (\in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) {
-			return false;
-		}
-
-		/**
-		 * This config option is undocumented and supposed to be so, it's only
-		 * applicable for very specific scenarios and we should not advertise it
-		 * too prominent. So please do not add it to config.sample.php.
-		 */
-		$isIntegrityCheckDisabled = false;
-		if ($this->config !== null) {
-			$isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
-		}
-		if ($isIntegrityCheckDisabled === true) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Enumerates all files belonging to the folder. Sensible defaults are excluded.
-	 *
-	 * @param string $folderToIterate
-	 * @param string $root
-	 * @return \RecursiveIteratorIterator
-	 * @throws \Exception
-	 */
-	private function getFolderIterator(string $folderToIterate, string $root = ''): \RecursiveIteratorIterator {
-		$dirItr = new \RecursiveDirectoryIterator(
-			$folderToIterate,
-			\RecursiveDirectoryIterator::SKIP_DOTS
-		);
-		if($root === '') {
-			$root = \OC::$SERVERROOT;
-		}
-		$root = rtrim($root, '/');
-
-		$excludeGenericFilesIterator = new ExcludeFileByNameFilterIterator($dirItr);
-		$excludeFoldersIterator = new ExcludeFoldersByPathFilterIterator($excludeGenericFilesIterator, $root);
-
-		return new \RecursiveIteratorIterator(
-			$excludeFoldersIterator,
-			\RecursiveIteratorIterator::SELF_FIRST
-		);
-	}
-
-	/**
-	 * Returns an array of ['filename' => 'SHA512-hash-of-file'] for all files found
-	 * in the iterator.
-	 *
-	 * @param \RecursiveIteratorIterator $iterator
-	 * @param string $path
-	 * @return array Array of hashes.
-	 */
-	private function generateHashes(\RecursiveIteratorIterator $iterator,
-									string $path): array {
-		$hashes = [];
-
-		$baseDirectoryLength = \strlen($path);
-		foreach($iterator as $filename => $data) {
-			/** @var \DirectoryIterator $data */
-			if($data->isDir()) {
-				continue;
-			}
-
-			$relativeFileName = substr($filename, $baseDirectoryLength);
-			$relativeFileName = ltrim($relativeFileName, '/');
-
-			// Exclude signature.json files in the appinfo and root folder
-			if($relativeFileName === 'appinfo/signature.json') {
-				continue;
-			}
-			// Exclude signature.json files in the appinfo and core folder
-			if($relativeFileName === 'core/signature.json') {
-				continue;
-			}
-
-			// The .htaccess file in the root folder of ownCloud can contain
-			// custom content after the installation due to the fact that dynamic
-			// content is written into it at installation time as well. This
-			// includes for example the 404 and 403 instructions.
-			// Thus we ignore everything below the first occurrence of
-			// "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" and have the
-			// hash generated based on this.
-			if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess') {
-				$fileContent = file_get_contents($filename);
-				$explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent);
-				if(\count($explodedArray) === 2) {
-					$hashes[$relativeFileName] = hash('sha512', $explodedArray[0]);
-					continue;
-				}
-			}
-			if ($filename === $this->environmentHelper->getServerRoot() . '/core/js/mimetypelist.js') {
-				$oldMimetypeList = new GenerateMimetypeFileBuilder();
-				$newFile = $oldMimetypeList->generateFile($this->mimeTypeDetector->getAllAliases());
-				if($newFile === file_get_contents($filename)) {
-					$hashes[$relativeFileName] = hash('sha512', $oldMimetypeList->generateFile($this->mimeTypeDetector->getOnlyDefaultAliases()));
-					continue;
-				}
-			}
-
-			$hashes[$relativeFileName] = hash_file('sha512', $filename);
-		}
-
-		return $hashes;
-	}
-
-	/**
-	 * Creates the signature data
-	 *
-	 * @param array $hashes
-	 * @param X509 $certificate
-	 * @param RSA $privateKey
-	 * @return array
-	 */
-	private function createSignatureData(array $hashes,
-										 X509 $certificate,
-										 RSA $privateKey): array {
-		ksort($hashes);
-
-		$privateKey->setSignatureMode(RSA::SIGNATURE_PSS);
-		$privateKey->setMGFHash('sha512');
-		// See https://tools.ietf.org/html/rfc3447#page-38
-		$privateKey->setSaltLength(0);
-		$signature = $privateKey->sign(json_encode($hashes));
-
-		return [
-				'hashes' => $hashes,
-				'signature' => base64_encode($signature),
-				'certificate' => $certificate->saveX509($certificate->currentCert),
-			];
-	}
-
-	/**
-	 * Write the signature of the app in the specified folder
-	 *
-	 * @param string $path
-	 * @param X509 $certificate
-	 * @param RSA $privateKey
-	 * @throws \Exception
-	 */
-	public function writeAppSignature($path,
-									  X509 $certificate,
-									  RSA $privateKey) {
-		$appInfoDir = $path . '/appinfo';
-		try {
-			$this->fileAccessHelper->assertDirectoryExists($appInfoDir);
-
-			$iterator = $this->getFolderIterator($path);
-			$hashes = $this->generateHashes($iterator, $path);
-			$signature = $this->createSignatureData($hashes, $certificate, $privateKey);
-				$this->fileAccessHelper->file_put_contents(
-					$appInfoDir . '/signature.json',
-				json_encode($signature, JSON_PRETTY_PRINT)
-			);
-		} catch (\Exception $e){
-			if (!$this->fileAccessHelper->is_writable($appInfoDir)) {
-				throw new \Exception($appInfoDir . ' is not writable');
-			}
-			throw $e;
-		}
-	}
-
-	/**
-	 * Write the signature of core
-	 *
-	 * @param X509 $certificate
-	 * @param RSA $rsa
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function writeCoreSignature(X509 $certificate,
-									   RSA $rsa,
-									   $path) {
-		$coreDir = $path . '/core';
-		try {
-
-			$this->fileAccessHelper->assertDirectoryExists($coreDir);
-			$iterator = $this->getFolderIterator($path, $path);
-			$hashes = $this->generateHashes($iterator, $path);
-			$signatureData = $this->createSignatureData($hashes, $certificate, $rsa);
-			$this->fileAccessHelper->file_put_contents(
-				$coreDir . '/signature.json',
-				json_encode($signatureData, JSON_PRETTY_PRINT)
-			);
-		} catch (\Exception $e){
-			if (!$this->fileAccessHelper->is_writable($coreDir)) {
-				throw new \Exception($coreDir . ' is not writable');
-			}
-			throw $e;
-		}
-	}
-
-	/**
-	 * Verifies the signature for the specified path.
-	 *
-	 * @param string $signaturePath
-	 * @param string $basePath
-	 * @param string $certificateCN
-	 * @return array
-	 * @throws InvalidSignatureException
-	 * @throws \Exception
-	 */
-	private function verify(string $signaturePath, string $basePath, string $certificateCN): array {
-		if(!$this->isCodeCheckEnforced()) {
-			return [];
-		}
-
-		$content = $this->fileAccessHelper->file_get_contents($signaturePath);
-		$signatureData = null;
-
-		if (\is_string($content)) {
-			$signatureData = json_decode($content, true);
-		}
-		if(!\is_array($signatureData)) {
-			throw new InvalidSignatureException('Signature data not found.');
-		}
-
-		$expectedHashes = $signatureData['hashes'];
-		ksort($expectedHashes);
-		$signature = base64_decode($signatureData['signature']);
-		$certificate = $signatureData['certificate'];
-
-		// Check if certificate is signed by Nextcloud Root Authority
-		$x509 = new \phpseclib\File\X509();
-		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
-		$x509->loadCA($rootCertificatePublicKey);
-		$x509->loadX509($certificate);
-		if(!$x509->validateSignature()) {
-			throw new InvalidSignatureException('Certificate is not valid.');
-		}
-		// Verify if certificate has proper CN. "core" CN is always trusted.
-		if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
-			throw new InvalidSignatureException(
-					sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN'])
-			);
-		}
-
-		// Check if the signature of the files is valid
-		$rsa = new \phpseclib\Crypt\RSA();
-		$rsa->loadKey($x509->currentCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']);
-		$rsa->setSignatureMode(RSA::SIGNATURE_PSS);
-		$rsa->setMGFHash('sha512');
-		// See https://tools.ietf.org/html/rfc3447#page-38
-		$rsa->setSaltLength(0);
-		if(!$rsa->verify(json_encode($expectedHashes), $signature)) {
-			throw new InvalidSignatureException('Signature could not get verified.');
-		}
-
-		// Fixes for the updater as shipped with ownCloud 9.0.x: The updater is
-		// replaced after the code integrity check is performed.
-		//
-		// Due to this reason we exclude the whole updater/ folder from the code
-		// integrity check.
-		if($basePath === $this->environmentHelper->getServerRoot()) {
-			foreach($expectedHashes as $fileName => $hash) {
-				if(strpos($fileName, 'updater/') === 0) {
-					unset($expectedHashes[$fileName]);
-				}
-			}
-		}
-
-		// Compare the list of files which are not identical
-		$currentInstanceHashes = $this->generateHashes($this->getFolderIterator($basePath), $basePath);
-		$differencesA = array_diff($expectedHashes, $currentInstanceHashes);
-		$differencesB = array_diff($currentInstanceHashes, $expectedHashes);
-		$differences = array_unique(array_merge($differencesA, $differencesB));
-		$differenceArray = [];
-		foreach($differences as $filename => $hash) {
-			// Check if file should not exist in the new signature table
-			if(!array_key_exists($filename, $expectedHashes)) {
-				$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
-				$differenceArray['EXTRA_FILE'][$filename]['current'] = $hash;
-				continue;
-			}
-
-			// Check if file is missing
-			if(!array_key_exists($filename, $currentInstanceHashes)) {
-				$differenceArray['FILE_MISSING'][$filename]['expected'] = $expectedHashes[$filename];
-				$differenceArray['FILE_MISSING'][$filename]['current'] = '';
-				continue;
-			}
-
-			// Check if hash does mismatch
-			if($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
-				$differenceArray['INVALID_HASH'][$filename]['expected'] = $expectedHashes[$filename];
-				$differenceArray['INVALID_HASH'][$filename]['current'] = $currentInstanceHashes[$filename];
-				continue;
-			}
-
-			// Should never happen.
-			throw new \Exception('Invalid behaviour in file hash comparison experienced. Please report this error to the developers.');
-		}
-
-		return $differenceArray;
-	}
-
-	/**
-	 * Whether the code integrity check has passed successful or not
-	 *
-	 * @return bool
-	 */
-	public function hasPassedCheck(): bool {
-		$results = $this->getResults();
-		if(empty($results)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getResults(): array {
-		$cachedResults = $this->cache->get(self::CACHE_KEY);
-		if(!\is_null($cachedResults)) {
-			return json_decode($cachedResults, true);
-		}
-
-		if ($this->config !== null) {
-			return json_decode($this->config->getAppValue('core', self::CACHE_KEY, '{}'), true);
-		}
-		return [];
-	}
-
-	/**
-	 * Stores the results in the app config as well as cache
-	 *
-	 * @param string $scope
-	 * @param array $result
-	 */
-	private function storeResults(string $scope, array $result) {
-		$resultArray = $this->getResults();
-		unset($resultArray[$scope]);
-		if(!empty($result)) {
-			$resultArray[$scope] = $result;
-		}
-		if ($this->config !== null) {
-			$this->config->setAppValue('core', self::CACHE_KEY, json_encode($resultArray));
-		}
-		$this->cache->set(self::CACHE_KEY, json_encode($resultArray));
-	}
-
-	/**
-	 *
-	 * Clean previous results for a proper rescanning. Otherwise
-	 */
-	private function cleanResults() {
-		$this->config->deleteAppValue('core', self::CACHE_KEY);
-		$this->cache->remove(self::CACHE_KEY);
-	}
-
-	/**
-	 * Verify the signature of $appId. Returns an array with the following content:
-	 * [
-	 * 	'FILE_MISSING' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * 	'EXTRA_FILE' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * 	'INVALID_HASH' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * ]
-	 *
-	 * Array may be empty in case no problems have been found.
-	 *
-	 * @param string $appId
-	 * @param string $path Optional path. If none is given it will be guessed.
-	 * @return array
-	 */
-	public function verifyAppSignature(string $appId, string $path = ''): array {
-		try {
-			if($path === '') {
-				$path = $this->appLocator->getAppPath($appId);
-			}
-			$result = $this->verify(
-					$path . '/appinfo/signature.json',
-					$path,
-					$appId
-			);
-		} catch (\Exception $e) {
-			$result = [
-					'EXCEPTION' => [
-							'class' => \get_class($e),
-							'message' => $e->getMessage(),
-					],
-			];
-		}
-		$this->storeResults($appId, $result);
-
-		return $result;
-	}
-
-	/**
-	 * Verify the signature of core. Returns an array with the following content:
-	 * [
-	 * 	'FILE_MISSING' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * 	'EXTRA_FILE' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * 	'INVALID_HASH' =>
-	 * 	[
-	 * 		'filename' => [
-	 * 			'expected' => 'expectedSHA512',
-	 * 			'current' => 'currentSHA512',
-	 * 		],
-	 * 	],
-	 * ]
-	 *
-	 * Array may be empty in case no problems have been found.
-	 *
-	 * @return array
-	 */
-	public function verifyCoreSignature(): array {
-		try {
-			$result = $this->verify(
-					$this->environmentHelper->getServerRoot() . '/core/signature.json',
-					$this->environmentHelper->getServerRoot(),
-					'core'
-			);
-		} catch (\Exception $e) {
-			$result = [
-					'EXCEPTION' => [
-							'class' => \get_class($e),
-							'message' => $e->getMessage(),
-					],
-			];
-		}
-		$this->storeResults('core', $result);
-
-		return $result;
-	}
-
-	/**
-	 * Verify the core code of the instance as well as all applicable applications
-	 * and store the results.
-	 */
-	public function runInstanceVerification() {
-		$this->cleanResults();
-		$this->verifyCoreSignature();
-		$appIds = $this->appLocator->getAllApps();
-		foreach($appIds as $appId) {
-			// If an application is shipped a valid signature is required
-			$isShipped = $this->appManager->isShipped($appId);
-			$appNeedsToBeChecked = false;
-			if ($isShipped) {
-				$appNeedsToBeChecked = true;
-			} elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId) . '/appinfo/signature.json')) {
-				// Otherwise only if the application explicitly ships a signature.json file
-				$appNeedsToBeChecked = true;
-			}
-
-			if($appNeedsToBeChecked) {
-				$this->verifyAppSignature($appId);
-			}
-		}
-	}
+    const CACHE_KEY = 'oc.integritycheck.checker';
+    /** @var EnvironmentHelper */
+    private $environmentHelper;
+    /** @var AppLocator */
+    private $appLocator;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
+    /** @var IConfig */
+    private $config;
+    /** @var ICache */
+    private $cache;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
+
+    /**
+     * @param EnvironmentHelper $environmentHelper
+     * @param FileAccessHelper $fileAccessHelper
+     * @param AppLocator $appLocator
+     * @param IConfig $config
+     * @param ICacheFactory $cacheFactory
+     * @param IAppManager $appManager
+     * @param ITempManager $tempManager
+     * @param IMimeTypeDetector $mimeTypeDetector
+     */
+    public function __construct(EnvironmentHelper $environmentHelper,
+                                FileAccessHelper $fileAccessHelper,
+                                AppLocator $appLocator,
+                                IConfig $config = null,
+                                ICacheFactory $cacheFactory,
+                                IAppManager $appManager = null,
+                                ITempManager $tempManager,
+                                IMimeTypeDetector $mimeTypeDetector) {
+        $this->environmentHelper = $environmentHelper;
+        $this->fileAccessHelper = $fileAccessHelper;
+        $this->appLocator = $appLocator;
+        $this->config = $config;
+        $this->cache = $cacheFactory->createDistributed(self::CACHE_KEY);
+        $this->appManager = $appManager;
+        $this->tempManager = $tempManager;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+    }
+
+    /**
+     * Whether code signing is enforced or not.
+     *
+     * @return bool
+     */
+    public function isCodeCheckEnforced(): bool {
+        $notSignedChannels = [ '', 'git'];
+        if (\in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) {
+            return false;
+        }
+
+        /**
+         * This config option is undocumented and supposed to be so, it's only
+         * applicable for very specific scenarios and we should not advertise it
+         * too prominent. So please do not add it to config.sample.php.
+         */
+        $isIntegrityCheckDisabled = false;
+        if ($this->config !== null) {
+            $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
+        }
+        if ($isIntegrityCheckDisabled === true) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Enumerates all files belonging to the folder. Sensible defaults are excluded.
+     *
+     * @param string $folderToIterate
+     * @param string $root
+     * @return \RecursiveIteratorIterator
+     * @throws \Exception
+     */
+    private function getFolderIterator(string $folderToIterate, string $root = ''): \RecursiveIteratorIterator {
+        $dirItr = new \RecursiveDirectoryIterator(
+            $folderToIterate,
+            \RecursiveDirectoryIterator::SKIP_DOTS
+        );
+        if($root === '') {
+            $root = \OC::$SERVERROOT;
+        }
+        $root = rtrim($root, '/');
+
+        $excludeGenericFilesIterator = new ExcludeFileByNameFilterIterator($dirItr);
+        $excludeFoldersIterator = new ExcludeFoldersByPathFilterIterator($excludeGenericFilesIterator, $root);
+
+        return new \RecursiveIteratorIterator(
+            $excludeFoldersIterator,
+            \RecursiveIteratorIterator::SELF_FIRST
+        );
+    }
+
+    /**
+     * Returns an array of ['filename' => 'SHA512-hash-of-file'] for all files found
+     * in the iterator.
+     *
+     * @param \RecursiveIteratorIterator $iterator
+     * @param string $path
+     * @return array Array of hashes.
+     */
+    private function generateHashes(\RecursiveIteratorIterator $iterator,
+                                    string $path): array {
+        $hashes = [];
+
+        $baseDirectoryLength = \strlen($path);
+        foreach($iterator as $filename => $data) {
+            /** @var \DirectoryIterator $data */
+            if($data->isDir()) {
+                continue;
+            }
+
+            $relativeFileName = substr($filename, $baseDirectoryLength);
+            $relativeFileName = ltrim($relativeFileName, '/');
+
+            // Exclude signature.json files in the appinfo and root folder
+            if($relativeFileName === 'appinfo/signature.json') {
+                continue;
+            }
+            // Exclude signature.json files in the appinfo and core folder
+            if($relativeFileName === 'core/signature.json') {
+                continue;
+            }
+
+            // The .htaccess file in the root folder of ownCloud can contain
+            // custom content after the installation due to the fact that dynamic
+            // content is written into it at installation time as well. This
+            // includes for example the 404 and 403 instructions.
+            // Thus we ignore everything below the first occurrence of
+            // "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" and have the
+            // hash generated based on this.
+            if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess') {
+                $fileContent = file_get_contents($filename);
+                $explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent);
+                if(\count($explodedArray) === 2) {
+                    $hashes[$relativeFileName] = hash('sha512', $explodedArray[0]);
+                    continue;
+                }
+            }
+            if ($filename === $this->environmentHelper->getServerRoot() . '/core/js/mimetypelist.js') {
+                $oldMimetypeList = new GenerateMimetypeFileBuilder();
+                $newFile = $oldMimetypeList->generateFile($this->mimeTypeDetector->getAllAliases());
+                if($newFile === file_get_contents($filename)) {
+                    $hashes[$relativeFileName] = hash('sha512', $oldMimetypeList->generateFile($this->mimeTypeDetector->getOnlyDefaultAliases()));
+                    continue;
+                }
+            }
+
+            $hashes[$relativeFileName] = hash_file('sha512', $filename);
+        }
+
+        return $hashes;
+    }
+
+    /**
+     * Creates the signature data
+     *
+     * @param array $hashes
+     * @param X509 $certificate
+     * @param RSA $privateKey
+     * @return array
+     */
+    private function createSignatureData(array $hashes,
+                                            X509 $certificate,
+                                            RSA $privateKey): array {
+        ksort($hashes);
+
+        $privateKey->setSignatureMode(RSA::SIGNATURE_PSS);
+        $privateKey->setMGFHash('sha512');
+        // See https://tools.ietf.org/html/rfc3447#page-38
+        $privateKey->setSaltLength(0);
+        $signature = $privateKey->sign(json_encode($hashes));
+
+        return [
+                'hashes' => $hashes,
+                'signature' => base64_encode($signature),
+                'certificate' => $certificate->saveX509($certificate->currentCert),
+            ];
+    }
+
+    /**
+     * Write the signature of the app in the specified folder
+     *
+     * @param string $path
+     * @param X509 $certificate
+     * @param RSA $privateKey
+     * @throws \Exception
+     */
+    public function writeAppSignature($path,
+                                        X509 $certificate,
+                                        RSA $privateKey) {
+        $appInfoDir = $path . '/appinfo';
+        try {
+            $this->fileAccessHelper->assertDirectoryExists($appInfoDir);
+
+            $iterator = $this->getFolderIterator($path);
+            $hashes = $this->generateHashes($iterator, $path);
+            $signature = $this->createSignatureData($hashes, $certificate, $privateKey);
+                $this->fileAccessHelper->file_put_contents(
+                    $appInfoDir . '/signature.json',
+                json_encode($signature, JSON_PRETTY_PRINT)
+            );
+        } catch (\Exception $e){
+            if (!$this->fileAccessHelper->is_writable($appInfoDir)) {
+                throw new \Exception($appInfoDir . ' is not writable');
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Write the signature of core
+     *
+     * @param X509 $certificate
+     * @param RSA $rsa
+     * @param string $path
+     * @throws \Exception
+     */
+    public function writeCoreSignature(X509 $certificate,
+                                        RSA $rsa,
+                                        $path) {
+        $coreDir = $path . '/core';
+        try {
+
+            $this->fileAccessHelper->assertDirectoryExists($coreDir);
+            $iterator = $this->getFolderIterator($path, $path);
+            $hashes = $this->generateHashes($iterator, $path);
+            $signatureData = $this->createSignatureData($hashes, $certificate, $rsa);
+            $this->fileAccessHelper->file_put_contents(
+                $coreDir . '/signature.json',
+                json_encode($signatureData, JSON_PRETTY_PRINT)
+            );
+        } catch (\Exception $e){
+            if (!$this->fileAccessHelper->is_writable($coreDir)) {
+                throw new \Exception($coreDir . ' is not writable');
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Verifies the signature for the specified path.
+     *
+     * @param string $signaturePath
+     * @param string $basePath
+     * @param string $certificateCN
+     * @return array
+     * @throws InvalidSignatureException
+     * @throws \Exception
+     */
+    private function verify(string $signaturePath, string $basePath, string $certificateCN): array {
+        if(!$this->isCodeCheckEnforced()) {
+            return [];
+        }
+
+        $content = $this->fileAccessHelper->file_get_contents($signaturePath);
+        $signatureData = null;
+
+        if (\is_string($content)) {
+            $signatureData = json_decode($content, true);
+        }
+        if(!\is_array($signatureData)) {
+            throw new InvalidSignatureException('Signature data not found.');
+        }
+
+        $expectedHashes = $signatureData['hashes'];
+        ksort($expectedHashes);
+        $signature = base64_decode($signatureData['signature']);
+        $certificate = $signatureData['certificate'];
+
+        // Check if certificate is signed by Nextcloud Root Authority
+        $x509 = new \phpseclib\File\X509();
+        $rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
+        $x509->loadCA($rootCertificatePublicKey);
+        $x509->loadX509($certificate);
+        if(!$x509->validateSignature()) {
+            throw new InvalidSignatureException('Certificate is not valid.');
+        }
+        // Verify if certificate has proper CN. "core" CN is always trusted.
+        if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
+            throw new InvalidSignatureException(
+                    sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN'])
+            );
+        }
+
+        // Check if the signature of the files is valid
+        $rsa = new \phpseclib\Crypt\RSA();
+        $rsa->loadKey($x509->currentCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']);
+        $rsa->setSignatureMode(RSA::SIGNATURE_PSS);
+        $rsa->setMGFHash('sha512');
+        // See https://tools.ietf.org/html/rfc3447#page-38
+        $rsa->setSaltLength(0);
+        if(!$rsa->verify(json_encode($expectedHashes), $signature)) {
+            throw new InvalidSignatureException('Signature could not get verified.');
+        }
+
+        // Fixes for the updater as shipped with ownCloud 9.0.x: The updater is
+        // replaced after the code integrity check is performed.
+        //
+        // Due to this reason we exclude the whole updater/ folder from the code
+        // integrity check.
+        if($basePath === $this->environmentHelper->getServerRoot()) {
+            foreach($expectedHashes as $fileName => $hash) {
+                if(strpos($fileName, 'updater/') === 0) {
+                    unset($expectedHashes[$fileName]);
+                }
+            }
+        }
+
+        // Compare the list of files which are not identical
+        $currentInstanceHashes = $this->generateHashes($this->getFolderIterator($basePath), $basePath);
+        $differencesA = array_diff($expectedHashes, $currentInstanceHashes);
+        $differencesB = array_diff($currentInstanceHashes, $expectedHashes);
+        $differences = array_unique(array_merge($differencesA, $differencesB));
+        $differenceArray = [];
+        foreach($differences as $filename => $hash) {
+            // Check if file should not exist in the new signature table
+            if(!array_key_exists($filename, $expectedHashes)) {
+                $differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
+                $differenceArray['EXTRA_FILE'][$filename]['current'] = $hash;
+                continue;
+            }
+
+            // Check if file is missing
+            if(!array_key_exists($filename, $currentInstanceHashes)) {
+                $differenceArray['FILE_MISSING'][$filename]['expected'] = $expectedHashes[$filename];
+                $differenceArray['FILE_MISSING'][$filename]['current'] = '';
+                continue;
+            }
+
+            // Check if hash does mismatch
+            if($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
+                $differenceArray['INVALID_HASH'][$filename]['expected'] = $expectedHashes[$filename];
+                $differenceArray['INVALID_HASH'][$filename]['current'] = $currentInstanceHashes[$filename];
+                continue;
+            }
+
+            // Should never happen.
+            throw new \Exception('Invalid behaviour in file hash comparison experienced. Please report this error to the developers.');
+        }
+
+        return $differenceArray;
+    }
+
+    /**
+     * Whether the code integrity check has passed successful or not
+     *
+     * @return bool
+     */
+    public function hasPassedCheck(): bool {
+        $results = $this->getResults();
+        if(empty($results)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResults(): array {
+        $cachedResults = $this->cache->get(self::CACHE_KEY);
+        if(!\is_null($cachedResults)) {
+            return json_decode($cachedResults, true);
+        }
+
+        if ($this->config !== null) {
+            return json_decode($this->config->getAppValue('core', self::CACHE_KEY, '{}'), true);
+        }
+        return [];
+    }
+
+    /**
+     * Stores the results in the app config as well as cache
+     *
+     * @param string $scope
+     * @param array $result
+     */
+    private function storeResults(string $scope, array $result) {
+        $resultArray = $this->getResults();
+        unset($resultArray[$scope]);
+        if(!empty($result)) {
+            $resultArray[$scope] = $result;
+        }
+        if ($this->config !== null) {
+            $this->config->setAppValue('core', self::CACHE_KEY, json_encode($resultArray));
+        }
+        $this->cache->set(self::CACHE_KEY, json_encode($resultArray));
+    }
+
+    /**
+     *
+     * Clean previous results for a proper rescanning. Otherwise
+     */
+    private function cleanResults() {
+        $this->config->deleteAppValue('core', self::CACHE_KEY);
+        $this->cache->remove(self::CACHE_KEY);
+    }
+
+    /**
+     * Verify the signature of $appId. Returns an array with the following content:
+     * [
+     * 	'FILE_MISSING' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * 	'EXTRA_FILE' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * 	'INVALID_HASH' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * ]
+     *
+     * Array may be empty in case no problems have been found.
+     *
+     * @param string $appId
+     * @param string $path Optional path. If none is given it will be guessed.
+     * @return array
+     */
+    public function verifyAppSignature(string $appId, string $path = ''): array {
+        try {
+            if($path === '') {
+                $path = $this->appLocator->getAppPath($appId);
+            }
+            $result = $this->verify(
+                    $path . '/appinfo/signature.json',
+                    $path,
+                    $appId
+            );
+        } catch (\Exception $e) {
+            $result = [
+                    'EXCEPTION' => [
+                            'class' => \get_class($e),
+                            'message' => $e->getMessage(),
+                    ],
+            ];
+        }
+        $this->storeResults($appId, $result);
+
+        return $result;
+    }
+
+    /**
+     * Verify the signature of core. Returns an array with the following content:
+     * [
+     * 	'FILE_MISSING' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * 	'EXTRA_FILE' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * 	'INVALID_HASH' =>
+     * 	[
+     * 		'filename' => [
+     * 			'expected' => 'expectedSHA512',
+     * 			'current' => 'currentSHA512',
+     * 		],
+     * 	],
+     * ]
+     *
+     * Array may be empty in case no problems have been found.
+     *
+     * @return array
+     */
+    public function verifyCoreSignature(): array {
+        try {
+            $result = $this->verify(
+                    $this->environmentHelper->getServerRoot() . '/core/signature.json',
+                    $this->environmentHelper->getServerRoot(),
+                    'core'
+            );
+        } catch (\Exception $e) {
+            $result = [
+                    'EXCEPTION' => [
+                            'class' => \get_class($e),
+                            'message' => $e->getMessage(),
+                    ],
+            ];
+        }
+        $this->storeResults('core', $result);
+
+        return $result;
+    }
+
+    /**
+     * Verify the core code of the instance as well as all applicable applications
+     * and store the results.
+     */
+    public function runInstanceVerification() {
+        $this->cleanResults();
+        $this->verifyCoreSignature();
+        $appIds = $this->appLocator->getAllApps();
+        foreach($appIds as $appId) {
+            // If an application is shipped a valid signature is required
+            $isShipped = $this->appManager->isShipped($appId);
+            $appNeedsToBeChecked = false;
+            if ($isShipped) {
+                $appNeedsToBeChecked = true;
+            } elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId) . '/appinfo/signature.json')) {
+                // Otherwise only if the application explicitly ships a signature.json file
+                $appNeedsToBeChecked = true;
+            }
+
+            if($appNeedsToBeChecked) {
+                $this->verifyAppSignature($appId);
+            }
+        }
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return bool
 	 */
 	public function isCodeCheckEnforced(): bool {
-		$notSignedChannels = [ '', 'git'];
+		$notSignedChannels = ['', 'git'];
 		if (\in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) {
 			return false;
 		}
@@ -140,7 +140,7 @@ 
 			$folderToIterate,
 			\RecursiveDirectoryIterator::SKIP_DOTS
 		);
-		if($root === '') {
+		if ($root === '') {
 			$root = \OC::$SERVERROOT;
 		}
 		$root = rtrim($root, '/');
@@ -167,9 +167,9 @@ 
 		$hashes = [];
 
 		$baseDirectoryLength = \strlen($path);
-		foreach($iterator as $filename => $data) {
+		foreach ($iterator as $filename => $data) {
 			/** @var \DirectoryIterator $data */
-			if($data->isDir()) {
+			if ($data->isDir()) {
 				continue;
 			}
 
@@ -177,11 +177,11 @@ 
 			$relativeFileName = ltrim($relativeFileName, '/');
 
 			// Exclude signature.json files in the appinfo and root folder
-			if($relativeFileName === 'appinfo/signature.json') {
+			if ($relativeFileName === 'appinfo/signature.json') {
 				continue;
 			}
 			// Exclude signature.json files in the appinfo and core folder
-			if($relativeFileName === 'core/signature.json') {
+			if ($relativeFileName === 'core/signature.json') {
 				continue;
 			}
 
@@ -192,18 +192,18 @@ 
 			// Thus we ignore everything below the first occurrence of
 			// "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" and have the
 			// hash generated based on this.
-			if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess') {
+			if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess') {
 				$fileContent = file_get_contents($filename);
 				$explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent);
-				if(\count($explodedArray) === 2) {
+				if (\count($explodedArray) === 2) {
 					$hashes[$relativeFileName] = hash('sha512', $explodedArray[0]);
 					continue;
 				}
 			}
-			if ($filename === $this->environmentHelper->getServerRoot() . '/core/js/mimetypelist.js') {
+			if ($filename === $this->environmentHelper->getServerRoot().'/core/js/mimetypelist.js') {
 				$oldMimetypeList = new GenerateMimetypeFileBuilder();
 				$newFile = $oldMimetypeList->generateFile($this->mimeTypeDetector->getAllAliases());
-				if($newFile === file_get_contents($filename)) {
+				if ($newFile === file_get_contents($filename)) {
 					$hashes[$relativeFileName] = hash('sha512', $oldMimetypeList->generateFile($this->mimeTypeDetector->getOnlyDefaultAliases()));
 					continue;
 				}
@@ -252,7 +252,7 @@ 
 	public function writeAppSignature($path,
 									  X509 $certificate,
 									  RSA $privateKey) {
-		$appInfoDir = $path . '/appinfo';
+		$appInfoDir = $path.'/appinfo';
 		try {
 			$this->fileAccessHelper->assertDirectoryExists($appInfoDir);
 
@@ -260,12 +260,12 @@ 
 			$hashes = $this->generateHashes($iterator, $path);
 			$signature = $this->createSignatureData($hashes, $certificate, $privateKey);
 				$this->fileAccessHelper->file_put_contents(
-					$appInfoDir . '/signature.json',
+					$appInfoDir.'/signature.json',
 				json_encode($signature, JSON_PRETTY_PRINT)
 			);
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			if (!$this->fileAccessHelper->is_writable($appInfoDir)) {
-				throw new \Exception($appInfoDir . ' is not writable');
+				throw new \Exception($appInfoDir.' is not writable');
 			}
 			throw $e;
 		}
@@ -282,7 +282,7 @@ 
 	public function writeCoreSignature(X509 $certificate,
 									   RSA $rsa,
 									   $path) {
-		$coreDir = $path . '/core';
+		$coreDir = $path.'/core';
 		try {
 
 			$this->fileAccessHelper->assertDirectoryExists($coreDir);
@@ -290,12 +290,12 @@ 
 			$hashes = $this->generateHashes($iterator, $path);
 			$signatureData = $this->createSignatureData($hashes, $certificate, $rsa);
 			$this->fileAccessHelper->file_put_contents(
-				$coreDir . '/signature.json',
+				$coreDir.'/signature.json',
 				json_encode($signatureData, JSON_PRETTY_PRINT)
 			);
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			if (!$this->fileAccessHelper->is_writable($coreDir)) {
-				throw new \Exception($coreDir . ' is not writable');
+				throw new \Exception($coreDir.' is not writable');
 			}
 			throw $e;
 		}
@@ -312,7 +312,7 @@ 
 	 * @throws \Exception
 	 */
 	private function verify(string $signaturePath, string $basePath, string $certificateCN): array {
-		if(!$this->isCodeCheckEnforced()) {
+		if (!$this->isCodeCheckEnforced()) {
 			return [];
 		}
 
@@ -322,7 +322,7 @@ 
 		if (\is_string($content)) {
 			$signatureData = json_decode($content, true);
 		}
-		if(!\is_array($signatureData)) {
+		if (!\is_array($signatureData)) {
 			throw new InvalidSignatureException('Signature data not found.');
 		}
 
@@ -336,11 +336,11 @@ 
 		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
 		$x509->loadCA($rootCertificatePublicKey);
 		$x509->loadX509($certificate);
-		if(!$x509->validateSignature()) {
+		if (!$x509->validateSignature()) {
 			throw new InvalidSignatureException('Certificate is not valid.');
 		}
 		// Verify if certificate has proper CN. "core" CN is always trusted.
-		if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
+		if ($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
 			throw new InvalidSignatureException(
 					sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN'])
 			);
@@ -353,7 +353,7 @@ 
 		$rsa->setMGFHash('sha512');
 		// See https://tools.ietf.org/html/rfc3447#page-38
 		$rsa->setSaltLength(0);
-		if(!$rsa->verify(json_encode($expectedHashes), $signature)) {
+		if (!$rsa->verify(json_encode($expectedHashes), $signature)) {
 			throw new InvalidSignatureException('Signature could not get verified.');
 		}
 
@@ -362,9 +362,9 @@ 
 		//
 		// Due to this reason we exclude the whole updater/ folder from the code
 		// integrity check.
-		if($basePath === $this->environmentHelper->getServerRoot()) {
-			foreach($expectedHashes as $fileName => $hash) {
-				if(strpos($fileName, 'updater/') === 0) {
+		if ($basePath === $this->environmentHelper->getServerRoot()) {
+			foreach ($expectedHashes as $fileName => $hash) {
+				if (strpos($fileName, 'updater/') === 0) {
 					unset($expectedHashes[$fileName]);
 				}
 			}
@@ -376,23 +376,23 @@ 
 		$differencesB = array_diff($currentInstanceHashes, $expectedHashes);
 		$differences = array_unique(array_merge($differencesA, $differencesB));
 		$differenceArray = [];
-		foreach($differences as $filename => $hash) {
+		foreach ($differences as $filename => $hash) {
 			// Check if file should not exist in the new signature table
-			if(!array_key_exists($filename, $expectedHashes)) {
+			if (!array_key_exists($filename, $expectedHashes)) {
 				$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
 				$differenceArray['EXTRA_FILE'][$filename]['current'] = $hash;
 				continue;
 			}
 
 			// Check if file is missing
-			if(!array_key_exists($filename, $currentInstanceHashes)) {
+			if (!array_key_exists($filename, $currentInstanceHashes)) {
 				$differenceArray['FILE_MISSING'][$filename]['expected'] = $expectedHashes[$filename];
 				$differenceArray['FILE_MISSING'][$filename]['current'] = '';
 				continue;
 			}
 
 			// Check if hash does mismatch
-			if($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
+			if ($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
 				$differenceArray['INVALID_HASH'][$filename]['expected'] = $expectedHashes[$filename];
 				$differenceArray['INVALID_HASH'][$filename]['current'] = $currentInstanceHashes[$filename];
 				continue;
@@ -412,7 +412,7 @@ 
 	 */
 	public function hasPassedCheck(): bool {
 		$results = $this->getResults();
-		if(empty($results)) {
+		if (empty($results)) {
 			return true;
 		}
 
@@ -424,7 +424,7 @@ 
 	 */
 	public function getResults(): array {
 		$cachedResults = $this->cache->get(self::CACHE_KEY);
-		if(!\is_null($cachedResults)) {
+		if (!\is_null($cachedResults)) {
 			return json_decode($cachedResults, true);
 		}
 
@@ -443,7 +443,7 @@ 
 	private function storeResults(string $scope, array $result) {
 		$resultArray = $this->getResults();
 		unset($resultArray[$scope]);
-		if(!empty($result)) {
+		if (!empty($result)) {
 			$resultArray[$scope] = $result;
 		}
 		if ($this->config !== null) {
@@ -495,11 +495,11 @@ 
 	 */
 	public function verifyAppSignature(string $appId, string $path = ''): array {
 		try {
-			if($path === '') {
+			if ($path === '') {
 				$path = $this->appLocator->getAppPath($appId);
 			}
 			$result = $this->verify(
-					$path . '/appinfo/signature.json',
+					$path.'/appinfo/signature.json',
 					$path,
 					$appId
 			);
@@ -549,7 +549,7 @@ 
 	public function verifyCoreSignature(): array {
 		try {
 			$result = $this->verify(
-					$this->environmentHelper->getServerRoot() . '/core/signature.json',
+					$this->environmentHelper->getServerRoot().'/core/signature.json',
 					$this->environmentHelper->getServerRoot(),
 					'core'
 			);
@@ -574,18 +574,18 @@ 
 		$this->cleanResults();
 		$this->verifyCoreSignature();
 		$appIds = $this->appLocator->getAllApps();
-		foreach($appIds as $appId) {
+		foreach ($appIds as $appId) {
 			// If an application is shipped a valid signature is required
 			$isShipped = $this->appManager->isShipped($appId);
 			$appNeedsToBeChecked = false;
 			if ($isShipped) {
 				$appNeedsToBeChecked = true;
-			} elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId) . '/appinfo/signature.json')) {
+			} elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId).'/appinfo/signature.json')) {
 				// Otherwise only if the application explicitly ships a signature.json file
 				$appNeedsToBeChecked = true;
 			}
 
-			if($appNeedsToBeChecked) {
+			if ($appNeedsToBeChecked) {
 				$this->verifyAppSignature($appId);
 			}
 		}

lib/private/Server.php

Indentation +1899 added lines, -1899 removed lines

@@ -168,1908 +168,1908 @@
  * 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;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-
-		$this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
-			return $c;
-		});
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-		$this->registerAlias('CalendarManager', \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-		$this->registerAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-		$this->registerAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
-			return new PreviewManager(
-				$c->getConfig(),
-				$c->getRootFolder(),
-				$c->getAppDataDir('preview'),
-				$c->getEventDispatcher(),
-				$c->getGeneratorHelper(),
-				$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(\OCP\Encryption\IManager::class, 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->registerAlias('EncryptionManager', \OCP\Encryption\IManager::class);
-
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\File(
-				$util,
-				$c->getRootFolder(),
-				$c->getShareManager()
-			);
-		});
-
-		$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', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$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(\OC\User\Manager::class, function (Server $c) {
-			return new \OC\User\Manager($c->getConfig(), $c->getEventDispatcher());
-		});
-		$this->registerAlias('UserManager', \OC\User\Manager::class);
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $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(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->getLogger();
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
-			$dbConnection = $c->getDatabaseConnection();
-			return new Authentication\Token\DefaultTokenMapper($dbConnection);
-		});
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::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(IProvider::class);
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$dispatcher = $c->getEventDispatcher();
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$defaultTokenProvider,
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getLockdownManager(),
-				$c->getLogger()
-			);
-			$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) use ($dispatcher) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
-				$dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($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) {
-				/** @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, $isTokenLogin) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', 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(\OCP\IUserSession::class, \OC\User\Session::class);
-		$this->registerAlias('UserSession', \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$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();
-			$request = $c->getRequest();
-			return new \OC\URLGenerator(
-				$config,
-				$cacheFactory,
-				$request
-			);
-		});
-		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
-
-		$this->registerAlias('AppFetcher', AppFetcher::class);
-		$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
-
-		$this->registerService(\OCP\ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		$this->registerAlias('UserCache', \OCP\ICache::class);
-
-		$this->registerService(Factory::class, function (Server $c) {
-
-			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			$config = $c->getConfig();
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode(',', \OC_Util::getVersion());
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-			return $arrayCacheFactory;
-
-		});
-		$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(AvatarManager::class, function(Server $c) {
-			return new AvatarManager(
-				$c->query(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias(\OCP\IAvatarManager::class, AvatarManager::class);
-		$this->registerAlias('AvatarManager', AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->getSystemConfig());
-			$logger = $factory->get($logType);
-			$registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->getSystemConfig(), null, $registry);
-		});
-		$this->registerAlias(\OCP\ILogger::class, \OC\Log::class);
-		$this->registerAlias('Logger', \OC\Log::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->getSystemConfig());
-		});
-
-		$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->isLocalCacheAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->createLocal('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(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
-			return new \OC\Security\RateLimiting\Limiter(
-				$this->getUserSession(),
-				$this->getRequest(),
-				new \OC\AppFramework\Utility\TimeFactory(),
-				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
-			);
-		});
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			return new \OC\Security\RateLimiting\Backend\MemoryCache(
-				$this->getMemCacheFactory(),
-				new \OC\AppFramework\Utility\TimeFactory()
-			);
-		});
-
-		$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(\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(),
-					$c->getSecureRandom()
-				)
-			);
-		});
-		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
-			$eventLogger = new EventLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$eventLogger->activate();
-			}
-			return $eventLogger;
-		});
-		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
-
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-		$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->query(\OC\AppConfig::class),
-				$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) {
-			$busClass = $c->getConfig()->getSystemValue('commandbus');
-			if ($busClass) {
-				list($app, $class) = explode('::', $busClass, 2);
-				if ($c->getAppManager()->isInstalled($app)) {
-					\OC_App::loadApp($app);
-					return $c->query($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->getJobList();
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
-			return new TrustedDomainHelper($this->getConfig());
-		});
-		$this->registerService(Throttler::class, function (Server $c) {
-			return new Throttler(
-				$c->getDatabaseConnection(),
-				new TimeFactory(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('Throttler', Throttler::class);
-		$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(),
-				$c->getMimeTypeDetector()
-			);
-		});
-		$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']
-						: '',
-					'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(ILockingProvider::class, 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,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-		$this->registerAlias('LockingProvider', ILockingProvider::class);
-
-		$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(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$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());
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			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', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
-				$manager = $c->getUserManager();
-				$user = $manager->get($id);
-				if(is_null($user)) {
-					$l = $c->getL10N('core');
-					$displayName = $l->t('Unknown user');
-				} else {
-					$displayName = $user->getDisplayName();
-				}
-				return $displayName;
-			});
-
-			return $manager;
-		});
-		$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;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+
+        $this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
+            return $c;
+        });
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+        $this->registerAlias('CalendarManager', \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+        $this->registerAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+        $this->registerAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+
+        $this->registerService(\OCP\IPreview::class, function (Server $c) {
+            return new PreviewManager(
+                $c->getConfig(),
+                $c->getRootFolder(),
+                $c->getAppDataDir('preview'),
+                $c->getEventDispatcher(),
+                $c->getGeneratorHelper(),
+                $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(\OCP\Encryption\IManager::class, 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->registerAlias('EncryptionManager', \OCP\Encryption\IManager::class);
+
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\File(
+                $util,
+                $c->getRootFolder(),
+                $c->getShareManager()
+            );
+        });
+
+        $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', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $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(\OC\User\Manager::class, function (Server $c) {
+            return new \OC\User\Manager($c->getConfig(), $c->getEventDispatcher());
+        });
+        $this->registerAlias('UserManager', \OC\User\Manager::class);
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $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(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->getLogger();
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
+            $dbConnection = $c->getDatabaseConnection();
+            return new Authentication\Token\DefaultTokenMapper($dbConnection);
+        });
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::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(IProvider::class);
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $dispatcher = $c->getEventDispatcher();
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $defaultTokenProvider,
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getLockdownManager(),
+                $c->getLogger()
+            );
+            $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) use ($dispatcher) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+                $dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($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) {
+                /** @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, $isTokenLogin) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', 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(\OCP\IUserSession::class, \OC\User\Session::class);
+        $this->registerAlias('UserSession', \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $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();
+            $request = $c->getRequest();
+            return new \OC\URLGenerator(
+                $config,
+                $cacheFactory,
+                $request
+            );
+        });
+        $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
+
+        $this->registerAlias('AppFetcher', AppFetcher::class);
+        $this->registerAlias('CategoryFetcher', CategoryFetcher::class);
+
+        $this->registerService(\OCP\ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        $this->registerAlias('UserCache', \OCP\ICache::class);
+
+        $this->registerService(Factory::class, function (Server $c) {
+
+            $arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            $config = $c->getConfig();
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode(',', \OC_Util::getVersion());
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path);
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+            return $arrayCacheFactory;
+
+        });
+        $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(AvatarManager::class, function(Server $c) {
+            return new AvatarManager(
+                $c->query(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias(\OCP\IAvatarManager::class, AvatarManager::class);
+        $this->registerAlias('AvatarManager', AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->getSystemConfig());
+            $logger = $factory->get($logType);
+            $registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->getSystemConfig(), null, $registry);
+        });
+        $this->registerAlias(\OCP\ILogger::class, \OC\Log::class);
+        $this->registerAlias('Logger', \OC\Log::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->getSystemConfig());
+        });
+
+        $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->isLocalCacheAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->createLocal('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(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
+            return new \OC\Security\RateLimiting\Limiter(
+                $this->getUserSession(),
+                $this->getRequest(),
+                new \OC\AppFramework\Utility\TimeFactory(),
+                $c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
+            );
+        });
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            return new \OC\Security\RateLimiting\Backend\MemoryCache(
+                $this->getMemCacheFactory(),
+                new \OC\AppFramework\Utility\TimeFactory()
+            );
+        });
+
+        $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(\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(),
+                    $c->getSecureRandom()
+                )
+            );
+        });
+        $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
+        $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+            $eventLogger = new EventLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $eventLogger->activate();
+            }
+            return $eventLogger;
+        });
+        $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
+
+        $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+        $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->query(\OC\AppConfig::class),
+                $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) {
+            $busClass = $c->getConfig()->getSystemValue('commandbus');
+            if ($busClass) {
+                list($app, $class) = explode('::', $busClass, 2);
+                if ($c->getAppManager()->isInstalled($app)) {
+                    \OC_App::loadApp($app);
+                    return $c->query($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->getJobList();
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerService('TrustedDomainHelper', function ($c) {
+            return new TrustedDomainHelper($this->getConfig());
+        });
+        $this->registerService(Throttler::class, function (Server $c) {
+            return new Throttler(
+                $c->getDatabaseConnection(),
+                new TimeFactory(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('Throttler', Throttler::class);
+        $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(),
+                $c->getMimeTypeDetector()
+            );
+        });
+        $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']
+                        : '',
+                    '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(ILockingProvider::class, 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,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+        $this->registerAlias('LockingProvider', ILockingProvider::class);
+
+        $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(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $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());
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->query(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            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', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function($id) use ($c) {
+                $manager = $c->getUserManager();
+                $user = $manager->get($id);
+                if(is_null($user)) {
+                    $l = $c->getL10N('core');
+                    $displayName = $l->t('Unknown user');
+                } else {
+                    $displayName = $user->getDisplayName();
+                }
+                return $displayName;
+            });
+
+            return $manager;
+        });
+        $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') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				return new ThemingDefaults(
-					$c->getConfig(),
-					$c->getL10N('theming'),
-					$c->getURLGenerator(),
-					$c->getMemCacheFactory(),
-					new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')),
-					new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()),
-					$c->getAppManager(),
-					$c->getNavigationManager()
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(SCSSCacher::class, function (Server $c) {
-			return new SCSSCacher(
-				$c->getLogger(),
-				$c->query(\OC\Files\AppData\Factory::class),
-				$c->getURLGenerator(),
-				$c->getConfig(),
-				$c->getThemingDefaults(),
-				\OC::$SERVERROOT,
-				$this->getMemCacheFactory(),
-				$c->query(IconsCacher::class),
-				new TimeFactory()
-			);
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->getURLGenerator(),
-				$this->getMemCacheFactory(),
-				$c->getSystemConfig(),
-				$c->getLogger()
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-		$this->registerAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
-		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::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', ProviderFactory::class);
-			/** @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('lib'),
-				$c->getL10NFactory(),
-				$factory,
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getEventDispatcher(),
-				$c->getMailer(),
-				$c->getURLGenerator(),
-				$c->getThemingDefaults()
-			);
-
-			return $manager;
-		});
-		$this->registerAlias('ShareManager', \OCP\Share\IManager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerService('SettingsManager', function (Server $c) {
-			$manager = new \OC\Settings\Manager(
-				$c->getLogger(),
-				$c->getL10NFactory(),
-				$c->getURLGenerator(),
-				$c
-			);
-			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();
-		});
-
-		$this->registerService(IConfig::class, function (Server $c) {
-			return new GlobalScale\Config($c->getConfig());
-		});
-
-		$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
-			return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
-		});
-
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
-
-		$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();
-		});
-
-		$this->registerService(IShareHelper::class, function (Server $c) {
-			return new ShareHelper(
-				$c->query(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(Installer::class, function(Server $c) {
-			return new Installer(
-				$c->getAppFetcher(),
-				$c->getHTTPClientService(),
-				$c->getTempManager(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-
-		$this->registerService(IApiFactory::class, function(Server $c) {
-			return new ApiFactory($c->getHTTPClientService());
-		});
-
-		$this->registerService(IInstanceFactory::class, function(Server $c) {
-			$memcacheFactory = $c->getMemCacheFactory();
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
-		});
-
-		$this->registerService(IContactsStore::class, function(Server $c) {
-			return new ContactsStore(
-				$c->getContactsManager(),
-				$c->getConfig(),
-				$c->getUserManager(),
-				$c->getGroupManager()
-			);
-		});
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
-
-		$this->registerService(IStorageFactory::class, function() {
-			return new StorageFactory();
-		});
-
-		$this->registerAlias(IDashboardManager::class, DashboardManager::class);
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-
-		$this->registerService(\OC\Security\IdentityProof\Manager::class, function (Server $c) {
-			return new \OC\Security\IdentityProof\Manager(
-				$c->query(\OC\Files\AppData\Factory::class),
-				$c->getCrypto(),
-				$c->getConfig()
-			);
-		});
-
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
-
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
-
-		$this->connectDispatcher();
-	}
-
-	/**
-	 * @return \OCP\Calendar\IManager
-	 */
-	public function getCalendarManager() {
-		return $this->query('CalendarManager');
-	}
-
-	/**
-	 * @return \OCP\Calendar\Resource\IManager
-	 */
-	public function getCalendarResourceBackendManager() {
-		return $this->query('CalendarResourceBackendManager');
-	}
-
-	/**
-	 * @return \OCP\Calendar\Room\IManager
-	 */
-	public function getCalendarRoomBackendManager() {
-		return $this->query('CalendarRoomBackendManager');
-	}
-
-	private function connectDispatcher() {
-		$dispatcher = $this->getEventDispatcher();
-
-		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
-			$logger = $this->getLogger();
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->remove();
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			} catch (\Exception $e) {
-				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
-			}
-		});
-
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-			$feature = $e->getArgument('feature');
-			$oldValue = $e->getArgument('oldValue');
-			$value = $e->getArgument('value');
-
-			// We only change the avatar on display name changes
-			if ($feature !== 'displayName') {
-				return;
-			}
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->userChanged($feature, $oldValue, $value);
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			}
-		});
-	}
-
-	/**
-	 * @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');
-	}
-
-	/**
-	 * @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 AppFetcher
-	 */
-	public function getAppFetcher() {
-		return $this->query(AppFetcher::class);
-	}
-
-	/**
-	 * 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');
-	}
-
-	/**
-	 * @return ILogFactory
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function getLogFactory() {
-		return $this->query(ILogFactory::class);
-	}
-
-	/**
-	 * 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');
-	}
-
-	/**
-	 * 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(),
-			$this->getSecureRandom()
-		);
-	}
-
-	/**
-	 * 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(\OC\EventDispatcher\SymfonyAdapter::class);
-	}
-
-	/**
-	 * 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');
-	}
-
-	/**
-	 * @return \OCP\Collaboration\Collaborators\ISearch
-	 */
-	public function getCollaboratorSearch() {
-		return $this->query('CollaboratorSearch');
-	}
-
-	/**
-	 * @return \OCP\Collaboration\AutoComplete\IManager
-	 */
-	public function getAutoCompleteManager(){
-		return $this->query(IManager::class);
-	}
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * @return \OCP\GlobalScale\IConfig
-	 */
-	public function getGlobalScaleConfig() {
-		return $this->query(IConfig::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationProviderManager
-	 */
-	public function getCloudFederationProviderManager() {
-		return $this->query(ICloudFederationProviderManager::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\Api\IApiFactory
-	 */
-	public function getRemoteApiFactory() {
-		return $this->query(IApiFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationFactory
-	 */
-	public function getCloudFederationFactory() {
-		return $this->query(ICloudFederationFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\IInstanceFactory
-	 */
-	public function getRemoteInstanceFactory() {
-		return $this->query(IInstanceFactory::class);
-	}
-
-	/**
-	 * @return IStorageFactory
-	 */
-	public function getStorageFactory() {
-		return $this->query(IStorageFactory::class);
-	}
-
-	/**
-	 * Get the Preview GeneratorHelper
-	 *
-	 * @return GeneratorHelper
-	 * @since 17.0.0
-	 */
-	public function getGeneratorHelper() {
-		return $this->query(\OC\Preview\GeneratorHelper::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') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                return new ThemingDefaults(
+                    $c->getConfig(),
+                    $c->getL10N('theming'),
+                    $c->getURLGenerator(),
+                    $c->getMemCacheFactory(),
+                    new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')),
+                    new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()),
+                    $c->getAppManager(),
+                    $c->getNavigationManager()
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(SCSSCacher::class, function (Server $c) {
+            return new SCSSCacher(
+                $c->getLogger(),
+                $c->query(\OC\Files\AppData\Factory::class),
+                $c->getURLGenerator(),
+                $c->getConfig(),
+                $c->getThemingDefaults(),
+                \OC::$SERVERROOT,
+                $this->getMemCacheFactory(),
+                $c->query(IconsCacher::class),
+                new TimeFactory()
+            );
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->getURLGenerator(),
+                $this->getMemCacheFactory(),
+                $c->getSystemConfig(),
+                $c->getLogger()
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+        $this->registerAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
+        $this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::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', ProviderFactory::class);
+            /** @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('lib'),
+                $c->getL10NFactory(),
+                $factory,
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getEventDispatcher(),
+                $c->getMailer(),
+                $c->getURLGenerator(),
+                $c->getThemingDefaults()
+            );
+
+            return $manager;
+        });
+        $this->registerAlias('ShareManager', \OCP\Share\IManager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerService('SettingsManager', function (Server $c) {
+            $manager = new \OC\Settings\Manager(
+                $c->getLogger(),
+                $c->getL10NFactory(),
+                $c->getURLGenerator(),
+                $c
+            );
+            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();
+        });
+
+        $this->registerService(IConfig::class, function (Server $c) {
+            return new GlobalScale\Config($c->getConfig());
+        });
+
+        $this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
+            return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
+        });
+
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
+
+        $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();
+        });
+
+        $this->registerService(IShareHelper::class, function (Server $c) {
+            return new ShareHelper(
+                $c->query(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(Installer::class, function(Server $c) {
+            return new Installer(
+                $c->getAppFetcher(),
+                $c->getHTTPClientService(),
+                $c->getTempManager(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+
+        $this->registerService(IApiFactory::class, function(Server $c) {
+            return new ApiFactory($c->getHTTPClientService());
+        });
+
+        $this->registerService(IInstanceFactory::class, function(Server $c) {
+            $memcacheFactory = $c->getMemCacheFactory();
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
+        });
+
+        $this->registerService(IContactsStore::class, function(Server $c) {
+            return new ContactsStore(
+                $c->getContactsManager(),
+                $c->getConfig(),
+                $c->getUserManager(),
+                $c->getGroupManager()
+            );
+        });
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
+
+        $this->registerService(IStorageFactory::class, function() {
+            return new StorageFactory();
+        });
+
+        $this->registerAlias(IDashboardManager::class, DashboardManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+
+        $this->registerService(\OC\Security\IdentityProof\Manager::class, function (Server $c) {
+            return new \OC\Security\IdentityProof\Manager(
+                $c->query(\OC\Files\AppData\Factory::class),
+                $c->getCrypto(),
+                $c->getConfig()
+            );
+        });
+
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
+
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
+
+        $this->connectDispatcher();
+    }
+
+    /**
+     * @return \OCP\Calendar\IManager
+     */
+    public function getCalendarManager() {
+        return $this->query('CalendarManager');
+    }
+
+    /**
+     * @return \OCP\Calendar\Resource\IManager
+     */
+    public function getCalendarResourceBackendManager() {
+        return $this->query('CalendarResourceBackendManager');
+    }
+
+    /**
+     * @return \OCP\Calendar\Room\IManager
+     */
+    public function getCalendarRoomBackendManager() {
+        return $this->query('CalendarRoomBackendManager');
+    }
+
+    private function connectDispatcher() {
+        $dispatcher = $this->getEventDispatcher();
+
+        // Delete avatar on user deletion
+        $dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
+            $logger = $this->getLogger();
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->remove();
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            } catch (\Exception $e) {
+                // Ignore exceptions
+                $logger->info('Could not cleanup avatar of ' . $user->getUID());
+            }
+        });
+
+        $dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+            $feature = $e->getArgument('feature');
+            $oldValue = $e->getArgument('oldValue');
+            $value = $e->getArgument('value');
+
+            // We only change the avatar on display name changes
+            if ($feature !== 'displayName') {
+                return;
+            }
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->userChanged($feature, $oldValue, $value);
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            }
+        });
+    }
+
+    /**
+     * @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');
+    }
+
+    /**
+     * @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 AppFetcher
+     */
+    public function getAppFetcher() {
+        return $this->query(AppFetcher::class);
+    }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * @return ILogFactory
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function getLogFactory() {
+        return $this->query(ILogFactory::class);
+    }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * 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(),
+            $this->getSecureRandom()
+        );
+    }
+
+    /**
+     * 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(\OC\EventDispatcher\SymfonyAdapter::class);
+    }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * @return \OCP\Collaboration\Collaborators\ISearch
+     */
+    public function getCollaboratorSearch() {
+        return $this->query('CollaboratorSearch');
+    }
+
+    /**
+     * @return \OCP\Collaboration\AutoComplete\IManager
+     */
+    public function getAutoCompleteManager(){
+        return $this->query(IManager::class);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * @return \OCP\GlobalScale\IConfig
+     */
+    public function getGlobalScaleConfig() {
+        return $this->query(IConfig::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationProviderManager
+     */
+    public function getCloudFederationProviderManager() {
+        return $this->query(ICloudFederationProviderManager::class);
+    }
+
+    /**
+     * @return \OCP\Remote\Api\IApiFactory
+     */
+    public function getRemoteApiFactory() {
+        return $this->query(IApiFactory::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationFactory
+     */
+    public function getCloudFederationFactory() {
+        return $this->query(ICloudFederationFactory::class);
+    }
+
+    /**
+     * @return \OCP\Remote\IInstanceFactory
+     */
+    public function getRemoteInstanceFactory() {
+        return $this->query(IInstanceFactory::class);
+    }
+
+    /**
+     * @return IStorageFactory
+     */
+    public function getStorageFactory() {
+        return $this->query(IStorageFactory::class);
+    }
+
+    /**
+     * Get the Preview GeneratorHelper
+     *
+     * @return GeneratorHelper
+     * @since 17.0.0
+     */
+    public function getGeneratorHelper() {
+        return $this->query(\OC\Preview\GeneratorHelper::class);
+    }
 }

Spacing +114 added lines, -114 removed lines

@@ -182,7 +182,7 @@ 
 		// To find out if we are running from CLI or not
 		$this->registerParameter('isCLI', \OC::$CLI);
 
-		$this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(IServerContainer $c) {
 			return $c;
 		});
 
@@ -201,7 +201,7 @@ 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
 
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
+		$this->registerService(\OCP\IPreview::class, function(Server $c) {
 			return new PreviewManager(
 				$c->getConfig(),
 				$c->getRootFolder(),
@@ -213,13 +213,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(\OCP\Encryption\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Encryption\IManager::class, function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -238,7 +238,7 @@ 
 		});
 		$this->registerAlias('EncryptionManager', \OCP\Encryption\IManager::class);
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -252,7 +252,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
+		$this->registerService('EncryptionKeyStorage', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -263,30 +263,30 @@ 
 
 			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', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$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(
@@ -307,37 +307,37 @@ 
 		});
 		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
 
-		$this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
-			return new LazyRoot(function () use ($c) {
+		$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(\OC\User\Manager::class, function (Server $c) {
+		$this->registerService(\OC\User\Manager::class, function(Server $c) {
 			return new \OC\User\Manager($c->getConfig(), $c->getEventDispatcher());
 		});
 		$this->registerAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $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()));
@@ -346,7 +346,7 @@ 
 		});
 		$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
 
-		$this->registerService(Store::class, function (Server $c) {
+		$this->registerService(Store::class, function(Server $c) {
 			$session = $c->getSession();
 			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 				$tokenProvider = $c->query(IProvider::class);
@@ -357,13 +357,13 @@ 
 			return new Store($session, $logger, $tokenProvider);
 		});
 		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
+		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function(Server $c) {
 			$dbConnection = $c->getDatabaseConnection();
 			return new Authentication\Token\DefaultTokenMapper($dbConnection);
 		});
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -387,45 +387,45 @@ 
 				$c->getLockdownManager(),
 				$c->getLogger()
 			);
-			$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) use ($dispatcher) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) use ($dispatcher) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
 				$dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
 			});
-			$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, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $password, $isTokenLogin) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', 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));
 			});
@@ -439,7 +439,7 @@ 
 		$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()
 			);
@@ -447,17 +447,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(),
@@ -467,7 +467,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();
 			$request = $c->getRequest();
@@ -482,12 +482,12 @@ 
 		$this->registerAlias('AppFetcher', AppFetcher::class);
 		$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
 
-		$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) {
 
 			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
 				ArrayCache::class,
@@ -502,7 +502,7 @@ 
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -515,12 +515,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(),
@@ -530,7 +530,7 @@ 
 		});
 		$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')
 			);
@@ -552,7 +552,7 @@ 
 		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
 		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
 
-		$this->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->getSystemConfig());
 			$logger = $factory->get($logType);
@@ -563,11 +563,11 @@ 
 		$this->registerAlias(\OCP\ILogger::class, \OC\Log::class);
 		$this->registerAlias('Logger', \OC\Log::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->getSystemConfig());
 		});
 
-		$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(),
@@ -577,7 +577,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->isLocalCacheAvailable()) {
@@ -589,12 +589,12 @@ 
 		});
 		$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(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
+		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function(Server $c) {
 			return new \OC\Security\RateLimiting\Limiter(
 				$this->getUserSession(),
 				$this->getRequest(),
@@ -602,34 +602,34 @@ 
 				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
 			);
 		});
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			return new \OC\Security\RateLimiting\Backend\MemoryCache(
 				$this->getMemCacheFactory(),
 				new \OC\AppFramework\Utility\TimeFactory()
 			);
 		});
 
-		$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');
@@ -644,7 +644,7 @@ 
 		$this->registerAlias('DatabaseConnection', IDBConnection::class);
 
 
-		$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(
@@ -659,7 +659,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) {
 			$eventLogger = new EventLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -669,7 +669,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) {
 			$queryLogger = new QueryLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -679,7 +679,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()
@@ -688,7 +688,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->query(\OC\AppConfig::class),
@@ -700,7 +700,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()
@@ -708,7 +708,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(
@@ -718,7 +718,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());
@@ -726,7 +726,7 @@ 
 		});
 		$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);
@@ -742,10 +742,10 @@ 
 		});
 		$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) {
 			$busClass = $c->getConfig()->getSystemValue('commandbus');
 			if ($busClass) {
 				list($app, $class) = explode('::', $busClass, 2);
@@ -760,10 +760,10 @@ 
 				return new CronBus($jobList);
 			}
 		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
+		$this->registerService('TrustedDomainHelper', function($c) {
 			return new TrustedDomainHelper($this->getConfig());
 		});
-		$this->registerService(Throttler::class, function (Server $c) {
+		$this->registerService(Throttler::class, function(Server $c) {
 			return new Throttler(
 				$c->getDatabaseConnection(),
 				new TimeFactory(),
@@ -772,7 +772,7 @@ 
 			);
 		});
 		$this->registerAlias('Throttler', Throttler::class);
-		$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)) {
@@ -794,7 +794,7 @@ 
 				$c->getMimeTypeDetector()
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
+		$this->registerService(\OCP\IRequest::class, function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -830,7 +830,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(),
@@ -841,7 +841,7 @@ 
 		});
 		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
 
-		$this->registerService('LDAPProvider', function (Server $c) {
+		$this->registerService('LDAPProvider', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass)) {
@@ -851,7 +851,7 @@ 
 			$factory = new $factoryClass($this);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (Server $c) {
+		$this->registerService(ILockingProvider::class, function(Server $c) {
 			$ini = $c->getIniWrapper();
 			$config = $c->getConfig();
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -874,49 +874,49 @@ 
 		});
 		$this->registerAlias('LockingProvider', ILockingProvider::class);
 
-		$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(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
-		$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());
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
 		});
 		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
 
-		$this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
+		$this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
@@ -926,7 +926,7 @@ 
 			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->getUserManager();
 				$user = $manager->get($id);
-				if(is_null($user)) {
+				if (is_null($user)) {
 					$l = $c->getL10N('core');
 					$displayName = $l->t('Unknown user');
 				} else {
@@ -939,7 +939,7 @@ 
 		});
 		$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
 
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			/*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
@@ -967,7 +967,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(SCSSCacher::class, function (Server $c) {
+		$this->registerService(SCSSCacher::class, function(Server $c) {
 			return new SCSSCacher(
 				$c->getLogger(),
 				$c->query(\OC\Files\AppData\Factory::class),
@@ -980,7 +980,7 @@ 
 				new TimeFactory()
 			);
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->getURLGenerator(),
@@ -993,7 +993,7 @@ 
 		$this->registerAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
 		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
 
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1018,7 +1018,7 @@ 
 				$request
 			);
 		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
+		$this->registerService('CsrfTokenManager', function(Server $c) {
 			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
 
 			return new CsrfTokenManager(
@@ -1026,22 +1026,22 @@ 
 				$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);
 
-		$this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
+		$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
 			return new ContentSecurityPolicyNonceManager(
 				$c->getCsrfTokenManager(),
 				$c->getRequest()
 			);
 		});
 
-		$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Share\IManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1088,7 +1088,7 @@ 
 
 		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
 
-		$this->registerService('SettingsManager', function (Server $c) {
+		$this->registerService('SettingsManager', function(Server $c) {
 			$manager = new \OC\Settings\Manager(
 				$c->getLogger(),
 				$c->getL10NFactory(),
@@ -1097,36 +1097,36 @@ 
 			);
 			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) {
-			return new LockdownManager(function () use ($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();
 		});
 
-		$this->registerService(IConfig::class, function (Server $c) {
+		$this->registerService(IConfig::class, function(Server $c) {
 			return new GlobalScale\Config($c->getConfig());
 		});
 
-		$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
+		$this->registerService(ICloudFederationProviderManager::class, function(Server $c) {
 			return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
 		});
 
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1136,18 +1136,18 @@ 
 		$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()
 			);
 		});
 		$this->registerAlias('Defaults', \OCP\Defaults::class);
 
-		$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
+		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
 			return $c->query(\OCP\IUserSession::class)->getSession();
 		});
 
-		$this->registerService(IShareHelper::class, function (Server $c) {
+		$this->registerService(IShareHelper::class, function(Server $c) {
 			return new ShareHelper(
 				$c->query(\OCP\Share\IManager::class)
 			);
@@ -1190,7 +1190,7 @@ 
 		$this->registerAlias(IDashboardManager::class, DashboardManager::class);
 		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
 
-		$this->registerService(\OC\Security\IdentityProof\Manager::class, function (Server $c) {
+		$this->registerService(\OC\Security\IdentityProof\Manager::class, function(Server $c) {
 			return new \OC\Security\IdentityProof\Manager(
 				$c->query(\OC\Files\AppData\Factory::class),
 				$c->getCrypto(),
@@ -1243,11 +1243,11 @@ 
 				// no avatar to remove
 			} catch (\Exception $e) {
 				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
+				$logger->info('Could not cleanup avatar of '.$user->getUID());
 			}
 		});
 
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::changeUser', function(GenericEvent $e) {
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
 			$user = $e->getSubject();
@@ -1403,7 +1403,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);
@@ -1978,7 +1978,7 @@ 
 	/**
 	 * @return \OCP\Collaboration\AutoComplete\IManager
 	 */
-	public function getAutoCompleteManager(){
+	public function getAutoCompleteManager() {
 		return $this->query(IManager::class);
 	}
 

lib/private/Files/Type/Detection.php

Indentation +293 added lines, -293 removed lines

@@ -44,297 +44,297 @@
  * @package OC\Files\Type
  */
 class Detection implements IMimeTypeDetector {
-	protected $mimetypes = [];
-	protected $secureMimeTypes = [];
-
-	protected $mimetypeIcons = [];
-	/** @var string[] */
-	protected $mimeTypeAlias = [];
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var string */
-	private $customConfigDir;
-
-	/** @var string */
-	private $defaultConfigDir;
-
-	/**
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $customConfigDir
-	 * @param string $defaultConfigDir
-	 */
-	public function __construct(IURLGenerator $urlGenerator,
-								$customConfigDir,
-								$defaultConfigDir) {
-		$this->urlGenerator = $urlGenerator;
-		$this->customConfigDir = $customConfigDir;
-		$this->defaultConfigDir = $defaultConfigDir;
-	}
-
-	/**
-	 * Add an extension -> mimetype mapping
-	 *
-	 * $mimetype is the assumed correct mime type
-	 * The optional $secureMimeType is an alternative to send to send
-	 * to avoid potential XSS.
-	 *
-	 * @param string $extension
-	 * @param string $mimetype
-	 * @param string|null $secureMimeType
-	 */
-	public function registerType($extension,
-								 $mimetype,
-								 $secureMimeType = null) {
-		$this->mimetypes[$extension] = array($mimetype, $secureMimeType);
-		$this->secureMimeTypes[$mimetype] = $secureMimeType ?: $mimetype;
-	}
-
-	/**
-	 * Add an array of extension -> mimetype mappings
-	 *
-	 * The mimetype value is in itself an array where the first index is
-	 * the assumed correct mimetype and the second is either a secure alternative
-	 * or null if the correct is considered secure.
-	 *
-	 * @param array $types
-	 */
-	public function registerTypeArray($types) {
-		$this->mimetypes = array_merge($this->mimetypes, $types);
-
-		// Update the alternative mimetypes to avoid having to look them up each time.
-		foreach ($this->mimetypes as $mimeType) {
-			$this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1]: $mimeType[0];
-		}
-	}
-
-	/**
-	 * Add the mimetype aliases if they are not yet present
-	 */
-	private function loadAliases() {
-		if (!empty($this->mimeTypeAlias)) {
-			return;
-		}
-
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
-
-		if (file_exists($this->customConfigDir . '/mimetypealiases.json')) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypealiases.json'), true);
-			$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
-		}
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getAllAliases() {
-		$this->loadAliases();
-		return $this->mimeTypeAlias;
-	}
-
-	public function getOnlyDefaultAliases() {
-		$this->loadMappings();
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
-		return $this->mimeTypeAlias;
-	}
-
-	/**
-	 * Add mimetype mappings if they are not yet present
-	 */
-	private function loadMappings() {
-		if (!empty($this->mimetypes)) {
-			return;
-		}
-
-		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
-
-		//Check if need to load custom mappings
-		if (file_exists($this->customConfigDir . '/mimetypemapping.json')) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypemapping.json'), true);
-			$mimetypeMapping = array_merge($mimetypeMapping, $custom);
-		}
-
-		$this->registerTypeArray($mimetypeMapping);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllMappings() {
-		$this->loadMappings();
-		return $this->mimetypes;
-	}
-
-	/**
-	 * detect mimetype only based on filename, content of file is not used
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function detectPath($path) {
-		$this->loadMappings();
-
-		$fileName = basename($path);
-
-		// remove leading dot on hidden files with a file extension
-		$fileName = ltrim($fileName, '.');
-
-		// note: leading dot doesn't qualify as extension
-		if (strpos($fileName, '.') > 0) {
-
-			// remove versioning extension: name.v1508946057 and transfer extension: name.ocTransferId2057600214.part
-			$fileName = preg_replace('!((\.v\d+)|((.ocTransferId\d+)?.part))$!', '', $fileName);
-
-			//try to guess the type by the file extension
-			$extension = strtolower(strrchr($fileName, '.'));
-			$extension = substr($extension, 1); //remove leading .
-			return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0]))
-				? $this->mimetypes[$extension][0]
-				: 'application/octet-stream';
-		} else {
-			return 'application/octet-stream';
-		}
-	}
-
-	/**
-	 * detect mimetype based on both filename and content
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function detect($path) {
-		$this->loadMappings();
-
-		if (@is_dir($path)) {
-			// directories are easy
-			return "httpd/unix-directory";
-		}
-
-		$mimeType = $this->detectPath($path);
-
-		if ($mimeType === 'application/octet-stream' and function_exists('finfo_open')
-			and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
-		) {
-			$info = @strtolower(finfo_file($finfo, $path));
-			finfo_close($finfo);
-			if ($info) {
-				$mimeType = strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
-				return empty($mimeType) ? 'application/octet-stream' : $mimeType;
-			}
-
-		}
-		$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
-		if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
-			// use mime magic extension if available
-			$mimeType = mime_content_type($path);
-		}
-		if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) {
-			// it looks like we have a 'file' command,
-			// lets see if it does have mime support
-			$path = escapeshellarg($path);
-			$fp = popen("file -b --mime-type $path 2>/dev/null", "r");
-			$reply = fgets($fp);
-			pclose($fp);
-
-			//trim the newline
-			$mimeType = trim($reply);
-
-			if (empty($mimeType)) {
-				$mimeType = 'application/octet-stream';
-			}
-
-		}
-		return $mimeType;
-	}
-
-	/**
-	 * detect mimetype based on the content of a string
-	 *
-	 * @param string $data
-	 * @return string
-	 */
-	public function detectString($data) {
-		if (function_exists('finfo_open') and function_exists('finfo_file')) {
-			$finfo = finfo_open(FILEINFO_MIME);
-			$info = finfo_buffer($finfo, $data);
-			return strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
-		} else {
-			$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
-			$fh = fopen($tmpFile, 'wb');
-			fwrite($fh, $data, 8024);
-			fclose($fh);
-			$mime = $this->detect($tmpFile);
-			unset($tmpFile);
-			return $mime;
-		}
-	}
-
-	/**
-	 * Get a secure mimetype that won't expose potential XSS.
-	 *
-	 * @param string $mimeType
-	 * @return string
-	 */
-	public function getSecureMimeType($mimeType) {
-		$this->loadMappings();
-
-		return isset($this->secureMimeTypes[$mimeType])
-			? $this->secureMimeTypes[$mimeType]
-			: 'application/octet-stream';
-	}
-
-	/**
-	 * Get path to the icon of a file type
-	 * @param string $mimetype the MIME type
-	 * @return string the url
-	 */
-	public function mimeTypeIcon($mimetype) {
-		$this->loadAliases();
-
-		while (isset($this->mimeTypeAlias[$mimetype])) {
-			$mimetype = $this->mimeTypeAlias[$mimetype];
-		}
-		if (isset($this->mimetypeIcons[$mimetype])) {
-			return $this->mimetypeIcons[$mimetype];
-		}
-
-		// Replace slash and backslash with a minus
-		$icon = str_replace('/', '-', $mimetype);
-		$icon = str_replace('\\', '-', $icon);
-
-		// Is it a dir?
-		if ($mimetype === 'dir') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.svg');
-			return $this->mimetypeIcons[$mimetype];
-		}
-		if ($mimetype === 'dir-shared') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.svg');
-			return $this->mimetypeIcons[$mimetype];
-		}
-		if ($mimetype === 'dir-external') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.svg');
-			return $this->mimetypeIcons[$mimetype];
-		}
-
-		// Icon exists?
-		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
-			return $this->mimetypeIcons[$mimetype];
-		} catch (\RuntimeException $e) {
-			// Specified image not found
-		}
-
-		// Try only the first part of the filetype
-		$mimePart = substr($icon, 0, strpos($icon, '-'));
-		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
-			return $this->mimetypeIcons[$mimetype];
-		} catch (\RuntimeException $e) {
-			// Image for the first part of the mimetype not found
-		}
-
-		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.svg');
-		return $this->mimetypeIcons[$mimetype];
-	}
+    protected $mimetypes = [];
+    protected $secureMimeTypes = [];
+
+    protected $mimetypeIcons = [];
+    /** @var string[] */
+    protected $mimeTypeAlias = [];
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var string */
+    private $customConfigDir;
+
+    /** @var string */
+    private $defaultConfigDir;
+
+    /**
+     * @param IURLGenerator $urlGenerator
+     * @param string $customConfigDir
+     * @param string $defaultConfigDir
+     */
+    public function __construct(IURLGenerator $urlGenerator,
+                                $customConfigDir,
+                                $defaultConfigDir) {
+        $this->urlGenerator = $urlGenerator;
+        $this->customConfigDir = $customConfigDir;
+        $this->defaultConfigDir = $defaultConfigDir;
+    }
+
+    /**
+     * Add an extension -> mimetype mapping
+     *
+     * $mimetype is the assumed correct mime type
+     * The optional $secureMimeType is an alternative to send to send
+     * to avoid potential XSS.
+     *
+     * @param string $extension
+     * @param string $mimetype
+     * @param string|null $secureMimeType
+     */
+    public function registerType($extension,
+                                    $mimetype,
+                                    $secureMimeType = null) {
+        $this->mimetypes[$extension] = array($mimetype, $secureMimeType);
+        $this->secureMimeTypes[$mimetype] = $secureMimeType ?: $mimetype;
+    }
+
+    /**
+     * Add an array of extension -> mimetype mappings
+     *
+     * The mimetype value is in itself an array where the first index is
+     * the assumed correct mimetype and the second is either a secure alternative
+     * or null if the correct is considered secure.
+     *
+     * @param array $types
+     */
+    public function registerTypeArray($types) {
+        $this->mimetypes = array_merge($this->mimetypes, $types);
+
+        // Update the alternative mimetypes to avoid having to look them up each time.
+        foreach ($this->mimetypes as $mimeType) {
+            $this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1]: $mimeType[0];
+        }
+    }
+
+    /**
+     * Add the mimetype aliases if they are not yet present
+     */
+    private function loadAliases() {
+        if (!empty($this->mimeTypeAlias)) {
+            return;
+        }
+
+        $this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+
+        if (file_exists($this->customConfigDir . '/mimetypealiases.json')) {
+            $custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypealiases.json'), true);
+            $this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAllAliases() {
+        $this->loadAliases();
+        return $this->mimeTypeAlias;
+    }
+
+    public function getOnlyDefaultAliases() {
+        $this->loadMappings();
+        $this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+        return $this->mimeTypeAlias;
+    }
+
+    /**
+     * Add mimetype mappings if they are not yet present
+     */
+    private function loadMappings() {
+        if (!empty($this->mimetypes)) {
+            return;
+        }
+
+        $mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
+
+        //Check if need to load custom mappings
+        if (file_exists($this->customConfigDir . '/mimetypemapping.json')) {
+            $custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypemapping.json'), true);
+            $mimetypeMapping = array_merge($mimetypeMapping, $custom);
+        }
+
+        $this->registerTypeArray($mimetypeMapping);
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllMappings() {
+        $this->loadMappings();
+        return $this->mimetypes;
+    }
+
+    /**
+     * detect mimetype only based on filename, content of file is not used
+     *
+     * @param string $path
+     * @return string
+     */
+    public function detectPath($path) {
+        $this->loadMappings();
+
+        $fileName = basename($path);
+
+        // remove leading dot on hidden files with a file extension
+        $fileName = ltrim($fileName, '.');
+
+        // note: leading dot doesn't qualify as extension
+        if (strpos($fileName, '.') > 0) {
+
+            // remove versioning extension: name.v1508946057 and transfer extension: name.ocTransferId2057600214.part
+            $fileName = preg_replace('!((\.v\d+)|((.ocTransferId\d+)?.part))$!', '', $fileName);
+
+            //try to guess the type by the file extension
+            $extension = strtolower(strrchr($fileName, '.'));
+            $extension = substr($extension, 1); //remove leading .
+            return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0]))
+                ? $this->mimetypes[$extension][0]
+                : 'application/octet-stream';
+        } else {
+            return 'application/octet-stream';
+        }
+    }
+
+    /**
+     * detect mimetype based on both filename and content
+     *
+     * @param string $path
+     * @return string
+     */
+    public function detect($path) {
+        $this->loadMappings();
+
+        if (@is_dir($path)) {
+            // directories are easy
+            return "httpd/unix-directory";
+        }
+
+        $mimeType = $this->detectPath($path);
+
+        if ($mimeType === 'application/octet-stream' and function_exists('finfo_open')
+            and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
+        ) {
+            $info = @strtolower(finfo_file($finfo, $path));
+            finfo_close($finfo);
+            if ($info) {
+                $mimeType = strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
+                return empty($mimeType) ? 'application/octet-stream' : $mimeType;
+            }
+
+        }
+        $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
+        if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
+            // use mime magic extension if available
+            $mimeType = mime_content_type($path);
+        }
+        if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) {
+            // it looks like we have a 'file' command,
+            // lets see if it does have mime support
+            $path = escapeshellarg($path);
+            $fp = popen("file -b --mime-type $path 2>/dev/null", "r");
+            $reply = fgets($fp);
+            pclose($fp);
+
+            //trim the newline
+            $mimeType = trim($reply);
+
+            if (empty($mimeType)) {
+                $mimeType = 'application/octet-stream';
+            }
+
+        }
+        return $mimeType;
+    }
+
+    /**
+     * detect mimetype based on the content of a string
+     *
+     * @param string $data
+     * @return string
+     */
+    public function detectString($data) {
+        if (function_exists('finfo_open') and function_exists('finfo_file')) {
+            $finfo = finfo_open(FILEINFO_MIME);
+            $info = finfo_buffer($finfo, $data);
+            return strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
+        } else {
+            $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+            $fh = fopen($tmpFile, 'wb');
+            fwrite($fh, $data, 8024);
+            fclose($fh);
+            $mime = $this->detect($tmpFile);
+            unset($tmpFile);
+            return $mime;
+        }
+    }
+
+    /**
+     * Get a secure mimetype that won't expose potential XSS.
+     *
+     * @param string $mimeType
+     * @return string
+     */
+    public function getSecureMimeType($mimeType) {
+        $this->loadMappings();
+
+        return isset($this->secureMimeTypes[$mimeType])
+            ? $this->secureMimeTypes[$mimeType]
+            : 'application/octet-stream';
+    }
+
+    /**
+     * Get path to the icon of a file type
+     * @param string $mimetype the MIME type
+     * @return string the url
+     */
+    public function mimeTypeIcon($mimetype) {
+        $this->loadAliases();
+
+        while (isset($this->mimeTypeAlias[$mimetype])) {
+            $mimetype = $this->mimeTypeAlias[$mimetype];
+        }
+        if (isset($this->mimetypeIcons[$mimetype])) {
+            return $this->mimetypeIcons[$mimetype];
+        }
+
+        // Replace slash and backslash with a minus
+        $icon = str_replace('/', '-', $mimetype);
+        $icon = str_replace('\\', '-', $icon);
+
+        // Is it a dir?
+        if ($mimetype === 'dir') {
+            $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.svg');
+            return $this->mimetypeIcons[$mimetype];
+        }
+        if ($mimetype === 'dir-shared') {
+            $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.svg');
+            return $this->mimetypeIcons[$mimetype];
+        }
+        if ($mimetype === 'dir-external') {
+            $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.svg');
+            return $this->mimetypeIcons[$mimetype];
+        }
+
+        // Icon exists?
+        try {
+            $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+            return $this->mimetypeIcons[$mimetype];
+        } catch (\RuntimeException $e) {
+            // Specified image not found
+        }
+
+        // Try only the first part of the filetype
+        $mimePart = substr($icon, 0, strpos($icon, '-'));
+        try {
+            $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+            return $this->mimetypeIcons[$mimetype];
+        } catch (\RuntimeException $e) {
+            // Image for the first part of the mimetype not found
+        }
+
+        $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.svg');
+        return $this->mimetypeIcons[$mimetype];
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -105,7 +105,7 @@ 
 
 		// Update the alternative mimetypes to avoid having to look them up each time.
 		foreach ($this->mimetypes as $mimeType) {
-			$this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1]: $mimeType[0];
+			$this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1] : $mimeType[0];
 		}
 	}
 
@@ -117,10 +117,10 @@ 
 			return;
 		}
 
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 
-		if (file_exists($this->customConfigDir . '/mimetypealiases.json')) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypealiases.json'), true);
+		if (file_exists($this->customConfigDir.'/mimetypealiases.json')) {
+			$custom = json_decode(file_get_contents($this->customConfigDir.'/mimetypealiases.json'), true);
 			$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
 		}
 	}
@@ -135,7 +135,7 @@ 
 
 	public function getOnlyDefaultAliases() {
 		$this->loadMappings();
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		return $this->mimeTypeAlias;
 	}
 
@@ -147,11 +147,11 @@ 
 			return;
 		}
 
-		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
+		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypemapping.dist.json'), true);
 
 		//Check if need to load custom mappings
-		if (file_exists($this->customConfigDir . '/mimetypemapping.json')) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypemapping.json'), true);
+		if (file_exists($this->customConfigDir.'/mimetypemapping.json')) {
+			$custom = json_decode(file_get_contents($this->customConfigDir.'/mimetypemapping.json'), true);
 			$mimetypeMapping = array_merge($mimetypeMapping, $custom);
 		}
 
@@ -319,7 +319,7 @@ 
 
 		// Icon exists?
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$icon.'.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -328,7 +328,7 @@ 
 		// Try only the first part of the filetype
 		$mimePart = substr($icon, 0, strpos($icon, '-'));
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$mimePart.'.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Image for the first part of the mimetype not found