nextcloud / server

lib/public/Files/Config/ICachedMountInfo.php

Indentation +46 added lines, -46 removed lines

@@ -31,57 +31,57 @@
  * @since 9.0.0
  */
 interface ICachedMountInfo {
-	/**
-	 * @return IUser
-	 * @since 9.0.0
-	 */
-	public function getUser(): IUser;
+    /**
+     * @return IUser
+     * @since 9.0.0
+     */
+    public function getUser(): IUser;
 
-	/**
-	 * @return int the numeric storage id of the mount
-	 * @since 9.0.0
-	 */
-	public function getStorageId(): int;
+    /**
+     * @return int the numeric storage id of the mount
+     * @since 9.0.0
+     */
+    public function getStorageId(): int;
 
-	/**
-	 * @return int the fileid of the root of the mount
-	 * @since 9.0.0
-	 */
-	public function getRootId(): int;
+    /**
+     * @return int the fileid of the root of the mount
+     * @since 9.0.0
+     */
+    public function getRootId(): int;
 
-	/**
-	 * @return Node|null the root node of the mount
-	 * @since 9.0.0
-	 */
-	public function getMountPointNode(): ?Node;
+    /**
+     * @return Node|null the root node of the mount
+     * @since 9.0.0
+     */
+    public function getMountPointNode(): ?Node;
 
-	/**
-	 * @return string the mount point of the mount for the user
-	 * @since 9.0.0
-	 */
-	public function getMountPoint(): string;
+    /**
+     * @return string the mount point of the mount for the user
+     * @since 9.0.0
+     */
+    public function getMountPoint(): string;
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId(): ?int;
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId(): ?int;
 
-	/**
-	 * Get the internal path (within the storage) of the root of the mount
-	 *
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRootInternalPath(): string;
+    /**
+     * Get the internal path (within the storage) of the root of the mount
+     *
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRootInternalPath(): string;
 
-	/**
-	 * Get the class of the mount provider that this mount originates from
-	 *
-	 * @return string
-	 * @since 24.0.0
-	 */
-	public function getMountProvider(): string;
+    /**
+     * Get the class of the mount provider that this mount originates from
+     *
+     * @return string
+     * @since 24.0.0
+     */
+    public function getMountProvider(): string;
 }

lib/public/Files/Config/ICachedMountFileInfo.php

Indentation +12 added lines, -12 removed lines

@@ -28,17 +28,17 @@
  * @since 13.0.0
  */
 interface ICachedMountFileInfo extends ICachedMountInfo {
-	/**
-	 * Return the path for the file within the cached mount
-	 *
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getInternalPath(): string;
+    /**
+     * Return the path for the file within the cached mount
+     *
+     * @return string
+     * @since 13.0.0
+     */
+    public function getInternalPath(): string;
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getPath(): string;
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getPath(): string;
 }

lib/public/Files/Mount/IMountManager.php

Indentation +65 added lines, -65 removed lines

@@ -34,77 +34,77 @@
  */
 interface IMountManager {
 
-	/**
-	 * Add a new mount
-	 *
-	 * @param IMountPoint $mount
-	 * @since 8.2.0
-	 */
-	public function addMount(IMountPoint $mount);
+    /**
+     * Add a new mount
+     *
+     * @param IMountPoint $mount
+     * @since 8.2.0
+     */
+    public function addMount(IMountPoint $mount);
 
-	/**
-	 * Remove a mount
-	 *
-	 * @param string $mountPoint
-	 * @since 8.2.0
-	 */
-	public function removeMount(string $mountPoint);
+    /**
+     * Remove a mount
+     *
+     * @param string $mountPoint
+     * @since 8.2.0
+     */
+    public function removeMount(string $mountPoint);
 
-	/**
-	 * Change the location of a mount
-	 *
-	 * @param string $mountPoint
-	 * @param string $target
-	 * @since 8.2.0
-	 */
-	public function moveMount(string $mountPoint, string $target);
+    /**
+     * Change the location of a mount
+     *
+     * @param string $mountPoint
+     * @param string $target
+     * @since 8.2.0
+     */
+    public function moveMount(string $mountPoint, string $target);
 
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param string $path
-	 * @return IMountPoint
-	 * @since 8.2.0
-	 */
-	public function find(string $path): ?IMountPoint;
+    /**
+     * Find the mount for $path
+     *
+     * @param string $path
+     * @return IMountPoint
+     * @since 8.2.0
+     */
+    public function find(string $path): ?IMountPoint;
 
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param string $path
-	 * @return IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findIn(string $path): array;
+    /**
+     * Find all mounts in $path
+     *
+     * @param string $path
+     * @return IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findIn(string $path): array;
 
-	/**
-	 * Remove all registered mounts
-	 *
-	 * @since 8.2.0
-	 */
-	public function clear();
+    /**
+     * Remove all registered mounts
+     *
+     * @since 8.2.0
+     */
+    public function clear();
 
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findByStorageId(string $id): array;
+    /**
+     * Find mounts by storage id
+     *
+     * @param string $id
+     * @return IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findByStorageId(string $id): array;
 
-	/**
-	 * @return IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function getAll(): array;
+    /**
+     * @return IMountPoint[]
+     * @since 8.2.0
+     */
+    public function getAll(): array;
 
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param int $id
-	 * @return IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findByNumericId(int $id): array;
+    /**
+     * Find mounts by numeric storage id
+     *
+     * @param int $id
+     * @return IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findByNumericId(int $id): array;
 }

lib/private/Cache/CappedMemoryCache.php

Indentation +72 added lines, -72 removed lines

@@ -30,89 +30,89 @@
  * @template T
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
-	private $capacity;
-	/** @var T[] */
-	private $cache = [];
+    private $capacity;
+    /** @var T[] */
+    private $cache = [];
 
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
 
-	public function hasKey($key): bool {
-		return isset($this->cache[$key]);
-	}
+    public function hasKey($key): bool {
+        return isset($this->cache[$key]);
+    }
 
-	/**
-	 * @return ?T
-	 */
-	public function get($key) {
-		return $this->cache[$key] ?? null;
-	}
+    /**
+     * @return ?T
+     */
+    public function get($key) {
+        return $this->cache[$key] ?? null;
+    }
 
-	/**
-	 * @param string $key
-	 * @param T $value
-	 * @param int $ttl
-	 * @return bool
-	 */
-	public function set($key, $value, $ttl = 0): bool {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-		return true;
-	}
+    /**
+     * @param string $key
+     * @param T $value
+     * @param int $ttl
+     * @return bool
+     */
+    public function set($key, $value, $ttl = 0): bool {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+        return true;
+    }
 
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
 
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
 
-	public function offsetExists($offset): bool {
-		return $this->hasKey($offset);
-	}
+    public function offsetExists($offset): bool {
+        return $this->hasKey($offset);
+    }
 
-	/**
-	 * @return T
-	 */
-	#[\ReturnTypeWillChange]
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
+    /**
+     * @return T
+     */
+    #[\ReturnTypeWillChange]
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
 
-	/**
-	 * @param string $key
-	 * @param T $value
-	 * @return void
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param string $key
+     * @param T $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void {
+        $this->set($offset, $value);
+    }
 
-	public function offsetUnset($offset): void {
-		$this->remove($offset);
-	}
+    public function offsetUnset($offset): void {
+        $this->remove($offset);
+    }
 
-	/**
-	 * @return T[]
-	 */
-	public function getData() {
-		return $this->cache;
-	}
+    /**
+     * @return T[]
+     */
+    public function getData() {
+        return $this->cache;
+    }
 
 
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
 }

lib/private/legacy/OC_Util.php

Indentation +1152 added lines, -1152 removed lines

@@ -76,1159 +76,1159 @@
 use Psr\Log\LoggerInterface;
 
 class OC_Util {
-	public static $scripts = [];
-	public static $styles = [];
-	public static $headers = [];
-
-	/** @var array Local cache of version.php */
-	private static $versionCache = null;
-
-	protected static function getAppManager() {
-		return \OC::$server->getAppManager();
-	}
-
-	/**
-	 * Setup the file system
-	 *
-	 * @param string|null $user
-	 * @return boolean
-	 * @description configure the initial filesystem based on the configuration
-	 * @suppress PhanDeprecatedFunction
-	 * @suppress PhanAccessMethodInternal
-	 */
-	public static function setupFS(?string $user = '') {
-		// If we are not forced to load a specific user we load the one that is logged in
-		if ($user === '') {
-			$userObject = \OC::$server->get(\OCP\IUserSession::class)->getUser();
-		} else {
-			$userObject = \OC::$server->get(\OCP\IUserManager::class)->get($user);
-		}
-
-		/** @var SetupManager $setupManager */
-		$setupManager = \OC::$server->get(SetupManager::class);
-
-		if ($userObject) {
-			$setupManager->setupForUser($userObject);
-		} else {
-			$setupManager->setupRoot();
-		}
-		return true;
-	}
-
-	/**
-	 * check if a password is required for each public link
-	 *
-	 * @return boolean
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function isPublicLinkPasswordRequired() {
-		/** @var IManager $shareManager */
-		$shareManager = \OC::$server->get(IManager::class);
-		return $shareManager->shareApiLinkEnforcePassword();
-	}
-
-	/**
-	 * check if sharing is disabled for the current user
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IUser|null $user
-	 * @return bool
-	 */
-	public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
-		/** @var IManager $shareManager */
-		$shareManager = \OC::$server->get(IManager::class);
-		$userId = $user ? $user->getUID() : null;
-		return $shareManager->sharingDisabledForUser($userId);
-	}
-
-	/**
-	 * check if share API enforces a default expire date
-	 *
-	 * @return boolean
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function isDefaultExpireDateEnforced() {
-		/** @var IManager $shareManager */
-		$shareManager = \OC::$server->get(IManager::class);
-		return $shareManager->shareApiLinkDefaultExpireDateEnforced();
-	}
-
-	/**
-	 * Get the quota of a user
-	 *
-	 * @param IUser|null $user
-	 * @return float Quota bytes
-	 */
-	public static function getUserQuota(?IUser $user) {
-		if (is_null($user)) {
-			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		}
-		$userQuota = $user->getQuota();
-		if ($userQuota === 'none') {
-			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		}
-		return OC_Helper::computerFileSize($userQuota);
-	}
-
-	/**
-	 * copies the skeleton to the users /files
-	 *
-	 * @param string $userId
-	 * @param \OCP\Files\Folder $userDirectory
-	 * @throws \OCP\Files\NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
-		/** @var LoggerInterface $logger */
-		$logger = \OC::$server->get(LoggerInterface::class);
-
-		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
-		$userLang = \OC::$server->getL10NFactory()->findLanguage();
-		$skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
-
-		if (!file_exists($skeletonDirectory)) {
-			$dialectStart = strpos($userLang, '_');
-			if ($dialectStart !== false) {
-				$skeletonDirectory = str_replace('{lang}', substr($userLang, 0, $dialectStart), $plainSkeletonDirectory);
-			}
-			if ($dialectStart === false || !file_exists($skeletonDirectory)) {
-				$skeletonDirectory = str_replace('{lang}', 'default', $plainSkeletonDirectory);
-			}
-			if (!file_exists($skeletonDirectory)) {
-				$skeletonDirectory = '';
-			}
-		}
-
-		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
-
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-		$appdata = 'appdata_' . $instanceId;
-		if ($userId === $appdata) {
-			throw new \RuntimeException('username is reserved name: ' . $appdata);
-		}
-
-		if (!empty($skeletonDirectory)) {
-			$logger->debug('copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), ['app' => 'files_skeleton']);
-			self::copyr($skeletonDirectory, $userDirectory);
-			// update the file cache
-			$userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
-
-			/** @var ITemplateManager $templateManager */
-			$templateManager = \OC::$server->get(ITemplateManager::class);
-			$templateManager->initializeTemplateDirectory(null, $userId);
-		}
-	}
-
-	/**
-	 * copies a directory recursively by using streams
-	 *
-	 * @param string $source
-	 * @param \OCP\Files\Folder $target
-	 * @return void
-	 */
-	public static function copyr($source, \OCP\Files\Folder $target) {
-		$logger = \OC::$server->getLogger();
-
-		// Verify if folder exists
-		$dir = opendir($source);
-		if ($dir === false) {
-			$logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
-			return;
-		}
-
-		// Copy the files
-		while (false !== ($file = readdir($dir))) {
-			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if (is_dir($source . '/' . $file)) {
-					$child = $target->newFolder($file);
-					self::copyr($source . '/' . $file, $child);
-				} else {
-					$child = $target->newFile($file);
-					$sourceStream = fopen($source . '/' . $file, 'r');
-					if ($sourceStream === false) {
-						$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
-						closedir($dir);
-						return;
-					}
-					stream_copy_to_stream($sourceStream, $child->fopen('w'));
-				}
-			}
-		}
-		closedir($dir);
-	}
-
-	/**
-	 * @return void
-	 * @suppress PhanUndeclaredMethod
-	 */
-	public static function tearDownFS() {
-		/** @var SetupManager $setupManager */
-		$setupManager = \OC::$server->get(SetupManager::class);
-		$setupManager->tearDown();
-	}
-
-	/**
-	 * get the current installed version of ownCloud
-	 *
-	 * @return array
-	 */
-	public static function getVersion() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_Version'];
-	}
-
-	/**
-	 * get the current installed version string of ownCloud
-	 *
-	 * @return string
-	 */
-	public static function getVersionString() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_VersionString'];
-	}
-
-	/**
-	 * @deprecated the value is of no use anymore
-	 * @return string
-	 */
-	public static function getEditionString() {
-		return '';
-	}
-
-	/**
-	 * @description get the update channel of the current installed of ownCloud.
-	 * @return string
-	 */
-	public static function getChannel() {
-		OC_Util::loadVersion();
-		return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
-	}
-
-	/**
-	 * @description get the build number of the current installed of ownCloud.
-	 * @return string
-	 */
-	public static function getBuild() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_Build'];
-	}
-
-	/**
-	 * @description load the version.php into the session as cache
-	 * @suppress PhanUndeclaredVariable
-	 */
-	private static function loadVersion() {
-		if (self::$versionCache !== null) {
-			return;
-		}
-
-		$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
-		require OC::$SERVERROOT . '/version.php';
-		/** @var int $timestamp */
-		self::$versionCache['OC_Version_Timestamp'] = $timestamp;
-		/** @var string $OC_Version */
-		self::$versionCache['OC_Version'] = $OC_Version;
-		/** @var string $OC_VersionString */
-		self::$versionCache['OC_VersionString'] = $OC_VersionString;
-		/** @var string $OC_Build */
-		self::$versionCache['OC_Build'] = $OC_Build;
-
-		/** @var string $OC_Channel */
-		self::$versionCache['OC_Channel'] = $OC_Channel;
-	}
-
-	/**
-	 * generates a path for JS/CSS files. If no application is provided it will create the path for core.
-	 *
-	 * @param string $application application to get the files from
-	 * @param string $directory directory within this application (css, js, vendor, etc)
-	 * @param string $file the file inside of the above folder
-	 * @return string the path
-	 */
-	private static function generatePath($application, $directory, $file) {
-		if (is_null($file)) {
-			$file = $application;
-			$application = "";
-		}
-		if (!empty($application)) {
-			return "$application/$directory/$file";
-		} else {
-			return "$directory/$file";
-		}
-	}
-
-	/**
-	 * add a javascript file
-	 *
-	 * @deprecated 24.0.0 - Use \OCP\Util::addScript
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Script to the beginning of the list
-	 * @return void
-	 */
-	public static function addScript($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'js', $file);
-
-		// core js files need separate handling
-		if ($application !== 'core' && $file !== null) {
-			self::addTranslations($application);
-		}
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a javascript file from the vendor sub folder
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Script to the beginning of the list
-	 * @return void
-	 */
-	public static function addVendorScript($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'vendor', $file);
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a translation JS file
-	 *
-	 * @deprecated 24.0.0
-	 *
-	 * @param string $application application id
-	 * @param string|null $languageCode language code, defaults to the current language
-	 * @param bool|null $prepend prepend the Script to the beginning of the list
-	 */
-	public static function addTranslations($application, $languageCode = null, $prepend = false) {
-		if (is_null($languageCode)) {
-			$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
-		}
-		if (!empty($application)) {
-			$path = "$application/l10n/$languageCode";
-		} else {
-			$path = "l10n/$languageCode";
-		}
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a css file
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Style to the beginning of the list
-	 * @return void
-	 */
-	public static function addStyle($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'css', $file);
-		self::addExternalResource($application, $prepend, $path, "style");
-	}
-
-	/**
-	 * add a css file from the vendor sub folder
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Style to the beginning of the list
-	 * @return void
-	 */
-	public static function addVendorStyle($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'vendor', $file);
-		self::addExternalResource($application, $prepend, $path, "style");
-	}
-
-	/**
-	 * add an external resource css/js file
-	 *
-	 * @param string $application application id
-	 * @param bool $prepend prepend the file to the beginning of the list
-	 * @param string $path
-	 * @param string $type (script or style)
-	 * @return void
-	 */
-	private static function addExternalResource($application, $prepend, $path, $type = "script") {
-		if ($type === "style") {
-			if (!in_array($path, self::$styles)) {
-				if ($prepend === true) {
-					array_unshift(self::$styles, $path);
-				} else {
-					self::$styles[] = $path;
-				}
-			}
-		} elseif ($type === "script") {
-			if (!in_array($path, self::$scripts)) {
-				if ($prepend === true) {
-					array_unshift(self::$scripts, $path);
-				} else {
-					self::$scripts [] = $path;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * If $text is null then the element will be written as empty element.
-	 * So use "" to get a closing tag.
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
-	 * @param bool $prepend prepend the header to the beginning of the list
-	 */
-	public static function addHeader($tag, $attributes, $text = null, $prepend = false) {
-		$header = [
-			'tag' => $tag,
-			'attributes' => $attributes,
-			'text' => $text
-		];
-		if ($prepend === true) {
-			array_unshift(self::$headers, $header);
-		} else {
-			self::$headers[] = $header;
-		}
-	}
-
-	/**
-	 * check if the current server configuration is suitable for ownCloud
-	 *
-	 * @param \OC\SystemConfig $config
-	 * @return array arrays with error messages and hints
-	 */
-	public static function checkServer(\OC\SystemConfig $config) {
-		$l = \OC::$server->getL10N('lib');
-		$errors = [];
-		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
-
-		if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
-			// this check needs to be done every time
-			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
-		}
-
-		// Assume that if checkServer() succeeded before in this session, then all is fine.
-		if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
-			return $errors;
-		}
-
-		$webServerRestart = false;
-		$setup = new \OC\Setup(
-			$config,
-			\OC::$server->get(IniGetWrapper::class),
-			\OC::$server->getL10N('lib'),
-			\OC::$server->get(\OCP\Defaults::class),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getSecureRandom(),
-			\OC::$server->get(\OC\Installer::class)
-		);
-
-		$urlGenerator = \OC::$server->getURLGenerator();
-
-		$availableDatabases = $setup->getSupportedDatabases();
-		if (empty($availableDatabases)) {
-			$errors[] = [
-				'error' => $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
-				'hint' => '' //TODO: sane hint
-			];
-			$webServerRestart = true;
-		}
-
-		// Check if config folder is writable.
-		if (!OC_Helper::isReadOnlyConfigEnabled()) {
-			if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
-				$errors[] = [
-					'error' => $l->t('Cannot write into "config" directory.'),
-					'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s',
-						[ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. '
-						. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
-						[ $urlGenerator->linkToDocs('admin-config') ])
-				];
-			}
-		}
-
-		// Check if there is a writable install folder.
-		if ($config->getValue('appstoreenabled', true)) {
-			if (OC_App::getInstallPath() === null
-				|| !is_writable(OC_App::getInstallPath())
-				|| !is_readable(OC_App::getInstallPath())
-			) {
-				$errors[] = [
-					'error' => $l->t('Cannot write into "apps" directory.'),
-					'hint' => $l->t('This can usually be fixed by giving the web server write access to the apps directory'
-						. ' or disabling the App Store in the config file.')
-				];
-			}
-		}
-		// Create root dir.
-		if ($config->getValue('installed', false)) {
-			if (!is_dir($CONFIG_DATADIRECTORY)) {
-				$success = @mkdir($CONFIG_DATADIRECTORY);
-				if ($success) {
-					$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
-				} else {
-					$errors[] = [
-						'error' => $l->t('Cannot create "data" directory.'),
-						'hint' => $l->t('This can usually be fixed by giving the web server write access to the root directory. See %s',
-							[$urlGenerator->linkToDocs('admin-dir_permissions')])
-					];
-				}
-			} elseif (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
-				// is_writable doesn't work for NFS mounts, so try to write a file and check if it exists.
-				$testFile = sprintf('%s/%s.tmp', $CONFIG_DATADIRECTORY, uniqid('data_dir_writability_test_'));
-				$handle = fopen($testFile, 'w');
-				if (!$handle || fwrite($handle, 'Test write operation') === false) {
-					$permissionsHint = $l->t('Permissions can usually be fixed by giving the web server write access to the root directory. See %s.',
-						[$urlGenerator->linkToDocs('admin-dir_permissions')]);
-					$errors[] = [
-						'error' => $l->t('Your data directory is not writable.'),
-						'hint' => $permissionsHint
-					];
-				} else {
-					fclose($handle);
-					unlink($testFile);
-				}
-			} else {
-				$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
-			}
-		}
-
-		if (!OC_Util::isSetLocaleWorking()) {
-			$errors[] = [
-				'error' => $l->t('Setting locale to %s failed.',
-					['en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/'
-						. 'pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8']),
-				'hint' => $l->t('Please install one of these locales on your system and restart your web server.')
-			];
-		}
-
-		// Contains the dependencies that should be checked against
-		// classes = class_exists
-		// functions = function_exists
-		// defined = defined
-		// ini = ini_get
-		// If the dependency is not found the missing module name is shown to the EndUser
-		// When adding new checks always verify that they pass on Travis as well
-		// for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini
-		$dependencies = [
-			'classes' => [
-				'ZipArchive' => 'zip',
-				'DOMDocument' => 'dom',
-				'XMLWriter' => 'XMLWriter',
-				'XMLReader' => 'XMLReader',
-			],
-			'functions' => [
-				'xml_parser_create' => 'libxml',
-				'mb_strcut' => 'mbstring',
-				'ctype_digit' => 'ctype',
-				'json_encode' => 'JSON',
-				'gd_info' => 'GD',
-				'gzencode' => 'zlib',
-				'simplexml_load_string' => 'SimpleXML',
-				'hash' => 'HASH Message Digest Framework',
-				'curl_init' => 'cURL',
-				'openssl_verify' => 'OpenSSL',
-			],
-			'defined' => [
-				'PDO::ATTR_DRIVER_NAME' => 'PDO'
-			],
-			'ini' => [
-				'default_charset' => 'UTF-8',
-			],
-		];
-		$missingDependencies = [];
-		$invalidIniSettings = [];
-
-		$iniWrapper = \OC::$server->get(IniGetWrapper::class);
-		foreach ($dependencies['classes'] as $class => $module) {
-			if (!class_exists($class)) {
-				$missingDependencies[] = $module;
-			}
-		}
-		foreach ($dependencies['functions'] as $function => $module) {
-			if (!function_exists($function)) {
-				$missingDependencies[] = $module;
-			}
-		}
-		foreach ($dependencies['defined'] as $defined => $module) {
-			if (!defined($defined)) {
-				$missingDependencies[] = $module;
-			}
-		}
-		foreach ($dependencies['ini'] as $setting => $expected) {
-			if (is_bool($expected)) {
-				if ($iniWrapper->getBool($setting) !== $expected) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
-			}
-			if (is_int($expected)) {
-				if ($iniWrapper->getNumeric($setting) !== $expected) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
-			}
-			if (is_string($expected)) {
-				if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
-			}
-		}
-
-		foreach ($missingDependencies as $missingDependency) {
-			$errors[] = [
-				'error' => $l->t('PHP module %s not installed.', [$missingDependency]),
-				'hint' => $l->t('Please ask your server administrator to install the module.'),
-			];
-			$webServerRestart = true;
-		}
-		foreach ($invalidIniSettings as $setting) {
-			if (is_bool($setting[1])) {
-				$setting[1] = $setting[1] ? 'on' : 'off';
-			}
-			$errors[] = [
-				'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
-				'hint' => $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
-			];
-			$webServerRestart = true;
-		}
-
-		/**
-		 * The mbstring.func_overload check can only be performed if the mbstring
-		 * module is installed as it will return null if the checking setting is
-		 * not available and thus a check on the boolean value fails.
-		 *
-		 * TODO: Should probably be implemented in the above generic dependency
-		 *       check somehow in the long-term.
-		 */
-		if ($iniWrapper->getBool('mbstring.func_overload') !== null &&
-			$iniWrapper->getBool('mbstring.func_overload') === true) {
-			$errors[] = [
-				'error' => $l->t('<code>mbstring.func_overload</code> is set to <code>%s</code> instead of the expected value <code>0</code>.', [$iniWrapper->getString('mbstring.func_overload')]),
-				'hint' => $l->t('To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini.')
-			];
-		}
-
-		if (function_exists('xml_parser_create') &&
-			LIBXML_LOADED_VERSION < 20700) {
-			$version = LIBXML_LOADED_VERSION;
-			$major = floor($version / 10000);
-			$version -= ($major * 10000);
-			$minor = floor($version / 100);
-			$version -= ($minor * 100);
-			$patch = $version;
-			$errors[] = [
-				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
-				'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
-			];
-		}
-
-		if (!self::isAnnotationsWorking()) {
-			$errors[] = [
-				'error' => $l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.'),
-				'hint' => $l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')
-			];
-		}
-
-		if (!\OC::$CLI && $webServerRestart) {
-			$errors[] = [
-				'error' => $l->t('PHP modules have been installed, but they are still listed as missing?'),
-				'hint' => $l->t('Please ask your server administrator to restart the web server.')
-			];
-		}
-
-		$errors = array_merge($errors, self::checkDatabaseVersion());
-
-		// Cache the result of this function
-		\OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
-
-		return $errors;
-	}
-
-	/**
-	 * Check the database version
-	 *
-	 * @return array errors array
-	 */
-	public static function checkDatabaseVersion() {
-		$l = \OC::$server->getL10N('lib');
-		$errors = [];
-		$dbType = \OC::$server->getSystemConfig()->getValue('dbtype', 'sqlite');
-		if ($dbType === 'pgsql') {
-			// check PostgreSQL version
-			try {
-				$result = \OC_DB::executeAudited('SHOW SERVER_VERSION');
-				$data = $result->fetchRow();
-				$result->closeCursor();
-				if (isset($data['server_version'])) {
-					$version = $data['server_version'];
-					if (version_compare($version, '9.0.0', '<')) {
-						$errors[] = [
-							'error' => $l->t('PostgreSQL >= 9 required.'),
-							'hint' => $l->t('Please upgrade your database version.')
-						];
-					}
-				}
-			} catch (\Doctrine\DBAL\Exception $e) {
-				$logger = \OC::$server->getLogger();
-				$logger->warning('Error occurred while checking PostgreSQL version, assuming >= 9');
-				$logger->logException($e);
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * Check for correct file permissions of data directory
-	 *
-	 * @param string $dataDirectory
-	 * @return array arrays with error messages and hints
-	 */
-	public static function checkDataDirectoryPermissions($dataDirectory) {
-		if (\OC::$server->getConfig()->getSystemValue('check_data_directory_permissions', true) === false) {
-			return  [];
-		}
-
-		$perms = substr(decoct(@fileperms($dataDirectory)), -3);
-		if (substr($perms, -1) !== '0') {
-			chmod($dataDirectory, 0770);
-			clearstatcache();
-			$perms = substr(decoct(@fileperms($dataDirectory)), -3);
-			if ($perms[2] !== '0') {
-				$l = \OC::$server->getL10N('lib');
-				return [[
-					'error' => $l->t('Your data directory is readable by other users.'),
-					'hint' => $l->t('Please change the permissions to 0770 so that the directory cannot be listed by other users.'),
-				]];
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * Check that the data directory exists and is valid by
-	 * checking the existence of the ".ocdata" file.
-	 *
-	 * @param string $dataDirectory data directory path
-	 * @return array errors found
-	 */
-	public static function checkDataDirectoryValidity($dataDirectory) {
-		$l = \OC::$server->getL10N('lib');
-		$errors = [];
-		if ($dataDirectory[0] !== '/') {
-			$errors[] = [
-				'error' => $l->t('Your data directory must be an absolute path.'),
-				'hint' => $l->t('Check the value of "datadirectory" in your configuration.')
-			];
-		}
-		if (!file_exists($dataDirectory . '/.ocdata')) {
-			$errors[] = [
-				'error' => $l->t('Your data directory is invalid.'),
-				'hint' => $l->t('Ensure there is a file called ".ocdata"' .
-					' in the root of the data directory.')
-			];
-		}
-		return $errors;
-	}
-
-	/**
-	 * Check if the user is logged in, redirects to home if not. With
-	 * redirect URL parameter to the request URI.
-	 *
-	 * @return void
-	 */
-	public static function checkLoggedIn() {
-		// Check if we are a user
-		if (!\OC::$server->getUserSession()->isLoggedIn()) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
-						'core.login.showLoginForm',
-						[
-							'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
-						]
-					)
-			);
-			exit();
-		}
-		// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
-		if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-			exit();
-		}
-	}
-
-	/**
-	 * Check if the user is a admin, redirects to home if not
-	 *
-	 * @return void
-	 */
-	public static function checkAdminUser() {
-		OC_Util::checkLoggedIn();
-		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
-			exit();
-		}
-	}
-
-	/**
-	 * Returns the URL of the default page
-	 * based on the system configuration and
-	 * the apps visible for the current user
-	 *
-	 * @return string URL
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function getDefaultPageUrl() {
-		/** @var IURLGenerator $urlGenerator */
-		$urlGenerator = \OC::$server->get(IURLGenerator::class);
-		return $urlGenerator->linkToDefaultPageUrl();
-	}
-
-	/**
-	 * Redirect to the user default page
-	 *
-	 * @return void
-	 */
-	public static function redirectToDefaultPage() {
-		$location = self::getDefaultPageUrl();
-		header('Location: ' . $location);
-		exit();
-	}
-
-	/**
-	 * get an id unique for this instance
-	 *
-	 * @return string
-	 */
-	public static function getInstanceId() {
-		$id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
-		if (is_null($id)) {
-			// We need to guarantee at least one letter in instanceid so it can be used as the session_name
-			$id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
-			\OC::$server->getSystemConfig()->setValue('instanceid', $id);
-		}
-		return $id;
-	}
-
-	/**
-	 * Public function to sanitize HTML
-	 *
-	 * This function is used to sanitize HTML and should be applied on any
-	 * string or array of strings before displaying it on a web page.
-	 *
-	 * @param string|string[] $value
-	 * @return string|string[] an array of sanitized strings or a single sanitized string, depends on the input parameter.
-	 */
-	public static function sanitizeHTML($value) {
-		if (is_array($value)) {
-			/** @var string[] $value */
-			$value = array_map(function ($value) {
-				return self::sanitizeHTML($value);
-			}, $value);
-		} else {
-			// Specify encoding for PHP<5.4
-			$value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
-		}
-		return $value;
-	}
-
-	/**
-	 * Public function to encode url parameters
-	 *
-	 * This function is used to encode path to file before output.
-	 * Encoding is done according to RFC 3986 with one exception:
-	 * Character '/' is preserved as is.
-	 *
-	 * @param string $component part of URI to encode
-	 * @return string
-	 */
-	public static function encodePath($component) {
-		$encoded = rawurlencode($component);
-		$encoded = str_replace('%2F', '/', $encoded);
-		return $encoded;
-	}
-
-
-	public function createHtaccessTestFile(\OCP\IConfig $config) {
-		// php dev server does not support htaccess
-		if (php_sapi_name() === 'cli-server') {
-			return false;
-		}
-
-		// testdata
-		$fileName = '/htaccesstest.txt';
-		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
-
-		// creating a test file
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
-
-		if (file_exists($testFile)) {// already running this test, possible recursive call
-			return false;
-		}
-
-		$fp = @fopen($testFile, 'w');
-		if (!$fp) {
-			throw new \OCP\HintException('Can\'t create test file to check for working .htaccess file.',
-				'Make sure it is possible for the web server to write to ' . $testFile);
-		}
-		fwrite($fp, $testContent);
-		fclose($fp);
-
-		return $testContent;
-	}
-
-	/**
-	 * Check if the .htaccess file is working
-	 *
-	 * @param \OCP\IConfig $config
-	 * @return bool
-	 * @throws Exception
-	 * @throws \OCP\HintException If the test file can't get written.
-	 */
-	public function isHtaccessWorking(\OCP\IConfig $config) {
-		if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
-			return true;
-		}
-
-		$testContent = $this->createHtaccessTestFile($config);
-		if ($testContent === false) {
-			return false;
-		}
-
-		$fileName = '/htaccesstest.txt';
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
-
-		// accessing the file via http
-		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
-		try {
-			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
-		} catch (\Exception $e) {
-			$content = false;
-		}
-
-		if (strpos($url, 'https:') === 0) {
-			$url = 'http:' . substr($url, 6);
-		} else {
-			$url = 'https:' . substr($url, 5);
-		}
-
-		try {
-			$fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
-		} catch (\Exception $e) {
-			$fallbackContent = false;
-		}
-
-		// cleanup
-		@unlink($testFile);
-
-		/*
+    public static $scripts = [];
+    public static $styles = [];
+    public static $headers = [];
+
+    /** @var array Local cache of version.php */
+    private static $versionCache = null;
+
+    protected static function getAppManager() {
+        return \OC::$server->getAppManager();
+    }
+
+    /**
+     * Setup the file system
+     *
+     * @param string|null $user
+     * @return boolean
+     * @description configure the initial filesystem based on the configuration
+     * @suppress PhanDeprecatedFunction
+     * @suppress PhanAccessMethodInternal
+     */
+    public static function setupFS(?string $user = '') {
+        // If we are not forced to load a specific user we load the one that is logged in
+        if ($user === '') {
+            $userObject = \OC::$server->get(\OCP\IUserSession::class)->getUser();
+        } else {
+            $userObject = \OC::$server->get(\OCP\IUserManager::class)->get($user);
+        }
+
+        /** @var SetupManager $setupManager */
+        $setupManager = \OC::$server->get(SetupManager::class);
+
+        if ($userObject) {
+            $setupManager->setupForUser($userObject);
+        } else {
+            $setupManager->setupRoot();
+        }
+        return true;
+    }
+
+    /**
+     * check if a password is required for each public link
+     *
+     * @return boolean
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function isPublicLinkPasswordRequired() {
+        /** @var IManager $shareManager */
+        $shareManager = \OC::$server->get(IManager::class);
+        return $shareManager->shareApiLinkEnforcePassword();
+    }
+
+    /**
+     * check if sharing is disabled for the current user
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IUser|null $user
+     * @return bool
+     */
+    public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
+        /** @var IManager $shareManager */
+        $shareManager = \OC::$server->get(IManager::class);
+        $userId = $user ? $user->getUID() : null;
+        return $shareManager->sharingDisabledForUser($userId);
+    }
+
+    /**
+     * check if share API enforces a default expire date
+     *
+     * @return boolean
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function isDefaultExpireDateEnforced() {
+        /** @var IManager $shareManager */
+        $shareManager = \OC::$server->get(IManager::class);
+        return $shareManager->shareApiLinkDefaultExpireDateEnforced();
+    }
+
+    /**
+     * Get the quota of a user
+     *
+     * @param IUser|null $user
+     * @return float Quota bytes
+     */
+    public static function getUserQuota(?IUser $user) {
+        if (is_null($user)) {
+            return \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        }
+        $userQuota = $user->getQuota();
+        if ($userQuota === 'none') {
+            return \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        }
+        return OC_Helper::computerFileSize($userQuota);
+    }
+
+    /**
+     * copies the skeleton to the users /files
+     *
+     * @param string $userId
+     * @param \OCP\Files\Folder $userDirectory
+     * @throws \OCP\Files\NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
+        /** @var LoggerInterface $logger */
+        $logger = \OC::$server->get(LoggerInterface::class);
+
+        $plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+        $userLang = \OC::$server->getL10NFactory()->findLanguage();
+        $skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
+
+        if (!file_exists($skeletonDirectory)) {
+            $dialectStart = strpos($userLang, '_');
+            if ($dialectStart !== false) {
+                $skeletonDirectory = str_replace('{lang}', substr($userLang, 0, $dialectStart), $plainSkeletonDirectory);
+            }
+            if ($dialectStart === false || !file_exists($skeletonDirectory)) {
+                $skeletonDirectory = str_replace('{lang}', 'default', $plainSkeletonDirectory);
+            }
+            if (!file_exists($skeletonDirectory)) {
+                $skeletonDirectory = '';
+            }
+        }
+
+        $instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+        $appdata = 'appdata_' . $instanceId;
+        if ($userId === $appdata) {
+            throw new \RuntimeException('username is reserved name: ' . $appdata);
+        }
+
+        if (!empty($skeletonDirectory)) {
+            $logger->debug('copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), ['app' => 'files_skeleton']);
+            self::copyr($skeletonDirectory, $userDirectory);
+            // update the file cache
+            $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
+
+            /** @var ITemplateManager $templateManager */
+            $templateManager = \OC::$server->get(ITemplateManager::class);
+            $templateManager->initializeTemplateDirectory(null, $userId);
+        }
+    }
+
+    /**
+     * copies a directory recursively by using streams
+     *
+     * @param string $source
+     * @param \OCP\Files\Folder $target
+     * @return void
+     */
+    public static function copyr($source, \OCP\Files\Folder $target) {
+        $logger = \OC::$server->getLogger();
+
+        // Verify if folder exists
+        $dir = opendir($source);
+        if ($dir === false) {
+            $logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
+            return;
+        }
+
+        // Copy the files
+        while (false !== ($file = readdir($dir))) {
+            if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+                if (is_dir($source . '/' . $file)) {
+                    $child = $target->newFolder($file);
+                    self::copyr($source . '/' . $file, $child);
+                } else {
+                    $child = $target->newFile($file);
+                    $sourceStream = fopen($source . '/' . $file, 'r');
+                    if ($sourceStream === false) {
+                        $logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
+                        closedir($dir);
+                        return;
+                    }
+                    stream_copy_to_stream($sourceStream, $child->fopen('w'));
+                }
+            }
+        }
+        closedir($dir);
+    }
+
+    /**
+     * @return void
+     * @suppress PhanUndeclaredMethod
+     */
+    public static function tearDownFS() {
+        /** @var SetupManager $setupManager */
+        $setupManager = \OC::$server->get(SetupManager::class);
+        $setupManager->tearDown();
+    }
+
+    /**
+     * get the current installed version of ownCloud
+     *
+     * @return array
+     */
+    public static function getVersion() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_Version'];
+    }
+
+    /**
+     * get the current installed version string of ownCloud
+     *
+     * @return string
+     */
+    public static function getVersionString() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_VersionString'];
+    }
+
+    /**
+     * @deprecated the value is of no use anymore
+     * @return string
+     */
+    public static function getEditionString() {
+        return '';
+    }
+
+    /**
+     * @description get the update channel of the current installed of ownCloud.
+     * @return string
+     */
+    public static function getChannel() {
+        OC_Util::loadVersion();
+        return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
+    }
+
+    /**
+     * @description get the build number of the current installed of ownCloud.
+     * @return string
+     */
+    public static function getBuild() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_Build'];
+    }
+
+    /**
+     * @description load the version.php into the session as cache
+     * @suppress PhanUndeclaredVariable
+     */
+    private static function loadVersion() {
+        if (self::$versionCache !== null) {
+            return;
+        }
+
+        $timestamp = filemtime(OC::$SERVERROOT . '/version.php');
+        require OC::$SERVERROOT . '/version.php';
+        /** @var int $timestamp */
+        self::$versionCache['OC_Version_Timestamp'] = $timestamp;
+        /** @var string $OC_Version */
+        self::$versionCache['OC_Version'] = $OC_Version;
+        /** @var string $OC_VersionString */
+        self::$versionCache['OC_VersionString'] = $OC_VersionString;
+        /** @var string $OC_Build */
+        self::$versionCache['OC_Build'] = $OC_Build;
+
+        /** @var string $OC_Channel */
+        self::$versionCache['OC_Channel'] = $OC_Channel;
+    }
+
+    /**
+     * generates a path for JS/CSS files. If no application is provided it will create the path for core.
+     *
+     * @param string $application application to get the files from
+     * @param string $directory directory within this application (css, js, vendor, etc)
+     * @param string $file the file inside of the above folder
+     * @return string the path
+     */
+    private static function generatePath($application, $directory, $file) {
+        if (is_null($file)) {
+            $file = $application;
+            $application = "";
+        }
+        if (!empty($application)) {
+            return "$application/$directory/$file";
+        } else {
+            return "$directory/$file";
+        }
+    }
+
+    /**
+     * add a javascript file
+     *
+     * @deprecated 24.0.0 - Use \OCP\Util::addScript
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Script to the beginning of the list
+     * @return void
+     */
+    public static function addScript($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'js', $file);
+
+        // core js files need separate handling
+        if ($application !== 'core' && $file !== null) {
+            self::addTranslations($application);
+        }
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a javascript file from the vendor sub folder
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Script to the beginning of the list
+     * @return void
+     */
+    public static function addVendorScript($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'vendor', $file);
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a translation JS file
+     *
+     * @deprecated 24.0.0
+     *
+     * @param string $application application id
+     * @param string|null $languageCode language code, defaults to the current language
+     * @param bool|null $prepend prepend the Script to the beginning of the list
+     */
+    public static function addTranslations($application, $languageCode = null, $prepend = false) {
+        if (is_null($languageCode)) {
+            $languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
+        }
+        if (!empty($application)) {
+            $path = "$application/l10n/$languageCode";
+        } else {
+            $path = "l10n/$languageCode";
+        }
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a css file
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Style to the beginning of the list
+     * @return void
+     */
+    public static function addStyle($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'css', $file);
+        self::addExternalResource($application, $prepend, $path, "style");
+    }
+
+    /**
+     * add a css file from the vendor sub folder
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Style to the beginning of the list
+     * @return void
+     */
+    public static function addVendorStyle($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'vendor', $file);
+        self::addExternalResource($application, $prepend, $path, "style");
+    }
+
+    /**
+     * add an external resource css/js file
+     *
+     * @param string $application application id
+     * @param bool $prepend prepend the file to the beginning of the list
+     * @param string $path
+     * @param string $type (script or style)
+     * @return void
+     */
+    private static function addExternalResource($application, $prepend, $path, $type = "script") {
+        if ($type === "style") {
+            if (!in_array($path, self::$styles)) {
+                if ($prepend === true) {
+                    array_unshift(self::$styles, $path);
+                } else {
+                    self::$styles[] = $path;
+                }
+            }
+        } elseif ($type === "script") {
+            if (!in_array($path, self::$scripts)) {
+                if ($prepend === true) {
+                    array_unshift(self::$scripts, $path);
+                } else {
+                    self::$scripts [] = $path;
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a custom element to the header
+     * If $text is null then the element will be written as empty element.
+     * So use "" to get a closing tag.
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element
+     * @param bool $prepend prepend the header to the beginning of the list
+     */
+    public static function addHeader($tag, $attributes, $text = null, $prepend = false) {
+        $header = [
+            'tag' => $tag,
+            'attributes' => $attributes,
+            'text' => $text
+        ];
+        if ($prepend === true) {
+            array_unshift(self::$headers, $header);
+        } else {
+            self::$headers[] = $header;
+        }
+    }
+
+    /**
+     * check if the current server configuration is suitable for ownCloud
+     *
+     * @param \OC\SystemConfig $config
+     * @return array arrays with error messages and hints
+     */
+    public static function checkServer(\OC\SystemConfig $config) {
+        $l = \OC::$server->getL10N('lib');
+        $errors = [];
+        $CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
+
+        if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
+            // this check needs to be done every time
+            $errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
+        }
+
+        // Assume that if checkServer() succeeded before in this session, then all is fine.
+        if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
+            return $errors;
+        }
+
+        $webServerRestart = false;
+        $setup = new \OC\Setup(
+            $config,
+            \OC::$server->get(IniGetWrapper::class),
+            \OC::$server->getL10N('lib'),
+            \OC::$server->get(\OCP\Defaults::class),
+            \OC::$server->get(LoggerInterface::class),
+            \OC::$server->getSecureRandom(),
+            \OC::$server->get(\OC\Installer::class)
+        );
+
+        $urlGenerator = \OC::$server->getURLGenerator();
+
+        $availableDatabases = $setup->getSupportedDatabases();
+        if (empty($availableDatabases)) {
+            $errors[] = [
+                'error' => $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
+                'hint' => '' //TODO: sane hint
+            ];
+            $webServerRestart = true;
+        }
+
+        // Check if config folder is writable.
+        if (!OC_Helper::isReadOnlyConfigEnabled()) {
+            if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
+                $errors[] = [
+                    'error' => $l->t('Cannot write into "config" directory.'),
+                    'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s',
+                        [ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. '
+                        . $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
+                        [ $urlGenerator->linkToDocs('admin-config') ])
+                ];
+            }
+        }
+
+        // Check if there is a writable install folder.
+        if ($config->getValue('appstoreenabled', true)) {
+            if (OC_App::getInstallPath() === null
+                || !is_writable(OC_App::getInstallPath())
+                || !is_readable(OC_App::getInstallPath())
+            ) {
+                $errors[] = [
+                    'error' => $l->t('Cannot write into "apps" directory.'),
+                    'hint' => $l->t('This can usually be fixed by giving the web server write access to the apps directory'
+                        . ' or disabling the App Store in the config file.')
+                ];
+            }
+        }
+        // Create root dir.
+        if ($config->getValue('installed', false)) {
+            if (!is_dir($CONFIG_DATADIRECTORY)) {
+                $success = @mkdir($CONFIG_DATADIRECTORY);
+                if ($success) {
+                    $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
+                } else {
+                    $errors[] = [
+                        'error' => $l->t('Cannot create "data" directory.'),
+                        'hint' => $l->t('This can usually be fixed by giving the web server write access to the root directory. See %s',
+                            [$urlGenerator->linkToDocs('admin-dir_permissions')])
+                    ];
+                }
+            } elseif (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
+                // is_writable doesn't work for NFS mounts, so try to write a file and check if it exists.
+                $testFile = sprintf('%s/%s.tmp', $CONFIG_DATADIRECTORY, uniqid('data_dir_writability_test_'));
+                $handle = fopen($testFile, 'w');
+                if (!$handle || fwrite($handle, 'Test write operation') === false) {
+                    $permissionsHint = $l->t('Permissions can usually be fixed by giving the web server write access to the root directory. See %s.',
+                        [$urlGenerator->linkToDocs('admin-dir_permissions')]);
+                    $errors[] = [
+                        'error' => $l->t('Your data directory is not writable.'),
+                        'hint' => $permissionsHint
+                    ];
+                } else {
+                    fclose($handle);
+                    unlink($testFile);
+                }
+            } else {
+                $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
+            }
+        }
+
+        if (!OC_Util::isSetLocaleWorking()) {
+            $errors[] = [
+                'error' => $l->t('Setting locale to %s failed.',
+                    ['en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/'
+                        . 'pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8']),
+                'hint' => $l->t('Please install one of these locales on your system and restart your web server.')
+            ];
+        }
+
+        // Contains the dependencies that should be checked against
+        // classes = class_exists
+        // functions = function_exists
+        // defined = defined
+        // ini = ini_get
+        // If the dependency is not found the missing module name is shown to the EndUser
+        // When adding new checks always verify that they pass on Travis as well
+        // for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini
+        $dependencies = [
+            'classes' => [
+                'ZipArchive' => 'zip',
+                'DOMDocument' => 'dom',
+                'XMLWriter' => 'XMLWriter',
+                'XMLReader' => 'XMLReader',
+            ],
+            'functions' => [
+                'xml_parser_create' => 'libxml',
+                'mb_strcut' => 'mbstring',
+                'ctype_digit' => 'ctype',
+                'json_encode' => 'JSON',
+                'gd_info' => 'GD',
+                'gzencode' => 'zlib',
+                'simplexml_load_string' => 'SimpleXML',
+                'hash' => 'HASH Message Digest Framework',
+                'curl_init' => 'cURL',
+                'openssl_verify' => 'OpenSSL',
+            ],
+            'defined' => [
+                'PDO::ATTR_DRIVER_NAME' => 'PDO'
+            ],
+            'ini' => [
+                'default_charset' => 'UTF-8',
+            ],
+        ];
+        $missingDependencies = [];
+        $invalidIniSettings = [];
+
+        $iniWrapper = \OC::$server->get(IniGetWrapper::class);
+        foreach ($dependencies['classes'] as $class => $module) {
+            if (!class_exists($class)) {
+                $missingDependencies[] = $module;
+            }
+        }
+        foreach ($dependencies['functions'] as $function => $module) {
+            if (!function_exists($function)) {
+                $missingDependencies[] = $module;
+            }
+        }
+        foreach ($dependencies['defined'] as $defined => $module) {
+            if (!defined($defined)) {
+                $missingDependencies[] = $module;
+            }
+        }
+        foreach ($dependencies['ini'] as $setting => $expected) {
+            if (is_bool($expected)) {
+                if ($iniWrapper->getBool($setting) !== $expected) {
+                    $invalidIniSettings[] = [$setting, $expected];
+                }
+            }
+            if (is_int($expected)) {
+                if ($iniWrapper->getNumeric($setting) !== $expected) {
+                    $invalidIniSettings[] = [$setting, $expected];
+                }
+            }
+            if (is_string($expected)) {
+                if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
+                    $invalidIniSettings[] = [$setting, $expected];
+                }
+            }
+        }
+
+        foreach ($missingDependencies as $missingDependency) {
+            $errors[] = [
+                'error' => $l->t('PHP module %s not installed.', [$missingDependency]),
+                'hint' => $l->t('Please ask your server administrator to install the module.'),
+            ];
+            $webServerRestart = true;
+        }
+        foreach ($invalidIniSettings as $setting) {
+            if (is_bool($setting[1])) {
+                $setting[1] = $setting[1] ? 'on' : 'off';
+            }
+            $errors[] = [
+                'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
+                'hint' => $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
+            ];
+            $webServerRestart = true;
+        }
+
+        /**
+         * The mbstring.func_overload check can only be performed if the mbstring
+         * module is installed as it will return null if the checking setting is
+         * not available and thus a check on the boolean value fails.
+         *
+         * TODO: Should probably be implemented in the above generic dependency
+         *       check somehow in the long-term.
+         */
+        if ($iniWrapper->getBool('mbstring.func_overload') !== null &&
+            $iniWrapper->getBool('mbstring.func_overload') === true) {
+            $errors[] = [
+                'error' => $l->t('<code>mbstring.func_overload</code> is set to <code>%s</code> instead of the expected value <code>0</code>.', [$iniWrapper->getString('mbstring.func_overload')]),
+                'hint' => $l->t('To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini.')
+            ];
+        }
+
+        if (function_exists('xml_parser_create') &&
+            LIBXML_LOADED_VERSION < 20700) {
+            $version = LIBXML_LOADED_VERSION;
+            $major = floor($version / 10000);
+            $version -= ($major * 10000);
+            $minor = floor($version / 100);
+            $version -= ($minor * 100);
+            $patch = $version;
+            $errors[] = [
+                'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
+                'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
+            ];
+        }
+
+        if (!self::isAnnotationsWorking()) {
+            $errors[] = [
+                'error' => $l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.'),
+                'hint' => $l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')
+            ];
+        }
+
+        if (!\OC::$CLI && $webServerRestart) {
+            $errors[] = [
+                'error' => $l->t('PHP modules have been installed, but they are still listed as missing?'),
+                'hint' => $l->t('Please ask your server administrator to restart the web server.')
+            ];
+        }
+
+        $errors = array_merge($errors, self::checkDatabaseVersion());
+
+        // Cache the result of this function
+        \OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
+
+        return $errors;
+    }
+
+    /**
+     * Check the database version
+     *
+     * @return array errors array
+     */
+    public static function checkDatabaseVersion() {
+        $l = \OC::$server->getL10N('lib');
+        $errors = [];
+        $dbType = \OC::$server->getSystemConfig()->getValue('dbtype', 'sqlite');
+        if ($dbType === 'pgsql') {
+            // check PostgreSQL version
+            try {
+                $result = \OC_DB::executeAudited('SHOW SERVER_VERSION');
+                $data = $result->fetchRow();
+                $result->closeCursor();
+                if (isset($data['server_version'])) {
+                    $version = $data['server_version'];
+                    if (version_compare($version, '9.0.0', '<')) {
+                        $errors[] = [
+                            'error' => $l->t('PostgreSQL >= 9 required.'),
+                            'hint' => $l->t('Please upgrade your database version.')
+                        ];
+                    }
+                }
+            } catch (\Doctrine\DBAL\Exception $e) {
+                $logger = \OC::$server->getLogger();
+                $logger->warning('Error occurred while checking PostgreSQL version, assuming >= 9');
+                $logger->logException($e);
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check for correct file permissions of data directory
+     *
+     * @param string $dataDirectory
+     * @return array arrays with error messages and hints
+     */
+    public static function checkDataDirectoryPermissions($dataDirectory) {
+        if (\OC::$server->getConfig()->getSystemValue('check_data_directory_permissions', true) === false) {
+            return  [];
+        }
+
+        $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+        if (substr($perms, -1) !== '0') {
+            chmod($dataDirectory, 0770);
+            clearstatcache();
+            $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+            if ($perms[2] !== '0') {
+                $l = \OC::$server->getL10N('lib');
+                return [[
+                    'error' => $l->t('Your data directory is readable by other users.'),
+                    'hint' => $l->t('Please change the permissions to 0770 so that the directory cannot be listed by other users.'),
+                ]];
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Check that the data directory exists and is valid by
+     * checking the existence of the ".ocdata" file.
+     *
+     * @param string $dataDirectory data directory path
+     * @return array errors found
+     */
+    public static function checkDataDirectoryValidity($dataDirectory) {
+        $l = \OC::$server->getL10N('lib');
+        $errors = [];
+        if ($dataDirectory[0] !== '/') {
+            $errors[] = [
+                'error' => $l->t('Your data directory must be an absolute path.'),
+                'hint' => $l->t('Check the value of "datadirectory" in your configuration.')
+            ];
+        }
+        if (!file_exists($dataDirectory . '/.ocdata')) {
+            $errors[] = [
+                'error' => $l->t('Your data directory is invalid.'),
+                'hint' => $l->t('Ensure there is a file called ".ocdata"' .
+                    ' in the root of the data directory.')
+            ];
+        }
+        return $errors;
+    }
+
+    /**
+     * Check if the user is logged in, redirects to home if not. With
+     * redirect URL parameter to the request URI.
+     *
+     * @return void
+     */
+    public static function checkLoggedIn() {
+        // Check if we are a user
+        if (!\OC::$server->getUserSession()->isLoggedIn()) {
+            header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+                        'core.login.showLoginForm',
+                        [
+                            'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
+                        ]
+                    )
+            );
+            exit();
+        }
+        // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
+        if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
+            header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+            exit();
+        }
+    }
+
+    /**
+     * Check if the user is a admin, redirects to home if not
+     *
+     * @return void
+     */
+    public static function checkAdminUser() {
+        OC_Util::checkLoggedIn();
+        if (!OC_User::isAdminUser(OC_User::getUser())) {
+            header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+            exit();
+        }
+    }
+
+    /**
+     * Returns the URL of the default page
+     * based on the system configuration and
+     * the apps visible for the current user
+     *
+     * @return string URL
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function getDefaultPageUrl() {
+        /** @var IURLGenerator $urlGenerator */
+        $urlGenerator = \OC::$server->get(IURLGenerator::class);
+        return $urlGenerator->linkToDefaultPageUrl();
+    }
+
+    /**
+     * Redirect to the user default page
+     *
+     * @return void
+     */
+    public static function redirectToDefaultPage() {
+        $location = self::getDefaultPageUrl();
+        header('Location: ' . $location);
+        exit();
+    }
+
+    /**
+     * get an id unique for this instance
+     *
+     * @return string
+     */
+    public static function getInstanceId() {
+        $id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
+        if (is_null($id)) {
+            // We need to guarantee at least one letter in instanceid so it can be used as the session_name
+            $id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+            \OC::$server->getSystemConfig()->setValue('instanceid', $id);
+        }
+        return $id;
+    }
+
+    /**
+     * Public function to sanitize HTML
+     *
+     * This function is used to sanitize HTML and should be applied on any
+     * string or array of strings before displaying it on a web page.
+     *
+     * @param string|string[] $value
+     * @return string|string[] an array of sanitized strings or a single sanitized string, depends on the input parameter.
+     */
+    public static function sanitizeHTML($value) {
+        if (is_array($value)) {
+            /** @var string[] $value */
+            $value = array_map(function ($value) {
+                return self::sanitizeHTML($value);
+            }, $value);
+        } else {
+            // Specify encoding for PHP<5.4
+            $value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
+        }
+        return $value;
+    }
+
+    /**
+     * Public function to encode url parameters
+     *
+     * This function is used to encode path to file before output.
+     * Encoding is done according to RFC 3986 with one exception:
+     * Character '/' is preserved as is.
+     *
+     * @param string $component part of URI to encode
+     * @return string
+     */
+    public static function encodePath($component) {
+        $encoded = rawurlencode($component);
+        $encoded = str_replace('%2F', '/', $encoded);
+        return $encoded;
+    }
+
+
+    public function createHtaccessTestFile(\OCP\IConfig $config) {
+        // php dev server does not support htaccess
+        if (php_sapi_name() === 'cli-server') {
+            return false;
+        }
+
+        // testdata
+        $fileName = '/htaccesstest.txt';
+        $testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
+
+        // creating a test file
+        $testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+
+        if (file_exists($testFile)) {// already running this test, possible recursive call
+            return false;
+        }
+
+        $fp = @fopen($testFile, 'w');
+        if (!$fp) {
+            throw new \OCP\HintException('Can\'t create test file to check for working .htaccess file.',
+                'Make sure it is possible for the web server to write to ' . $testFile);
+        }
+        fwrite($fp, $testContent);
+        fclose($fp);
+
+        return $testContent;
+    }
+
+    /**
+     * Check if the .htaccess file is working
+     *
+     * @param \OCP\IConfig $config
+     * @return bool
+     * @throws Exception
+     * @throws \OCP\HintException If the test file can't get written.
+     */
+    public function isHtaccessWorking(\OCP\IConfig $config) {
+        if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
+            return true;
+        }
+
+        $testContent = $this->createHtaccessTestFile($config);
+        if ($testContent === false) {
+            return false;
+        }
+
+        $fileName = '/htaccesstest.txt';
+        $testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+
+        // accessing the file via http
+        $url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+        try {
+            $content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+        } catch (\Exception $e) {
+            $content = false;
+        }
+
+        if (strpos($url, 'https:') === 0) {
+            $url = 'http:' . substr($url, 6);
+        } else {
+            $url = 'https:' . substr($url, 5);
+        }
+
+        try {
+            $fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+        } catch (\Exception $e) {
+            $fallbackContent = false;
+        }
+
+        // cleanup
+        @unlink($testFile);
+
+        /*
 		 * If the content is not equal to test content our .htaccess
 		 * is working as required
 		 */
-		return $content !== $testContent && $fallbackContent !== $testContent;
-	}
-
-	/**
-	 * Check if current locale is non-UTF8
-	 *
-	 * @return bool
-	 */
-	private static function isNonUTF8Locale() {
-		if (function_exists('escapeshellcmd')) {
-			return '' === escapeshellcmd('§');
-		} elseif (function_exists('escapeshellarg')) {
-			return '\'\'' === escapeshellarg('§');
-		} else {
-			return 0 === preg_match('/utf-?8/i', setlocale(LC_CTYPE, 0));
-		}
-	}
-
-	/**
-	 * Check if the setlocale call does not work. This can happen if the right
-	 * local packages are not available on the server.
-	 *
-	 * @return bool
-	 */
-	public static function isSetLocaleWorking() {
-		if (self::isNonUTF8Locale()) {
-			// Borrowed from \Patchwork\Utf8\Bootup::initLocale
-			setlocale(LC_ALL, 'C.UTF-8', 'C');
-			setlocale(LC_CTYPE, 'en_US.UTF-8', 'fr_FR.UTF-8', 'es_ES.UTF-8', 'de_DE.UTF-8', 'ru_RU.UTF-8', 'pt_BR.UTF-8', 'it_IT.UTF-8', 'ja_JP.UTF-8', 'zh_CN.UTF-8', '0');
-
-			// Check again
-			if (self::isNonUTF8Locale()) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if it's possible to get the inline annotations
-	 *
-	 * @return bool
-	 */
-	public static function isAnnotationsWorking() {
-		$reflection = new \ReflectionMethod(__METHOD__);
-		$docs = $reflection->getDocComment();
-
-		return (is_string($docs) && strlen($docs) > 50);
-	}
-
-	/**
-	 * Check if the PHP module fileinfo is loaded.
-	 *
-	 * @return bool
-	 */
-	public static function fileInfoLoaded() {
-		return function_exists('finfo_open');
-	}
-
-	/**
-	 * clear all levels of output buffering
-	 *
-	 * @return void
-	 */
-	public static function obEnd() {
-		while (ob_get_level()) {
-			ob_end_clean();
-		}
-	}
-
-	/**
-	 * Checks whether the server is running on Mac OS X
-	 *
-	 * @return bool true if running on Mac OS X, false otherwise
-	 */
-	public static function runningOnMac() {
-		return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
-	}
-
-	/**
-	 * Handles the case that there may not be a theme, then check if a "default"
-	 * theme exists and take that one
-	 *
-	 * @return string the theme
-	 */
-	public static function getTheme() {
-		$theme = \OC::$server->getSystemConfig()->getValue("theme", '');
-
-		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
-				$theme = 'default';
-			}
-		}
-
-		return $theme;
-	}
-
-	/**
-	 * Normalize a unicode string
-	 *
-	 * @param string $value a not normalized string
-	 * @return bool|string
-	 */
-	public static function normalizeUnicode($value) {
-		if (Normalizer::isNormalized($value)) {
-			return $value;
-		}
-
-		$normalizedValue = Normalizer::normalize($value);
-		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
-			return $value;
-		}
-
-		return $normalizedValue;
-	}
-
-	/**
-	 * A human readable string is generated based on version and build number
-	 *
-	 * @return string
-	 */
-	public static function getHumanVersion() {
-		$version = OC_Util::getVersionString();
-		$build = OC_Util::getBuild();
-		if (!empty($build) and OC_Util::getChannel() === 'daily') {
-			$version .= ' Build:' . $build;
-		}
-		return $version;
-	}
-
-	/**
-	 * Returns whether the given file name is valid
-	 *
-	 * @param string $file file name to check
-	 * @return bool true if the file name is valid, false otherwise
-	 * @deprecated use \OC\Files\View::verifyPath()
-	 */
-	public static function isValidFileName($file) {
-		$trimmed = trim($file);
-		if ($trimmed === '') {
-			return false;
-		}
-		if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
-			return false;
-		}
-
-		// detect part files
-		if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
-			return false;
-		}
-
-		foreach (str_split($trimmed) as $char) {
-			if (strpos(\OCP\Constants::FILENAME_INVALID_CHARS, $char) !== false) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Check whether the instance needs to perform an upgrade,
-	 * either when the core version is higher or any app requires
-	 * an upgrade.
-	 *
-	 * @param \OC\SystemConfig $config
-	 * @return bool whether the core or any app needs an upgrade
-	 * @throws \OCP\HintException When the upgrade from the given version is not allowed
-	 */
-	public static function needUpgrade(\OC\SystemConfig $config) {
-		if ($config->getValue('installed', false)) {
-			$installedVersion = $config->getValue('version', '0.0.0');
-			$currentVersion = implode('.', \OCP\Util::getVersion());
-			$versionDiff = version_compare($currentVersion, $installedVersion);
-			if ($versionDiff > 0) {
-				return true;
-			} elseif ($config->getValue('debug', false) && $versionDiff < 0) {
-				// downgrade with debug
-				$installedMajor = explode('.', $installedVersion);
-				$installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
-				$currentMajor = explode('.', $currentVersion);
-				$currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
-				if ($installedMajor === $currentMajor) {
-					// Same major, allow downgrade for developers
-					return true;
-				} else {
-					// downgrade attempt, throw exception
-					throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
-				}
-			} elseif ($versionDiff < 0) {
-				// downgrade attempt, throw exception
-				throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
-			}
-
-			// also check for upgrades for apps (independently from the user)
-			$apps = \OC_App::getEnabledApps(false, true);
-			$shouldUpgrade = false;
-			foreach ($apps as $app) {
-				if (\OC_App::shouldUpgrade($app)) {
-					$shouldUpgrade = true;
-					break;
-				}
-			}
-			return $shouldUpgrade;
-		} else {
-			return false;
-		}
-	}
+        return $content !== $testContent && $fallbackContent !== $testContent;
+    }
+
+    /**
+     * Check if current locale is non-UTF8
+     *
+     * @return bool
+     */
+    private static function isNonUTF8Locale() {
+        if (function_exists('escapeshellcmd')) {
+            return '' === escapeshellcmd('§');
+        } elseif (function_exists('escapeshellarg')) {
+            return '\'\'' === escapeshellarg('§');
+        } else {
+            return 0 === preg_match('/utf-?8/i', setlocale(LC_CTYPE, 0));
+        }
+    }
+
+    /**
+     * Check if the setlocale call does not work. This can happen if the right
+     * local packages are not available on the server.
+     *
+     * @return bool
+     */
+    public static function isSetLocaleWorking() {
+        if (self::isNonUTF8Locale()) {
+            // Borrowed from \Patchwork\Utf8\Bootup::initLocale
+            setlocale(LC_ALL, 'C.UTF-8', 'C');
+            setlocale(LC_CTYPE, 'en_US.UTF-8', 'fr_FR.UTF-8', 'es_ES.UTF-8', 'de_DE.UTF-8', 'ru_RU.UTF-8', 'pt_BR.UTF-8', 'it_IT.UTF-8', 'ja_JP.UTF-8', 'zh_CN.UTF-8', '0');
+
+            // Check again
+            if (self::isNonUTF8Locale()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if it's possible to get the inline annotations
+     *
+     * @return bool
+     */
+    public static function isAnnotationsWorking() {
+        $reflection = new \ReflectionMethod(__METHOD__);
+        $docs = $reflection->getDocComment();
+
+        return (is_string($docs) && strlen($docs) > 50);
+    }
+
+    /**
+     * Check if the PHP module fileinfo is loaded.
+     *
+     * @return bool
+     */
+    public static function fileInfoLoaded() {
+        return function_exists('finfo_open');
+    }
+
+    /**
+     * clear all levels of output buffering
+     *
+     * @return void
+     */
+    public static function obEnd() {
+        while (ob_get_level()) {
+            ob_end_clean();
+        }
+    }
+
+    /**
+     * Checks whether the server is running on Mac OS X
+     *
+     * @return bool true if running on Mac OS X, false otherwise
+     */
+    public static function runningOnMac() {
+        return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
+    }
+
+    /**
+     * Handles the case that there may not be a theme, then check if a "default"
+     * theme exists and take that one
+     *
+     * @return string the theme
+     */
+    public static function getTheme() {
+        $theme = \OC::$server->getSystemConfig()->getValue("theme", '');
+
+        if ($theme === '') {
+            if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+                $theme = 'default';
+            }
+        }
+
+        return $theme;
+    }
+
+    /**
+     * Normalize a unicode string
+     *
+     * @param string $value a not normalized string
+     * @return bool|string
+     */
+    public static function normalizeUnicode($value) {
+        if (Normalizer::isNormalized($value)) {
+            return $value;
+        }
+
+        $normalizedValue = Normalizer::normalize($value);
+        if ($normalizedValue === null || $normalizedValue === false) {
+            \OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+            return $value;
+        }
+
+        return $normalizedValue;
+    }
+
+    /**
+     * A human readable string is generated based on version and build number
+     *
+     * @return string
+     */
+    public static function getHumanVersion() {
+        $version = OC_Util::getVersionString();
+        $build = OC_Util::getBuild();
+        if (!empty($build) and OC_Util::getChannel() === 'daily') {
+            $version .= ' Build:' . $build;
+        }
+        return $version;
+    }
+
+    /**
+     * Returns whether the given file name is valid
+     *
+     * @param string $file file name to check
+     * @return bool true if the file name is valid, false otherwise
+     * @deprecated use \OC\Files\View::verifyPath()
+     */
+    public static function isValidFileName($file) {
+        $trimmed = trim($file);
+        if ($trimmed === '') {
+            return false;
+        }
+        if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
+            return false;
+        }
+
+        // detect part files
+        if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
+            return false;
+        }
+
+        foreach (str_split($trimmed) as $char) {
+            if (strpos(\OCP\Constants::FILENAME_INVALID_CHARS, $char) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check whether the instance needs to perform an upgrade,
+     * either when the core version is higher or any app requires
+     * an upgrade.
+     *
+     * @param \OC\SystemConfig $config
+     * @return bool whether the core or any app needs an upgrade
+     * @throws \OCP\HintException When the upgrade from the given version is not allowed
+     */
+    public static function needUpgrade(\OC\SystemConfig $config) {
+        if ($config->getValue('installed', false)) {
+            $installedVersion = $config->getValue('version', '0.0.0');
+            $currentVersion = implode('.', \OCP\Util::getVersion());
+            $versionDiff = version_compare($currentVersion, $installedVersion);
+            if ($versionDiff > 0) {
+                return true;
+            } elseif ($config->getValue('debug', false) && $versionDiff < 0) {
+                // downgrade with debug
+                $installedMajor = explode('.', $installedVersion);
+                $installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
+                $currentMajor = explode('.', $currentVersion);
+                $currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
+                if ($installedMajor === $currentMajor) {
+                    // Same major, allow downgrade for developers
+                    return true;
+                } else {
+                    // downgrade attempt, throw exception
+                    throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+                }
+            } elseif ($versionDiff < 0) {
+                // downgrade attempt, throw exception
+                throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+            }
+
+            // also check for upgrades for apps (independently from the user)
+            $apps = \OC_App::getEnabledApps(false, true);
+            $shouldUpgrade = false;
+            foreach ($apps as $app) {
+                if (\OC_App::shouldUpgrade($app)) {
+                    $shouldUpgrade = true;
+                    break;
+                }
+            }
+            return $shouldUpgrade;
+        } else {
+            return false;
+        }
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -183,7 +183,7 @@ 
 		/** @var LoggerInterface $logger */
 		$logger = \OC::$server->get(LoggerInterface::class);
 
-		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton');
 		$userLang = \OC::$server->getL10NFactory()->findLanguage();
 		$skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
 
@@ -205,9 +205,9 @@ 
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		$appdata = 'appdata_' . $instanceId;
+		$appdata = 'appdata_'.$instanceId;
 		if ($userId === $appdata) {
-			throw new \RuntimeException('username is reserved name: ' . $appdata);
+			throw new \RuntimeException('username is reserved name: '.$appdata);
 		}
 
 		if (!empty($skeletonDirectory)) {
@@ -242,14 +242,14 @@ 
 		// Copy the files
 		while (false !== ($file = readdir($dir))) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if (is_dir($source . '/' . $file)) {
+				if (is_dir($source.'/'.$file)) {
 					$child = $target->newFolder($file);
-					self::copyr($source . '/' . $file, $child);
+					self::copyr($source.'/'.$file, $child);
 				} else {
 					$child = $target->newFile($file);
-					$sourceStream = fopen($source . '/' . $file, 'r');
+					$sourceStream = fopen($source.'/'.$file, 'r');
 					if ($sourceStream === false) {
-						$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
+						$logger->error(sprintf('Could not fopen "%s"', $source.'/'.$file), ['app' => 'core']);
 						closedir($dir);
 						return;
 					}
@@ -325,8 +325,8 @@ 
 			return;
 		}
 
-		$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
-		require OC::$SERVERROOT . '/version.php';
+		$timestamp = filemtime(OC::$SERVERROOT.'/version.php');
+		require OC::$SERVERROOT.'/version.php';
 		/** @var int $timestamp */
 		self::$versionCache['OC_Version_Timestamp'] = $timestamp;
 		/** @var string $OC_Version */
@@ -500,7 +500,7 @@ 
 	public static function checkServer(\OC\SystemConfig $config) {
 		$l = \OC::$server->getL10N('lib');
 		$errors = [];
-		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
+		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT.'/data');
 
 		if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
 			// this check needs to be done every time
@@ -540,9 +540,9 @@ 
 				$errors[] = [
 					'error' => $l->t('Cannot write into "config" directory.'),
 					'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s',
-						[ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. '
+						[$urlGenerator->linkToDocs('admin-dir_permissions')]).'. '
 						. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
-						[ $urlGenerator->linkToDocs('admin-config') ])
+						[$urlGenerator->linkToDocs('admin-config')])
 				];
 			}
 		}
@@ -716,7 +716,7 @@ 
 			$version -= ($minor * 100);
 			$patch = $version;
 			$errors[] = [
-				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
+				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major.'.'.$minor.'.'.$patch]),
 				'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
 			];
 		}
@@ -819,10 +819,10 @@ 
 				'hint' => $l->t('Check the value of "datadirectory" in your configuration.')
 			];
 		}
-		if (!file_exists($dataDirectory . '/.ocdata')) {
+		if (!file_exists($dataDirectory.'/.ocdata')) {
 			$errors[] = [
 				'error' => $l->t('Your data directory is invalid.'),
-				'hint' => $l->t('Ensure there is a file called ".ocdata"' .
+				'hint' => $l->t('Ensure there is a file called ".ocdata"'.
 					' in the root of the data directory.')
 			];
 		}
@@ -838,7 +838,7 @@ 
 	public static function checkLoggedIn() {
 		// Check if we are a user
 		if (!\OC::$server->getUserSession()->isLoggedIn()) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+			header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
 						'core.login.showLoginForm',
 						[
 							'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -849,7 +849,7 @@ 
 		}
 		// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
 		if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+			header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 			exit();
 		}
 	}
@@ -862,7 +862,7 @@ 
 	public static function checkAdminUser() {
 		OC_Util::checkLoggedIn();
 		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+			header('Location: '.\OCP\Util::linkToAbsolute('', 'index.php'));
 			exit();
 		}
 	}
@@ -888,7 +888,7 @@ 
 	 */
 	public static function redirectToDefaultPage() {
 		$location = self::getDefaultPageUrl();
-		header('Location: ' . $location);
+		header('Location: '.$location);
 		exit();
 	}
 
@@ -901,7 +901,7 @@ 
 		$id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
 		if (is_null($id)) {
 			// We need to guarantee at least one letter in instanceid so it can be used as the session_name
-			$id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+			$id = 'oc'.\OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 			\OC::$server->getSystemConfig()->setValue('instanceid', $id);
 		}
 		return $id;
@@ -919,12 +919,12 @@ 
 	public static function sanitizeHTML($value) {
 		if (is_array($value)) {
 			/** @var string[] $value */
-			$value = array_map(function ($value) {
+			$value = array_map(function($value) {
 				return self::sanitizeHTML($value);
 			}, $value);
 		} else {
 			// Specify encoding for PHP<5.4
-			$value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
+			$value = htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8');
 		}
 		return $value;
 	}
@@ -957,7 +957,7 @@ 
 		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
 
 		// creating a test file
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		if (file_exists($testFile)) {// already running this test, possible recursive call
 			return false;
@@ -966,7 +966,7 @@ 
 		$fp = @fopen($testFile, 'w');
 		if (!$fp) {
 			throw new \OCP\HintException('Can\'t create test file to check for working .htaccess file.',
-				'Make sure it is possible for the web server to write to ' . $testFile);
+				'Make sure it is possible for the web server to write to '.$testFile);
 		}
 		fwrite($fp, $testContent);
 		fclose($fp);
@@ -993,10 +993,10 @@ 
 		}
 
 		$fileName = '/htaccesstest.txt';
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		// accessing the file via http
-		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT.'/data'.$fileName);
 		try {
 			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
 		} catch (\Exception $e) {
@@ -1004,9 +1004,9 @@ 
 		}
 
 		if (strpos($url, 'https:') === 0) {
-			$url = 'http:' . substr($url, 6);
+			$url = 'http:'.substr($url, 6);
 		} else {
-			$url = 'https:' . substr($url, 5);
+			$url = 'https:'.substr($url, 5);
 		}
 
 		try {
@@ -1112,7 +1112,7 @@ 
 		$theme = \OC::$server->getSystemConfig()->getValue("theme", '');
 
 		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+			if (is_dir(OC::$SERVERROOT.'/themes/default')) {
 				$theme = 'default';
 			}
 		}
@@ -1133,7 +1133,7 @@ 
 
 		$normalizedValue = Normalizer::normalize($value);
 		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+			\OC::$server->getLogger()->warning('normalizing failed for "'.$value.'"', ['app' => 'core']);
 			return $value;
 		}
 
@@ -1149,7 +1149,7 @@ 
 		$version = OC_Util::getVersionString();
 		$build = OC_Util::getBuild();
 		if (!empty($build) and OC_Util::getChannel() === 'daily') {
-			$version .= ' Build:' . $build;
+			$version .= ' Build:'.$build;
 		}
 		return $version;
 	}
@@ -1171,7 +1171,7 @@ 
 		}
 
 		// detect part files
-		if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
+		if (preg_match('/'.\OCP\Files\FileInfo::BLACKLIST_FILES_REGEX.'/', $trimmed) !== 0) {
 			return false;
 		}
 
@@ -1202,19 +1202,19 @@ 
 			} elseif ($config->getValue('debug', false) && $versionDiff < 0) {
 				// downgrade with debug
 				$installedMajor = explode('.', $installedVersion);
-				$installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
+				$installedMajor = $installedMajor[0].'.'.$installedMajor[1];
 				$currentMajor = explode('.', $currentVersion);
-				$currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
+				$currentMajor = $currentMajor[0].'.'.$currentMajor[1];
 				if ($installedMajor === $currentMajor) {
 					// Same major, allow downgrade for developers
 					return true;
 				} else {
 					// downgrade attempt, throw exception
-					throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+					throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 				}
 			} elseif ($versionDiff < 0) {
 				// downgrade attempt, throw exception
-				throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+				throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 			}
 
 			// also check for upgrades for apps (independently from the user)

lib/private/Server.php

Indentation +2086 added lines, -2086 removed lines

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

Spacing +102 added lines, -102 removed lines

@@ -281,10 +281,10 @@ 
 		$this->registerParameter('isCLI', \OC::$CLI);
 		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) {
 			return $c;
 		});
 
@@ -309,11 +309,11 @@ 
 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
-		$this->registerService(View::class, function (Server $c) {
+		$this->registerService(View::class, function(Server $c) {
 			return new View();
 		}, false);
 
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
+		$this->registerService(IPreview::class, function(ContainerInterface $c) {
 			return new PreviewManager(
 				$c->get(\OCP\IConfig::class),
 				$c->get(IRootFolder::class),
@@ -331,7 +331,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(ContainerInterface $c) {
 			return new \OC\Preview\Watcher(
 				new \OC\Preview\Storage\Root(
 					$c->get(IRootFolder::class),
@@ -340,7 +340,7 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Encryption\IManager::class, function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -362,7 +362,7 @@ 
 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class);
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
+		$this->registerService(IFile::class, function(ContainerInterface $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->get(IUserManager::class),
@@ -378,7 +378,7 @@ 
 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class);
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
+		$this->registerService(IStorage::class, function(ContainerInterface $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -401,22 +401,22 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+		$this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) {
 			/** @var \OCP\IConfig $config */
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagManager::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getManager();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
 
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
+		$this->registerService('RootFolder', function(ContainerInterface $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -437,7 +437,7 @@ 
 
 			return $root;
 		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
+		$this->registerService(HookConnector::class, function(ContainerInterface $c) {
 			return new HookConnector(
 				$c->get(IRootFolder::class),
 				new View(),
@@ -449,8 +449,8 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
 
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(IRootFolder::class, function(ContainerInterface $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->get('RootFolder');
 			});
 		});
@@ -461,44 +461,44 @@ 
 		$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) {
 			$groupManager = new \OC\Group\Manager($this->get(IUserManager::class), $c->get(SymfonyAdapter::class), $this->get(ILogger::class));
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupCreatedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
@@ -508,7 +508,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
 
-		$this->registerService(Store::class, function (ContainerInterface $c) {
+		$this->registerService(Store::class, function(ContainerInterface $c) {
 			$session = $c->get(ISession::class);
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
 				$tokenProvider = $c->get(IProvider::class);
@@ -521,7 +521,7 @@ 
 		$this->registerAlias(IStore::class, Store::class);
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->get(IUserManager::class);
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -547,26 +547,26 @@ 
 				$c->get(IEventDispatcher::class)
 			);
 			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) use ($legacyDispatcher) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
 				$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
 			});
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 
@@ -574,7 +574,7 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 
@@ -582,14 +582,14 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
 
@@ -597,12 +597,12 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+			$userSession->listen('\OC\User', 'preRememberedLogin', function($uid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
 
@@ -610,19 +610,19 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
+			$userSession->listen('\OC\User', 'logout', function($user) {
 				\OC_Hook::emit('OC_User', 'logout', []);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
+			$userSession->listen('\OC\User', 'postLogout', function($user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
 
@@ -646,7 +646,7 @@ 
 		$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+		$this->registerService(\OC\SystemConfig::class, function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 		/** @deprecated 19.0.0 */
@@ -656,7 +656,7 @@ 
 		$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(IFactory::class, function (Server $c) {
+		$this->registerService(IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->get(\OCP\IConfig::class),
 				$c->getRequest(),
@@ -676,13 +676,13 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
 
-		$this->registerService(ICache::class, function ($c) {
+		$this->registerService(ICache::class, function($c) {
 			return new Cache\File();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserCache', ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(ILogger::class),
 				ArrayCache::class,
 				ArrayCache::class,
@@ -706,7 +706,7 @@ 
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->get(ILogger::class),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -720,12 +720,12 @@ 
 		$this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			return new RedisFactory($systemConfig, $c->getEventLogger());
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			$l10n = $this->get(IFactory::class)->get('lib');
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
@@ -738,14 +738,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(AvatarManager::class, function (Server $c) {
+		$this->registerService(AvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->get(IUserSession::class),
 				$c->get(\OC\User\Manager::class),
@@ -764,7 +764,7 @@ 
 		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
 		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
 
-		$this->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->get(SystemConfig::class));
 			$logger = $factory->get($logType);
@@ -778,7 +778,7 @@ 
 		// PSR-3 logger
 		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->get(SystemConfig::class));
 		});
 
@@ -786,7 +786,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('JobList', IJobList::class);
 
-		$this->registerService(Router::class, function (Server $c) {
+		$this->registerService(Router::class, function(Server $c) {
 			$cacheFactory = $c->get(ICacheFactory::class);
 			$logger = $c->get(ILogger::class);
 			if ($cacheFactory->isLocalCacheAvailable()) {
@@ -804,7 +804,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Search', ISearch::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			$cacheFactory = $c->get(ICacheFactory::class);
 			if ($cacheFactory->isAvailable()) {
 				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
@@ -840,7 +840,7 @@ 
 		$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
 
 		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
+		$this->registerService(Connection::class, function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -857,30 +857,30 @@ 
 
 		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
 		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(LocalAddressChecker::class, function (ContainerInterface $c) {
+		$this->registerService(LocalAddressChecker::class, function(ContainerInterface $c) {
 			return new LocalAddressChecker(
 				$c->get(ILogger::class),
 			);
 		});
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+		$this->registerService(NegativeDnsCache::class, function(ContainerInterface $c) {
 			return new NegativeDnsCache(
 				$c->get(ICacheFactory::class),
 			);
 		});
-		$this->registerService(DnsPinMiddleware::class, function (ContainerInterface $c) {
+		$this->registerService(DnsPinMiddleware::class, function(ContainerInterface $c) {
 			return new DnsPinMiddleware(
 				$c->get(NegativeDnsCache::class),
 				$c->get(LocalAddressChecker::class)
 			);
 		});
 		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IEventLogger::class, function(ContainerInterface $c) {
 			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
 
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IQueryLogger::class, function(ContainerInterface $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -895,7 +895,7 @@ 
 		$this->registerDeprecatedAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (ContainerInterface $c) {
+		$this->registerService(AppManager::class, function(ContainerInterface $c) {
 			// TODO: use auto-wiring
 			return new \OC\App\AppManager(
 				$c->get(IUserSession::class),
@@ -915,7 +915,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
 
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -926,7 +926,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
 
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+		$this->registerService(IUserMountCache::class, function(ContainerInterface $c) {
 			$mountCache = new UserMountCache(
 				$c->get(IDBConnection::class),
 				$c->get(IUserManager::class),
@@ -939,7 +939,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
 
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+		$this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->get(IUserMountCache::class);
 			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
@@ -961,7 +961,7 @@ 
 
 		/** @deprecated 20.0.0 */
 		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
+		$this->registerService(IBus::class, function(ContainerInterface $c) {
 			$busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -982,7 +982,7 @@ 
 		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Throttler', Throttler::class);
-		$this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) {
+		$this->registerService('IntegrityCodeChecker', function(ContainerInterface $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
@@ -1003,7 +1003,7 @@ 
 				$c->get(IMimeTypeDetector::class)
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IRequest::class, function(ContainerInterface $c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -1040,7 +1040,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(IMailer::class, function (Server $c) {
+		$this->registerService(IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->get(\OCP\IConfig::class),
 				$c->get(ILogger::class),
@@ -1057,7 +1057,7 @@ 
 		/** @deprecated 21.0.0 */
 		$this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class);
 
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass) || !class_exists($factoryClass)) {
@@ -1066,11 +1066,11 @@ 
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			return new $factoryClass($this);
 		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProvider::class, function(ContainerInterface $c) {
 			$factory = $c->get(ILDAPProviderFactory::class);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILockingProvider::class, function(ContainerInterface $c) {
 			$ini = $c->get(IniGetWrapper::class);
 			$config = $c->get(\OCP\IConfig::class);
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -1095,7 +1095,7 @@ 
 		$this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class);
 
 		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
+		$this->registerService(SetupManager::class, function($c) {
 			// create the setupmanager through the mount manager to resolve the cyclic dependency
 			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
 		});
@@ -1103,12 +1103,12 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MountManager', IMountManager::class);
 
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+		$this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) {
 			return new \OC\Files\Type\Detection(
 				$c->get(IURLGenerator::class),
 				$c->get(ILogger::class),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		/** @deprecated 19.0.0 */
@@ -1117,19 +1117,19 @@ 
 		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
 		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+		$this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) {
 			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
@@ -1137,14 +1137,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
 
-		$this->registerService(ICommentsManager::class, function (Server $c) {
+		$this->registerService(ICommentsManager::class, function(Server $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			$manager = $factory->getManager();
 
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->get(IUserManager::class);
 				$user = $manager->get($id);
 				if (is_null($user)) {
@@ -1162,7 +1162,7 @@ 
 		$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
 
 		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			/*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
@@ -1197,7 +1197,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->get(IURLGenerator::class),
@@ -1211,7 +1211,7 @@ 
 		$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
 		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
 
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+		$this->registerService('CryptoWrapper', function(ContainerInterface $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1238,14 +1238,14 @@ 
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+		$this->registerService(SessionStorage::class, function(ContainerInterface $c) {
 			return new SessionStorage($c->get(ISession::class));
 		});
 		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
 
-		$this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) {
+		$this->registerService(\OCP\Share\IManager::class, function(IServerContainer $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1277,7 +1277,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class);
 
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
 			$instance = new Collaboration\Collaborators\Search($c);
 
 			// register default plugins
@@ -1300,33 +1300,33 @@ 
 
 		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
 		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->get(IRootFolder::class),
 				$c->get(SystemConfig::class)
 			);
 		});
 
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(ContainerInterface $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->get(ISession::class);
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) {
 			return new DiscoveryService(
 				$c->get(ICacheFactory::class),
 				$c->get(IClientService::class)
 			);
 		});
 
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudIdManager::class, function(ContainerInterface $c) {
 			return new CloudIdManager($c->get(\OCP\Contacts\IManager::class), $c->get(IURLGenerator::class), $c->get(IUserManager::class));
 		});
 
 		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
 
-		$this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudFederationProviderManager::class, function(ContainerInterface $c) {
 			return new CloudFederationProviderManager(
 				$c->get(IAppManager::class),
 				$c->get(IClientService::class),
@@ -1335,7 +1335,7 @@ 
 			);
 		});
 
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1347,7 +1347,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->getThemingDefaults()
 			);
@@ -1355,17 +1355,17 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\ISession::class, function(ContainerInterface $c) {
 			return $c->get(\OCP\IUserSession::class)->getSession();
 		}, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+		$this->registerService(IShareHelper::class, function(ContainerInterface $c) {
 			return new ShareHelper(
 				$c->get(\OCP\Share\IManager::class)
 			);
 		});
 
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
+		$this->registerService(Installer::class, function(ContainerInterface $c) {
 			return new Installer(
 				$c->get(AppFetcher::class),
 				$c->get(IClientService::class),
@@ -1376,11 +1376,11 @@ 
 			);
 		});
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IApiFactory::class, function(ContainerInterface $c) {
 			return new ApiFactory($c->get(IClientService::class));
 		});
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IInstanceFactory::class, function(ContainerInterface $c) {
 			$memcacheFactory = $c->get(ICacheFactory::class);
 			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
 		});
@@ -1437,7 +1437,7 @@ 
 		$dispatcher = $this->get(SymfonyAdapter::class);
 
 		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
 			$logger = $this->get(ILogger::class);
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
@@ -1450,11 +1450,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();
@@ -2345,11 +2345,11 @@ 
 	}
 
 	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) {
 			try {
 				/** @var ILogger $logger */
 				$logger = $container->get(ILogger::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+				$logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
 			} catch (ContainerExceptionInterface $e) {
 				// Could not get logger. Continue
 			}

lib/private/Files/Node/Root.php

Indentation +332 added lines, -332 removed lines

@@ -68,336 +68,336 @@
  * @package OC\Files\Node
  */
 class Root extends Folder implements IRootFolder {
-	private Manager $mountManager;
-	private PublicEmitter $emitter;
-	private ?IUser $user;
-	private CappedMemoryCache $userFolderCache;
-	private IUserMountCache $userMountCache;
-	private ILogger $logger;
-	private IUserManager $userManager;
-	private IEventDispatcher $eventDispatcher;
-
-	/**
-	 * @param Manager $manager
-	 * @param View $view
-	 * @param IUser|null $user
-	 * @param IUserMountCache $userMountCache
-	 * @param ILogger $logger
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(
-		$manager,
-		$view,
-		$user,
-		IUserMountCache $userMountCache,
-		ILogger $logger,
-		IUserManager $userManager,
-		IEventDispatcher $eventDispatcher
-	) {
-		parent::__construct($this, $view, '');
-		$this->mountManager = $manager;
-		$this->user = $user;
-		$this->emitter = new PublicEmitter();
-		$this->userFolderCache = new CappedMemoryCache();
-		$this->userMountCache = $userMountCache;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
-			$this->userFolderCache = new CappedMemoryCache();
-		});
-	}
-
-	/**
-	 * Get the user for which the filesystem is setup
-	 *
-	 * @return \OC\User\User
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$this->emitter->listen($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$this->emitter->removeListener($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param Node[] $arguments
-	 */
-	public function emit($scope, $method, $arguments = []) {
-		$this->emitter->emit($scope, $method, $arguments);
-	}
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param string $mountPoint
-	 * @param array $arguments
-	 */
-	public function mount($storage, $mountPoint, $arguments = []) {
-		$mount = new MountPoint($storage, $mountPoint, $arguments);
-		$this->mountManager->addMount($mount);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint
-	 */
-	public function getMount($mountPoint) {
-		return $this->mountManager->find($mountPoint);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountsIn($mountPoint) {
-		return $this->mountManager->findIn($mountPoint);
-	}
-
-	/**
-	 * @param string $storageId
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountByStorageId($storageId) {
-		return $this->mountManager->findByStorageId($storageId);
-	}
-
-	/**
-	 * @param int $numericId
-	 * @return MountPoint[]
-	 */
-	public function getMountByNumericStorageId($numericId) {
-		return $this->mountManager->findByNumericId($numericId);
-	}
-
-	/**
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	public function unMount($mount) {
-		$this->mountManager->remove($mount);
-	}
-
-	/**
-	 * @param string $path
-	 * @return Node
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function get($path) {
-		$path = $this->normalizePath($path);
-		if ($this->isValidPath($path)) {
-			$fullPath = $this->getFullPath($path);
-			$fileInfo = $this->view->getFileInfo($fullPath);
-			if ($fileInfo) {
-				return $this->createNode($fullPath, $fileInfo);
-			} else {
-				throw new NotFoundException($path);
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	//most operations can't be done on the root
-
-	/**
-	 * @param string $targetPath
-	 * @return \OC\Files\Node\Node
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function rename($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	public function delete() {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @return \OC\Files\Node\Node
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function copy($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return '/';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getId() {
-		return 0;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return [];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getMTime() {
-		return 0;
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int
-	 */
-	public function getSize($includeMounts = true) {
-		return 0;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEtag() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPermissions() {
-		return \OCP\Constants::PERMISSION_CREATE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isReadable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUpdateable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isDeletable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isShareable() {
-		return false;
-	}
-
-	/**
-	 * @return Node
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getParent() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return '';
-	}
-
-	/**
-	 * Returns a view to user's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder
-	 * @throws NoUserException
-	 * @throws NotPermittedException
-	 */
-	public function getUserFolder($userId) {
-		$userObject = $this->userManager->get($userId);
-
-		if (is_null($userObject)) {
-			$this->logger->error(
-				sprintf(
-					'Backends provided no user object for %s',
-					$userId
-				),
-				[
-					'app' => 'files',
-				]
-			);
-			throw new NoUserException('Backends provided no user object');
-		}
-
-		$userId = $userObject->getUID();
-
-		if (!$this->userFolderCache->hasKey($userId)) {
-			\OC\Files\Filesystem::initMountPoints($userId);
-
-			try {
-				$folder = $this->get('/' . $userId . '/files');
-			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
-				}
-				$folder = $this->newFolder('/' . $userId . '/files');
-			}
-
-			$this->userFolderCache->set($userId, $folder);
-		}
-
-		return $this->userFolderCache->get($userId);
-	}
-
-	public function getUserMountCache() {
-		return $this->userMountCache;
-	}
+    private Manager $mountManager;
+    private PublicEmitter $emitter;
+    private ?IUser $user;
+    private CappedMemoryCache $userFolderCache;
+    private IUserMountCache $userMountCache;
+    private ILogger $logger;
+    private IUserManager $userManager;
+    private IEventDispatcher $eventDispatcher;
+
+    /**
+     * @param Manager $manager
+     * @param View $view
+     * @param IUser|null $user
+     * @param IUserMountCache $userMountCache
+     * @param ILogger $logger
+     * @param IUserManager $userManager
+     */
+    public function __construct(
+        $manager,
+        $view,
+        $user,
+        IUserMountCache $userMountCache,
+        ILogger $logger,
+        IUserManager $userManager,
+        IEventDispatcher $eventDispatcher
+    ) {
+        parent::__construct($this, $view, '');
+        $this->mountManager = $manager;
+        $this->user = $user;
+        $this->emitter = new PublicEmitter();
+        $this->userFolderCache = new CappedMemoryCache();
+        $this->userMountCache = $userMountCache;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
+            $this->userFolderCache = new CappedMemoryCache();
+        });
+    }
+
+    /**
+     * Get the user for which the filesystem is setup
+     *
+     * @return \OC\User\User
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $this->emitter->listen($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $this->emitter->removeListener($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param Node[] $arguments
+     */
+    public function emit($scope, $method, $arguments = []) {
+        $this->emitter->emit($scope, $method, $arguments);
+    }
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     * @param string $mountPoint
+     * @param array $arguments
+     */
+    public function mount($storage, $mountPoint, $arguments = []) {
+        $mount = new MountPoint($storage, $mountPoint, $arguments);
+        $this->mountManager->addMount($mount);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint
+     */
+    public function getMount($mountPoint) {
+        return $this->mountManager->find($mountPoint);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountsIn($mountPoint) {
+        return $this->mountManager->findIn($mountPoint);
+    }
+
+    /**
+     * @param string $storageId
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountByStorageId($storageId) {
+        return $this->mountManager->findByStorageId($storageId);
+    }
+
+    /**
+     * @param int $numericId
+     * @return MountPoint[]
+     */
+    public function getMountByNumericStorageId($numericId) {
+        return $this->mountManager->findByNumericId($numericId);
+    }
+
+    /**
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    public function unMount($mount) {
+        $this->mountManager->remove($mount);
+    }
+
+    /**
+     * @param string $path
+     * @return Node
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function get($path) {
+        $path = $this->normalizePath($path);
+        if ($this->isValidPath($path)) {
+            $fullPath = $this->getFullPath($path);
+            $fileInfo = $this->view->getFileInfo($fullPath);
+            if ($fileInfo) {
+                return $this->createNode($fullPath, $fileInfo);
+            } else {
+                throw new NotFoundException($path);
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    //most operations can't be done on the root
+
+    /**
+     * @param string $targetPath
+     * @return \OC\Files\Node\Node
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function rename($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    public function delete() {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param string $targetPath
+     * @return \OC\Files\Node\Node
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function copy($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return '/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getId() {
+        return 0;
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return [];
+    }
+
+    /**
+     * @return int
+     */
+    public function getMTime() {
+        return 0;
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int
+     */
+    public function getSize($includeMounts = true) {
+        return 0;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEtag() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getPermissions() {
+        return \OCP\Constants::PERMISSION_CREATE;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isReadable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpdateable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeletable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShareable() {
+        return false;
+    }
+
+    /**
+     * @return Node
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getParent() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return '';
+    }
+
+    /**
+     * Returns a view to user's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder
+     * @throws NoUserException
+     * @throws NotPermittedException
+     */
+    public function getUserFolder($userId) {
+        $userObject = $this->userManager->get($userId);
+
+        if (is_null($userObject)) {
+            $this->logger->error(
+                sprintf(
+                    'Backends provided no user object for %s',
+                    $userId
+                ),
+                [
+                    'app' => 'files',
+                ]
+            );
+            throw new NoUserException('Backends provided no user object');
+        }
+
+        $userId = $userObject->getUID();
+
+        if (!$this->userFolderCache->hasKey($userId)) {
+            \OC\Files\Filesystem::initMountPoints($userId);
+
+            try {
+                $folder = $this->get('/' . $userId . '/files');
+            } catch (NotFoundException $e) {
+                if (!$this->nodeExists('/' . $userId)) {
+                    $this->newFolder('/' . $userId);
+                }
+                $folder = $this->newFolder('/' . $userId . '/files');
+            }
+
+            $this->userFolderCache->set($userId, $folder);
+        }
+
+        return $this->userFolderCache->get($userId);
+    }
+
+    public function getUserMountCache() {
+        return $this->userMountCache;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -102,7 +102,7 @@ 
 		$this->userMountCache = $userMountCache;
 		$this->logger = $logger;
 		$this->userManager = $userManager;
-		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
+		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function() {
 			$this->userFolderCache = new CappedMemoryCache();
 		});
 	}
@@ -383,12 +383,12 @@ 
 			\OC\Files\Filesystem::initMountPoints($userId);
 
 			try {
-				$folder = $this->get('/' . $userId . '/files');
+				$folder = $this->get('/'.$userId.'/files');
 			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
+				if (!$this->nodeExists('/'.$userId)) {
+					$this->newFolder('/'.$userId);
 				}
-				$folder = $this->newFolder('/' . $userId . '/files');
+				$folder = $this->newFolder('/'.$userId.'/files');
 			}
 
 			$this->userFolderCache->set($userId, $folder);

lib/private/Files/SetupManagerFactory.php

Indentation +29 added lines, -29 removed lines

@@ -32,35 +32,35 @@
 use OCP\Lockdown\ILockdownManager;
 
 class SetupManagerFactory {
-	private IEventLogger $eventLogger;
-	private IMountProviderCollection $mountProviderCollection;
-	private IUserManager $userManager;
-	private IEventDispatcher $eventDispatcher;
-	private IUserMountCache $userMountCache;
-	private ILockdownManager $lockdownManager;
-	private ?SetupManager $setupManager;
+    private IEventLogger $eventLogger;
+    private IMountProviderCollection $mountProviderCollection;
+    private IUserManager $userManager;
+    private IEventDispatcher $eventDispatcher;
+    private IUserMountCache $userMountCache;
+    private ILockdownManager $lockdownManager;
+    private ?SetupManager $setupManager;
 
-	public function __construct(
-		IEventLogger $eventLogger,
-		IMountProviderCollection $mountProviderCollection,
-		IUserManager $userManager,
-		IEventDispatcher $eventDispatcher,
-		IUserMountCache $userMountCache,
-		ILockdownManager $lockdownManager
-	) {
-		$this->eventLogger = $eventLogger;
-		$this->mountProviderCollection = $mountProviderCollection;
-		$this->userManager = $userManager;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userMountCache = $userMountCache;
-		$this->lockdownManager = $lockdownManager;
-		$this->setupManager = null;
-	}
+    public function __construct(
+        IEventLogger $eventLogger,
+        IMountProviderCollection $mountProviderCollection,
+        IUserManager $userManager,
+        IEventDispatcher $eventDispatcher,
+        IUserMountCache $userMountCache,
+        ILockdownManager $lockdownManager
+    ) {
+        $this->eventLogger = $eventLogger;
+        $this->mountProviderCollection = $mountProviderCollection;
+        $this->userManager = $userManager;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userMountCache = $userMountCache;
+        $this->lockdownManager = $lockdownManager;
+        $this->setupManager = null;
+    }
 
-	public function create(IMountManager $mountManager): SetupManager {
-		if (!$this->setupManager) {
-			$this->setupManager = new SetupManager($this->eventLogger, $this->mountProviderCollection, $mountManager, $this->userManager, $this->eventDispatcher, $this->userMountCache, $this->lockdownManager);
-		}
-		return $this->setupManager;
-	}
+    public function create(IMountManager $mountManager): SetupManager {
+        if (!$this->setupManager) {
+            $this->setupManager = new SetupManager($this->eventLogger, $this->mountProviderCollection, $mountManager, $this->userManager, $this->eventDispatcher, $this->userMountCache, $this->lockdownManager);
+        }
+        return $this->setupManager;
+    }
 }

lib/private/Files/View.php

Indentation +2117 added lines, -2117 removed lines

@@ -84,2121 +84,2121 @@
  * \OC\Files\Storage\Storage object
  */
 class View {
-	/** @var string */
-	private $fakeRoot = '';
-
-	/**
-	 * @var \OCP\Lock\ILockingProvider
-	 */
-	protected $lockingProvider;
-
-	private $lockingEnabled;
-
-	private $updaterEnabled = true;
-
-	/** @var \OC\User\Manager */
-	private $userManager;
-
-	/** @var \OCP\ILogger */
-	private $logger;
-
-	/**
-	 * @param string $root
-	 * @throws \Exception If $root contains an invalid path
-	 */
-	public function __construct($root = '') {
-		if (is_null($root)) {
-			throw new \InvalidArgumentException('Root can\'t be null');
-		}
-		if (!Filesystem::isValidPath($root)) {
-			throw new \Exception();
-		}
-
-		$this->fakeRoot = $root;
-		$this->lockingProvider = \OC::$server->getLockingProvider();
-		$this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
-		$this->userManager = \OC::$server->getUserManager();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	public function getAbsolutePath($path = '/') {
-		if ($path === null) {
-			return null;
-		}
-		$this->assertPathLength($path);
-		if ($path === '') {
-			$path = '/';
-		}
-		if ($path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		return $this->fakeRoot . $path;
-	}
-
-	/**
-	 * change the root to a fake root
-	 *
-	 * @param string $fakeRoot
-	 * @return boolean|null
-	 */
-	public function chroot($fakeRoot) {
-		if (!$fakeRoot == '') {
-			if ($fakeRoot[0] !== '/') {
-				$fakeRoot = '/' . $fakeRoot;
-			}
-		}
-		$this->fakeRoot = $fakeRoot;
-	}
-
-	/**
-	 * get the fake root
-	 *
-	 * @return string
-	 */
-	public function getRoot() {
-		return $this->fakeRoot;
-	}
-
-	/**
-	 * get path relative to the root of the view
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getRelativePath($path) {
-		$this->assertPathLength($path);
-		if ($this->fakeRoot == '') {
-			return $path;
-		}
-
-		if (rtrim($path, '/') === rtrim($this->fakeRoot, '/')) {
-			return '/';
-		}
-
-		// missing slashes can cause wrong matches!
-		$root = rtrim($this->fakeRoot, '/') . '/';
-
-		if (strpos($path, $root) !== 0) {
-			return null;
-		} else {
-			$path = substr($path, strlen($this->fakeRoot));
-			if (strlen($path) === 0) {
-				return '/';
-			} else {
-				return $path;
-			}
-		}
-	}
-
-	/**
-	 * get the mountpoint of the storage object for a path
-	 * ( note: because a storage is not always mounted inside the fakeroot, the
-	 * returned mountpoint is relative to the absolute root of the filesystem
-	 * and does not take the chroot into account )
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getMountPoint($path) {
-		return Filesystem::getMountPoint($this->getAbsolutePath($path));
-	}
-
-	/**
-	 * get the mountpoint of the storage object for a path
-	 * ( note: because a storage is not always mounted inside the fakeroot, the
-	 * returned mountpoint is relative to the absolute root of the filesystem
-	 * and does not take the chroot into account )
-	 *
-	 * @param string $path
-	 * @return \OCP\Files\Mount\IMountPoint
-	 */
-	public function getMount($path) {
-		return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
-	}
-
-	/**
-	 * resolve a path to a storage and internal path
-	 *
-	 * @param string $path
-	 * @return array an array consisting of the storage and the internal path
-	 */
-	public function resolvePath($path) {
-		$a = $this->getAbsolutePath($path);
-		$p = Filesystem::normalizePath($a);
-		return Filesystem::resolvePath($p);
-	}
-
-	/**
-	 * return the path to a local version of the file
-	 * we need this because we can't know if a file is stored local or not from
-	 * outside the filestorage and for some purposes a local file is needed
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFile($path) {
-		$parent = substr($path, 0, strrpos($path, '/'));
-		$path = $this->getAbsolutePath($path);
-		[$storage, $internalPath] = Filesystem::resolvePath($path);
-		if (Filesystem::isValidPath($parent) and $storage) {
-			return $storage->getLocalFile($internalPath);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFolder($path) {
-		$parent = substr($path, 0, strrpos($path, '/'));
-		$path = $this->getAbsolutePath($path);
-		[$storage, $internalPath] = Filesystem::resolvePath($path);
-		if (Filesystem::isValidPath($parent) and $storage) {
-			return $storage->getLocalFolder($internalPath);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * the following functions operate with arguments and return values identical
-	 * to those of their PHP built-in equivalents. Mostly they are merely wrappers
-	 * for \OC\Files\Storage\Storage via basicOperation().
-	 */
-	public function mkdir($path) {
-		return $this->basicOperation('mkdir', $path, ['create', 'write']);
-	}
-
-	/**
-	 * remove mount point
-	 *
-	 * @param IMountPoint $mount
-	 * @param string $path relative to data/
-	 * @return boolean
-	 */
-	protected function removeMount($mount, $path) {
-		if ($mount instanceof MoveableMount) {
-			// cut of /user/files to get the relative path to data/user/files
-			$pathParts = explode('/', $path, 4);
-			$relPath = '/' . $pathParts[3];
-			$this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true);
-			\OC_Hook::emit(
-				Filesystem::CLASSNAME, "umount",
-				[Filesystem::signal_param_path => $relPath]
-			);
-			$this->changeLock($relPath, ILockingProvider::LOCK_EXCLUSIVE, true);
-			$result = $mount->removeMount();
-			$this->changeLock($relPath, ILockingProvider::LOCK_SHARED, true);
-			if ($result) {
-				\OC_Hook::emit(
-					Filesystem::CLASSNAME, "post_umount",
-					[Filesystem::signal_param_path => $relPath]
-				);
-			}
-			$this->unlockFile($relPath, ILockingProvider::LOCK_SHARED, true);
-			return $result;
-		} else {
-			// do not allow deleting the storage's root / the mount point
-			// because for some storages it might delete the whole contents
-			// but isn't supposed to work that way
-			return false;
-		}
-	}
-
-	public function disableCacheUpdate() {
-		$this->updaterEnabled = false;
-	}
-
-	public function enableCacheUpdate() {
-		$this->updaterEnabled = true;
-	}
-
-	protected function writeUpdate(Storage $storage, $internalPath, $time = null) {
-		if ($this->updaterEnabled) {
-			if (is_null($time)) {
-				$time = time();
-			}
-			$storage->getUpdater()->update($internalPath, $time);
-		}
-	}
-
-	protected function removeUpdate(Storage $storage, $internalPath) {
-		if ($this->updaterEnabled) {
-			$storage->getUpdater()->remove($internalPath);
-		}
-	}
-
-	protected function renameUpdate(Storage $sourceStorage, Storage $targetStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($this->updaterEnabled) {
-			$targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function rmdir($path) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$mount = Filesystem::getMountManager()->find($absolutePath);
-		if ($mount->getInternalPath($absolutePath) === '') {
-			return $this->removeMount($mount, $absolutePath);
-		}
-		if ($this->is_dir($path)) {
-			$result = $this->basicOperation('rmdir', $path, ['delete']);
-		} else {
-			$result = false;
-		}
-
-		if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absolutePath);
-			$storage->getUpdater()->remove($internalPath);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @return resource
-	 */
-	public function opendir($path) {
-		return $this->basicOperation('opendir', $path, ['read']);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function is_dir($path) {
-		if ($path == '/') {
-			return true;
-		}
-		return $this->basicOperation('is_dir', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function is_file($path) {
-		if ($path == '/') {
-			return false;
-		}
-		return $this->basicOperation('is_file', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function stat($path) {
-		return $this->basicOperation('stat', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function filetype($path) {
-		return $this->basicOperation('filetype', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function filesize($path) {
-		return $this->basicOperation('filesize', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function readfile($path) {
-		$this->assertPathLength($path);
-		if (ob_get_level()) {
-			ob_end_clean();
-		}
-		$handle = $this->fopen($path, 'rb');
-		if ($handle) {
-			$chunkSize = 524288; // 512 kB chunks
-			while (!feof($handle)) {
-				echo fread($handle, $chunkSize);
-				flush();
-			}
-			fclose($handle);
-			return $this->filesize($path);
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $path
-	 * @param int $from
-	 * @param int $to
-	 * @return bool|mixed
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\UnseekableException
-	 */
-	public function readfilePart($path, $from, $to) {
-		$this->assertPathLength($path);
-		if (ob_get_level()) {
-			ob_end_clean();
-		}
-		$handle = $this->fopen($path, 'rb');
-		if ($handle) {
-			$chunkSize = 524288; // 512 kB chunks
-			$startReading = true;
-
-			if ($from !== 0 && $from !== '0' && fseek($handle, $from) !== 0) {
-				// forward file handle via chunked fread because fseek seem to have failed
-
-				$end = $from + 1;
-				while (!feof($handle) && ftell($handle) < $end && ftell($handle) !== $from) {
-					$len = $from - ftell($handle);
-					if ($len > $chunkSize) {
-						$len = $chunkSize;
-					}
-					$result = fread($handle, $len);
-
-					if ($result === false) {
-						$startReading = false;
-						break;
-					}
-				}
-			}
-
-			if ($startReading) {
-				$end = $to + 1;
-				while (!feof($handle) && ftell($handle) < $end) {
-					$len = $end - ftell($handle);
-					if ($len > $chunkSize) {
-						$len = $chunkSize;
-					}
-					echo fread($handle, $len);
-					flush();
-				}
-				return ftell($handle) - $from;
-			}
-
-			throw new \OCP\Files\UnseekableException('fseek error');
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function isCreatable($path) {
-		return $this->basicOperation('isCreatable', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function isReadable($path) {
-		return $this->basicOperation('isReadable', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function isUpdatable($path) {
-		return $this->basicOperation('isUpdatable', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function isDeletable($path) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$mount = Filesystem::getMountManager()->find($absolutePath);
-		if ($mount->getInternalPath($absolutePath) === '') {
-			return $mount instanceof MoveableMount;
-		}
-		return $this->basicOperation('isDeletable', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function isSharable($path) {
-		return $this->basicOperation('isSharable', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function file_exists($path) {
-		if ($path == '/') {
-			return true;
-		}
-		return $this->basicOperation('file_exists', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 */
-	public function filemtime($path) {
-		return $this->basicOperation('filemtime', $path);
-	}
-
-	/**
-	 * @param string $path
-	 * @param int|string $mtime
-	 * @return bool
-	 */
-	public function touch($path, $mtime = null) {
-		if (!is_null($mtime) and !is_numeric($mtime)) {
-			$mtime = strtotime($mtime);
-		}
-
-		$hooks = ['touch'];
-
-		if (!$this->file_exists($path)) {
-			$hooks[] = 'create';
-			$hooks[] = 'write';
-		}
-		try {
-			$result = $this->basicOperation('touch', $path, $hooks, $mtime);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['level' => ILogger::INFO, 'message' => 'Error while setting modified time']);
-			$result = false;
-		}
-		if (!$result) {
-			// If create file fails because of permissions on external storage like SMB folders,
-			// check file exists and return false if not.
-			if (!$this->file_exists($path)) {
-				return false;
-			}
-			if (is_null($mtime)) {
-				$mtime = time();
-			}
-			//if native touch fails, we emulate it by changing the mtime in the cache
-			$this->putFileInfo($path, ['mtime' => floor($mtime)]);
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 * @throws LockedException
-	 */
-	public function file_get_contents($path) {
-		return $this->basicOperation('file_get_contents', $path, ['read']);
-	}
-
-	/**
-	 * @param bool $exists
-	 * @param string $path
-	 * @param bool $run
-	 */
-	protected function emit_file_hooks_pre($exists, $path, &$run) {
-		if (!$exists) {
-			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_create, [
-				Filesystem::signal_param_path => $this->getHookPath($path),
-				Filesystem::signal_param_run => &$run,
-			]);
-		} else {
-			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_update, [
-				Filesystem::signal_param_path => $this->getHookPath($path),
-				Filesystem::signal_param_run => &$run,
-			]);
-		}
-		\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_write, [
-			Filesystem::signal_param_path => $this->getHookPath($path),
-			Filesystem::signal_param_run => &$run,
-		]);
-	}
-
-	/**
-	 * @param bool $exists
-	 * @param string $path
-	 */
-	protected function emit_file_hooks_post($exists, $path) {
-		if (!$exists) {
-			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_create, [
-				Filesystem::signal_param_path => $this->getHookPath($path),
-			]);
-		} else {
-			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_update, [
-				Filesystem::signal_param_path => $this->getHookPath($path),
-			]);
-		}
-		\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_write, [
-			Filesystem::signal_param_path => $this->getHookPath($path),
-		]);
-	}
-
-	/**
-	 * @param string $path
-	 * @param string|resource $data
-	 * @return bool|mixed
-	 * @throws LockedException
-	 */
-	public function file_put_contents($path, $data) {
-		if (is_resource($data)) { //not having to deal with streams in file_put_contents makes life easier
-			$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-			if (Filesystem::isValidPath($path)
-				and !Filesystem::isFileBlacklisted($path)
-			) {
-				$path = $this->getRelativePath($absolutePath);
-
-				$this->lockFile($path, ILockingProvider::LOCK_SHARED);
-
-				$exists = $this->file_exists($path);
-				$run = true;
-				if ($this->shouldEmitHooks($path)) {
-					$this->emit_file_hooks_pre($exists, $path, $run);
-				}
-				if (!$run) {
-					$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-					return false;
-				}
-
-				try {
-					$this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
-				} catch (\Exception $e) {
-					// Release the shared lock before throwing.
-					$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-					throw $e;
-				}
-
-				/** @var \OC\Files\Storage\Storage $storage */
-				[$storage, $internalPath] = $this->resolvePath($path);
-				$target = $storage->fopen($internalPath, 'w');
-				if ($target) {
-					[, $result] = \OC_Helper::streamCopy($data, $target);
-					fclose($target);
-					fclose($data);
-
-					$this->writeUpdate($storage, $internalPath);
-
-					$this->changeLock($path, ILockingProvider::LOCK_SHARED);
-
-					if ($this->shouldEmitHooks($path) && $result !== false) {
-						$this->emit_file_hooks_post($exists, $path);
-					}
-					$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-					return $result;
-				} else {
-					$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} else {
-			$hooks = $this->file_exists($path) ? ['update', 'write'] : ['create', 'write'];
-			return $this->basicOperation('file_put_contents', $path, $hooks, $data);
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|mixed
-	 */
-	public function unlink($path) {
-		if ($path === '' || $path === '/') {
-			// do not allow deleting the root
-			return false;
-		}
-		$postFix = (substr($path, -1) === '/') ? '/' : '';
-		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		$mount = Filesystem::getMountManager()->find($absolutePath . $postFix);
-		if ($mount->getInternalPath($absolutePath) === '') {
-			return $this->removeMount($mount, $absolutePath);
-		}
-		if ($this->is_dir($path)) {
-			$result = $this->basicOperation('rmdir', $path, ['delete']);
-		} else {
-			$result = $this->basicOperation('unlink', $path, ['delete']);
-		}
-		if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absolutePath);
-			$storage->getUpdater()->remove($internalPath);
-			return true;
-		} else {
-			return $result;
-		}
-	}
-
-	/**
-	 * @param string $directory
-	 * @return bool|mixed
-	 */
-	public function deleteAll($directory) {
-		return $this->rmdir($directory);
-	}
-
-	/**
-	 * Rename/move a file or folder from the source path to target path.
-	 *
-	 * @param string $path1 source path
-	 * @param string $path2 target path
-	 *
-	 * @return bool|mixed
-	 * @throws LockedException
-	 */
-	public function rename($path1, $path2) {
-		$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
-		$absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
-		$result = false;
-		if (
-			Filesystem::isValidPath($path2)
-			and Filesystem::isValidPath($path1)
-			and !Filesystem::isFileBlacklisted($path2)
-		) {
-			$path1 = $this->getRelativePath($absolutePath1);
-			$path2 = $this->getRelativePath($absolutePath2);
-			$exists = $this->file_exists($path2);
-
-			if ($path1 == null or $path2 == null) {
-				return false;
-			}
-
-			$this->lockFile($path1, ILockingProvider::LOCK_SHARED, true);
-			try {
-				$this->lockFile($path2, ILockingProvider::LOCK_SHARED, true);
-
-				$run = true;
-				if ($this->shouldEmitHooks($path1) && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
-					// if it was a rename from a part file to a regular file it was a write and not a rename operation
-					$this->emit_file_hooks_pre($exists, $path2, $run);
-				} elseif ($this->shouldEmitHooks($path1)) {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME, Filesystem::signal_rename,
-						[
-							Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-							Filesystem::signal_param_newpath => $this->getHookPath($path2),
-							Filesystem::signal_param_run => &$run
-						]
-					);
-				}
-				if ($run) {
-					$this->verifyPath(dirname($path2), basename($path2));
-
-					$manager = Filesystem::getMountManager();
-					$mount1 = $this->getMount($path1);
-					$mount2 = $this->getMount($path2);
-					$storage1 = $mount1->getStorage();
-					$storage2 = $mount2->getStorage();
-					$internalPath1 = $mount1->getInternalPath($absolutePath1);
-					$internalPath2 = $mount2->getInternalPath($absolutePath2);
-
-					$this->changeLock($path1, ILockingProvider::LOCK_EXCLUSIVE, true);
-					try {
-						$this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE, true);
-
-						if ($internalPath1 === '') {
-							if ($mount1 instanceof MoveableMount) {
-								$sourceParentMount = $this->getMount(dirname($path1));
-								if ($sourceParentMount === $mount2 && $this->targetIsNotShared($storage2, $internalPath2)) {
-									/**
-									 * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
-									 */
-									$sourceMountPoint = $mount1->getMountPoint();
-									$result = $mount1->moveMount($absolutePath2);
-									$manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
-								} else {
-									$result = false;
-								}
-							} else {
-								$result = false;
-							}
-							// moving a file/folder within the same mount point
-						} elseif ($storage1 === $storage2) {
-							if ($storage1) {
-								$result = $storage1->rename($internalPath1, $internalPath2);
-							} else {
-								$result = false;
-							}
-							// moving a file/folder between storages (from $storage1 to $storage2)
-						} else {
-							$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
-						}
-
-						if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
-							// if it was a rename from a part file to a regular file it was a write and not a rename operation
-							$this->writeUpdate($storage2, $internalPath2);
-						} elseif ($result) {
-							if ($internalPath1 !== '') { // don't do a cache update for moved mounts
-								$this->renameUpdate($storage1, $storage2, $internalPath1, $internalPath2);
-							}
-						}
-					} catch (\Exception $e) {
-						throw $e;
-					} finally {
-						$this->changeLock($path1, ILockingProvider::LOCK_SHARED, true);
-						$this->changeLock($path2, ILockingProvider::LOCK_SHARED, true);
-					}
-
-					if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
-						if ($this->shouldEmitHooks()) {
-							$this->emit_file_hooks_post($exists, $path2);
-						}
-					} elseif ($result) {
-						if ($this->shouldEmitHooks($path1) and $this->shouldEmitHooks($path2)) {
-							\OC_Hook::emit(
-								Filesystem::CLASSNAME,
-								Filesystem::signal_post_rename,
-								[
-									Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-									Filesystem::signal_param_newpath => $this->getHookPath($path2)
-								]
-							);
-						}
-					}
-				}
-			} catch (\Exception $e) {
-				throw $e;
-			} finally {
-				$this->unlockFile($path1, ILockingProvider::LOCK_SHARED, true);
-				$this->unlockFile($path2, ILockingProvider::LOCK_SHARED, true);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Copy a file/folder from the source path to target path
-	 *
-	 * @param string $path1 source path
-	 * @param string $path2 target path
-	 * @param bool $preserveMtime whether to preserve mtime on the copy
-	 *
-	 * @return bool|mixed
-	 */
-	public function copy($path1, $path2, $preserveMtime = false) {
-		$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
-		$absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
-		$result = false;
-		if (
-			Filesystem::isValidPath($path2)
-			and Filesystem::isValidPath($path1)
-			and !Filesystem::isFileBlacklisted($path2)
-		) {
-			$path1 = $this->getRelativePath($absolutePath1);
-			$path2 = $this->getRelativePath($absolutePath2);
-
-			if ($path1 == null or $path2 == null) {
-				return false;
-			}
-			$run = true;
-
-			$this->lockFile($path2, ILockingProvider::LOCK_SHARED);
-			$this->lockFile($path1, ILockingProvider::LOCK_SHARED);
-			$lockTypePath1 = ILockingProvider::LOCK_SHARED;
-			$lockTypePath2 = ILockingProvider::LOCK_SHARED;
-
-			try {
-				$exists = $this->file_exists($path2);
-				if ($this->shouldEmitHooks()) {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						Filesystem::signal_copy,
-						[
-							Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-							Filesystem::signal_param_newpath => $this->getHookPath($path2),
-							Filesystem::signal_param_run => &$run
-						]
-					);
-					$this->emit_file_hooks_pre($exists, $path2, $run);
-				}
-				if ($run) {
-					$mount1 = $this->getMount($path1);
-					$mount2 = $this->getMount($path2);
-					$storage1 = $mount1->getStorage();
-					$internalPath1 = $mount1->getInternalPath($absolutePath1);
-					$storage2 = $mount2->getStorage();
-					$internalPath2 = $mount2->getInternalPath($absolutePath2);
-
-					$this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE);
-					$lockTypePath2 = ILockingProvider::LOCK_EXCLUSIVE;
-
-					if ($mount1->getMountPoint() == $mount2->getMountPoint()) {
-						if ($storage1) {
-							$result = $storage1->copy($internalPath1, $internalPath2);
-						} else {
-							$result = false;
-						}
-					} else {
-						$result = $storage2->copyFromStorage($storage1, $internalPath1, $internalPath2);
-					}
-
-					$this->writeUpdate($storage2, $internalPath2);
-
-					$this->changeLock($path2, ILockingProvider::LOCK_SHARED);
-					$lockTypePath2 = ILockingProvider::LOCK_SHARED;
-
-					if ($this->shouldEmitHooks() && $result !== false) {
-						\OC_Hook::emit(
-							Filesystem::CLASSNAME,
-							Filesystem::signal_post_copy,
-							[
-								Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-								Filesystem::signal_param_newpath => $this->getHookPath($path2)
-							]
-						);
-						$this->emit_file_hooks_post($exists, $path2);
-					}
-				}
-			} catch (\Exception $e) {
-				$this->unlockFile($path2, $lockTypePath2);
-				$this->unlockFile($path1, $lockTypePath1);
-				throw $e;
-			}
-
-			$this->unlockFile($path2, $lockTypePath2);
-			$this->unlockFile($path1, $lockTypePath1);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $mode 'r' or 'w'
-	 * @return resource
-	 * @throws LockedException
-	 */
-	public function fopen($path, $mode) {
-		$mode = str_replace('b', '', $mode); // the binary flag is a windows only feature which we do not support
-		$hooks = [];
-		switch ($mode) {
-			case 'r':
-				$hooks[] = 'read';
-				break;
-			case 'r+':
-			case 'w+':
-			case 'x+':
-			case 'a+':
-				$hooks[] = 'read';
-				$hooks[] = 'write';
-				break;
-			case 'w':
-			case 'x':
-			case 'a':
-				$hooks[] = 'write';
-				break;
-			default:
-				\OCP\Util::writeLog('core', 'invalid mode (' . $mode . ') for ' . $path, ILogger::ERROR);
-		}
-
-		if ($mode !== 'r' && $mode !== 'w') {
-			\OC::$server->getLogger()->info('Trying to open a file with a mode other than "r" or "w" can cause severe performance issues with some backends');
-		}
-
-		return $this->basicOperation('fopen', $path, $hooks, $mode);
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool|string
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function toTmpFile($path) {
-		$this->assertPathLength($path);
-		if (Filesystem::isValidPath($path)) {
-			$source = $this->fopen($path, 'r');
-			if ($source) {
-				$extension = pathinfo($path, PATHINFO_EXTENSION);
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
-				file_put_contents($tmpFile, $source);
-				return $tmpFile;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $tmpFile
-	 * @param string $path
-	 * @return bool|mixed
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function fromTmpFile($tmpFile, $path) {
-		$this->assertPathLength($path);
-		if (Filesystem::isValidPath($path)) {
-
-			// Get directory that the file is going into
-			$filePath = dirname($path);
-
-			// Create the directories if any
-			if (!$this->file_exists($filePath)) {
-				$result = $this->createParentDirectories($filePath);
-				if ($result === false) {
-					return false;
-				}
-			}
-
-			$source = fopen($tmpFile, 'r');
-			if ($source) {
-				$result = $this->file_put_contents($path, $source);
-				// $this->file_put_contents() might have already closed
-				// the resource, so we check it, before trying to close it
-				// to avoid messages in the error log.
-				if (is_resource($source)) {
-					fclose($source);
-				}
-				unlink($tmpFile);
-				return $result;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function getMimeType($path) {
-		$this->assertPathLength($path);
-		return $this->basicOperation('getMimeType', $path);
-	}
-
-	/**
-	 * @param string $type
-	 * @param string $path
-	 * @param bool $raw
-	 * @return bool|string
-	 */
-	public function hash($type, $path, $raw = false) {
-		$postFix = (substr($path, -1) === '/') ? '/' : '';
-		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		if (Filesystem::isValidPath($path)) {
-			$path = $this->getRelativePath($absolutePath);
-			if ($path == null) {
-				return false;
-			}
-			if ($this->shouldEmitHooks($path)) {
-				\OC_Hook::emit(
-					Filesystem::CLASSNAME,
-					Filesystem::signal_read,
-					[Filesystem::signal_param_path => $this->getHookPath($path)]
-				);
-			}
-			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
-			if ($storage) {
-				return $storage->hash($type, $internalPath, $raw);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $path
-	 * @return mixed
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function free_space($path = '/') {
-		$this->assertPathLength($path);
-		$result = $this->basicOperation('free_space', $path);
-		if ($result === null) {
-			throw new InvalidPathException();
-		}
-		return $result;
-	}
-
-	/**
-	 * abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
-	 *
-	 * @param string $operation
-	 * @param string $path
-	 * @param array $hooks (optional)
-	 * @param mixed $extraParam (optional)
-	 * @return mixed
-	 * @throws LockedException
-	 *
-	 * This method takes requests for basic filesystem functions (e.g. reading & writing
-	 * files), processes hooks and proxies, sanitises paths, and finally passes them on to
-	 * \OC\Files\Storage\Storage for delegation to a storage backend for execution
-	 */
-	private function basicOperation($operation, $path, $hooks = [], $extraParam = null) {
-		$postFix = (substr($path, -1) === '/') ? '/' : '';
-		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		if (Filesystem::isValidPath($path)
-			and !Filesystem::isFileBlacklisted($path)
-		) {
-			$path = $this->getRelativePath($absolutePath);
-			if ($path == null) {
-				return false;
-			}
-
-			if (in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks)) {
-				// always a shared lock during pre-hooks so the hook can read the file
-				$this->lockFile($path, ILockingProvider::LOCK_SHARED);
-			}
-
-			$run = $this->runHooks($hooks, $path);
-			/** @var \OC\Files\Storage\Storage $storage */
-			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
-			if ($run and $storage) {
-				if (in_array('write', $hooks) || in_array('delete', $hooks)) {
-					try {
-						$this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
-					} catch (LockedException $e) {
-						// release the shared lock we acquired before quiting
-						$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-						throw $e;
-					}
-				}
-				try {
-					if (!is_null($extraParam)) {
-						$result = $storage->$operation($internalPath, $extraParam);
-					} else {
-						$result = $storage->$operation($internalPath);
-					}
-				} catch (\Exception $e) {
-					if (in_array('write', $hooks) || in_array('delete', $hooks)) {
-						$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
-					} elseif (in_array('read', $hooks)) {
-						$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-					}
-					throw $e;
-				}
-
-				if ($result && in_array('delete', $hooks) and $result) {
-					$this->removeUpdate($storage, $internalPath);
-				}
-				if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
-					$this->writeUpdate($storage, $internalPath);
-				}
-				if ($result && in_array('touch', $hooks)) {
-					$this->writeUpdate($storage, $internalPath, $extraParam);
-				}
-
-				if ((in_array('write', $hooks) || in_array('delete', $hooks)) && ($operation !== 'fopen' || $result === false)) {
-					$this->changeLock($path, ILockingProvider::LOCK_SHARED);
-				}
-
-				$unlockLater = false;
-				if ($this->lockingEnabled && $operation === 'fopen' && is_resource($result)) {
-					$unlockLater = true;
-					// make sure our unlocking callback will still be called if connection is aborted
-					ignore_user_abort(true);
-					$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
-						if (in_array('write', $hooks)) {
-							$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
-						} elseif (in_array('read', $hooks)) {
-							$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-						}
-					});
-				}
-
-				if ($this->shouldEmitHooks($path) && $result !== false) {
-					if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
-						$this->runHooks($hooks, $path, true);
-					}
-				}
-
-				if (!$unlockLater
-					&& (in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks))
-				) {
-					$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-				}
-				return $result;
-			} else {
-				$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * get the path relative to the default root for hook usage
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	private function getHookPath($path) {
-		if (!Filesystem::getView()) {
-			return $path;
-		}
-		return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path));
-	}
-
-	private function shouldEmitHooks($path = '') {
-		if ($path && Cache\Scanner::isPartialFile($path)) {
-			return false;
-		}
-		if (!Filesystem::$loaded) {
-			return false;
-		}
-		$defaultRoot = Filesystem::getRoot();
-		if ($defaultRoot === null) {
-			return false;
-		}
-		if ($this->fakeRoot === $defaultRoot) {
-			return true;
-		}
-		$fullPath = $this->getAbsolutePath($path);
-
-		if ($fullPath === $defaultRoot) {
-			return true;
-		}
-
-		return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
-	}
-
-	/**
-	 * @param string[] $hooks
-	 * @param string $path
-	 * @param bool $post
-	 * @return bool
-	 */
-	private function runHooks($hooks, $path, $post = false) {
-		$relativePath = $path;
-		$path = $this->getHookPath($path);
-		$prefix = $post ? 'post_' : '';
-		$run = true;
-		if ($this->shouldEmitHooks($relativePath)) {
-			foreach ($hooks as $hook) {
-				if ($hook != 'read') {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						$prefix . $hook,
-						[
-							Filesystem::signal_param_run => &$run,
-							Filesystem::signal_param_path => $path
-						]
-					);
-				} elseif (!$post) {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						$prefix . $hook,
-						[
-							Filesystem::signal_param_path => $path
-						]
-					);
-				}
-			}
-		}
-		return $run;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		return $this->basicOperation('hasUpdated', $path, [], $time);
-	}
-
-	/**
-	 * @param string $ownerId
-	 * @return \OC\User\User
-	 */
-	private function getUserObjectForOwner($ownerId) {
-		$owner = $this->userManager->get($ownerId);
-		if ($owner instanceof IUser) {
-			return $owner;
-		} else {
-			return new User($ownerId, null, \OC::$server->getEventDispatcher());
-		}
-	}
-
-	/**
-	 * Get file info from cache
-	 *
-	 * If the file is not in cached it will be scanned
-	 * If the file has changed on storage the cache will be updated
-	 *
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param string $internalPath
-	 * @param string $relativePath
-	 * @return ICacheEntry|bool
-	 */
-	private function getCacheEntry($storage, $internalPath, $relativePath) {
-		$cache = $storage->getCache($internalPath);
-		$data = $cache->get($internalPath);
-		$watcher = $storage->getWatcher($internalPath);
-
-		try {
-			// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
-			if (!$data || (isset($data['size']) && $data['size'] === -1)) {
-				if (!$storage->file_exists($internalPath)) {
-					return false;
-				}
-				// don't need to get a lock here since the scanner does it's own locking
-				$scanner = $storage->getScanner($internalPath);
-				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
-				$data = $cache->get($internalPath);
-			} elseif (!Cache\Scanner::isPartialFile($internalPath) && $watcher->needsUpdate($internalPath, $data)) {
-				$this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
-				$watcher->update($internalPath, $data);
-				$storage->getPropagator()->propagateChange($internalPath, time());
-				$data = $cache->get($internalPath);
-				$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
-			}
-		} catch (LockedException $e) {
-			// if the file is locked we just use the old cache info
-		}
-
-		return $data;
-	}
-
-	/**
-	 * get the filesystem info
-	 *
-	 * @param string $path
-	 * @param boolean|string $includeMountPoints true to add mountpoint sizes,
-	 * 'ext' to add only ext storage mount point sizes. Defaults to true.
-	 * defaults to true
-	 * @return \OC\Files\FileInfo|false False if file does not exist
-	 */
-	public function getFileInfo($path, $includeMountPoints = true) {
-		$this->assertPathLength($path);
-		if (!Filesystem::isValidPath($path)) {
-			return false;
-		}
-		if (Cache\Scanner::isPartialFile($path)) {
-			return $this->getPartFileInfo($path);
-		}
-		$relativePath = $path;
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
-
-		$mount = Filesystem::getMountManager()->find($path);
-		$storage = $mount->getStorage();
-		$internalPath = $mount->getInternalPath($path);
-		if ($storage) {
-			$data = $this->getCacheEntry($storage, $internalPath, $relativePath);
-
-			if (!$data instanceof ICacheEntry) {
-				return false;
-			}
-
-			if ($mount instanceof MoveableMount && $internalPath === '') {
-				$data['permissions'] |= \OCP\Constants::PERMISSION_DELETE;
-			}
-			$ownerId = $storage->getOwner($internalPath);
-			$owner = null;
-			if ($ownerId !== null && $ownerId !== false) {
-				// ownerId might be null if files are accessed with an access token without file system access
-				$owner = $this->getUserObjectForOwner($ownerId);
-			}
-			$info = new FileInfo($path, $storage, $internalPath, $data, $mount, $owner);
-
-			if (isset($data['fileid'])) {
-				if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') {
-					//add the sizes of other mount points to the folder
-					$extOnly = ($includeMountPoints === 'ext');
-					$mounts = Filesystem::getMountManager()->findIn($path);
-					$info->setSubMounts(array_filter($mounts, function (IMountPoint $mount) use ($extOnly) {
-						$subStorage = $mount->getStorage();
-						return !($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage);
-					}));
-				}
-			}
-
-			return $info;
-		} else {
-			\OC::$server->getLogger()->warning('Storage not valid for mountpoint: ' . $mount->getMountPoint());
-		}
-
-		return false;
-	}
-
-	/**
-	 * get the content of a directory
-	 *
-	 * @param string $directory path under datadirectory
-	 * @param string $mimetype_filter limit returned content to this mimetype or mimepart
-	 * @return FileInfo[]
-	 */
-	public function getDirectoryContent($directory, $mimetype_filter = '') {
-		$this->assertPathLength($directory);
-		if (!Filesystem::isValidPath($directory)) {
-			return [];
-		}
-		$path = $this->getAbsolutePath($directory);
-		$path = Filesystem::normalizePath($path);
-		$mount = $this->getMount($directory);
-		if (!$mount) {
-			return [];
-		}
-		$storage = $mount->getStorage();
-		$internalPath = $mount->getInternalPath($path);
-		if ($storage) {
-			$cache = $storage->getCache($internalPath);
-			$user = \OC_User::getUser();
-
-			$data = $this->getCacheEntry($storage, $internalPath, $directory);
-
-			if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() && Constants::PERMISSION_READ)) {
-				return [];
-			}
-
-			$folderId = $data['fileid'];
-			$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
-
-			$sharingDisabled = \OCP\Util::isSharingDisabledForUser();
-
-			$fileNames = array_map(function (ICacheEntry $content) {
-				return $content->getName();
-			}, $contents);
-			/**
-			 * @var \OC\Files\FileInfo[] $fileInfos
-			 */
-			$fileInfos = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
-				if ($sharingDisabled) {
-					$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
-				}
-				$owner = $this->getUserObjectForOwner($storage->getOwner($content['path']));
-				return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner);
-			}, $contents);
-			$files = array_combine($fileNames, $fileInfos);
-
-			//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
-			$mounts = Filesystem::getMountManager()->findIn($path);
-			$dirLength = strlen($path);
-			foreach ($mounts as $mount) {
-				$mountPoint = $mount->getMountPoint();
-				$subStorage = $mount->getStorage();
-				if ($subStorage) {
-					$subCache = $subStorage->getCache('');
-
-					$rootEntry = $subCache->get('');
-					if (!$rootEntry) {
-						$subScanner = $subStorage->getScanner();
-						try {
-							$subScanner->scanFile('');
-						} catch (\OCP\Files\StorageNotAvailableException $e) {
-							continue;
-						} catch (\OCP\Files\StorageInvalidException $e) {
-							continue;
-						} catch (\Exception $e) {
-							// sometimes when the storage is not available it can be any exception
-							\OC::$server->getLogger()->logException($e, [
-								'message' => 'Exception while scanning storage "' . $subStorage->getId() . '"',
-								'level' => ILogger::ERROR,
-								'app' => 'lib',
-							]);
-							continue;
-						}
-						$rootEntry = $subCache->get('');
-					}
-
-					if ($rootEntry && ($rootEntry->getPermissions() && Constants::PERMISSION_READ)) {
-						$relativePath = trim(substr($mountPoint, $dirLength), '/');
-						if ($pos = strpos($relativePath, '/')) {
-							//mountpoint inside subfolder add size to the correct folder
-							$entryName = substr($relativePath, 0, $pos);
-							foreach ($files as &$entry) {
-								if ($entry->getName() === $entryName) {
-									$entry->addSubEntry($rootEntry, $mountPoint);
-								}
-							}
-						} else { //mountpoint in this folder, add an entry for it
-							$rootEntry['name'] = $relativePath;
-							$rootEntry['type'] = $rootEntry['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
-							$permissions = $rootEntry['permissions'];
-							// do not allow renaming/deleting the mount point if they are not shared files/folders
-							// for shared files/folders we use the permissions given by the owner
-							if ($mount instanceof MoveableMount) {
-								$rootEntry['permissions'] = $permissions | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
-							} else {
-								$rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
-							}
-
-							$rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/
-
-							// if sharing was disabled for the user we remove the share permissions
-							if (\OCP\Util::isSharingDisabledForUser()) {
-								$rootEntry['permissions'] = $rootEntry['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
-							}
-
-							$owner = $this->getUserObjectForOwner($subStorage->getOwner(''));
-							$files[$rootEntry->getName()] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
-						}
-					}
-				}
-			}
-
-			if ($mimetype_filter) {
-				$files = array_filter($files, function (FileInfo $file) use ($mimetype_filter) {
-					if (strpos($mimetype_filter, '/')) {
-						return $file->getMimetype() === $mimetype_filter;
-					} else {
-						return $file->getMimePart() === $mimetype_filter;
-					}
-				});
-			}
-
-			return array_values($files);
-		} else {
-			return [];
-		}
-	}
-
-	/**
-	 * change file metadata
-	 *
-	 * @param string $path
-	 * @param array|\OCP\Files\FileInfo $data
-	 * @return int
-	 *
-	 * returns the fileid of the updated file
-	 */
-	public function putFileInfo($path, $data) {
-		$this->assertPathLength($path);
-		if ($data instanceof FileInfo) {
-			$data = $data->getData();
-		}
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 * @var string $internalPath
-		 */
-		[$storage, $internalPath] = Filesystem::resolvePath($path);
-		if ($storage) {
-			$cache = $storage->getCache($path);
-
-			if (!$cache->inCache($internalPath)) {
-				$scanner = $storage->getScanner($internalPath);
-				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
-			}
-
-			return $cache->put($internalPath, $data);
-		} else {
-			return -1;
-		}
-	}
-
-	/**
-	 * search for files with the name matching $query
-	 *
-	 * @param string $query
-	 * @return FileInfo[]
-	 */
-	public function search($query) {
-		return $this->searchCommon('search', ['%' . $query . '%']);
-	}
-
-	/**
-	 * search for files with the name matching $query
-	 *
-	 * @param string $query
-	 * @return FileInfo[]
-	 */
-	public function searchRaw($query) {
-		return $this->searchCommon('search', [$query]);
-	}
-
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype
-	 * @return FileInfo[]
-	 */
-	public function searchByMime($mimetype) {
-		return $this->searchCommon('searchByMime', [$mimetype]);
-	}
-
-	/**
-	 * search for files by tag
-	 *
-	 * @param string|int $tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return FileInfo[]
-	 */
-	public function searchByTag($tag, $userId) {
-		return $this->searchCommon('searchByTag', [$tag, $userId]);
-	}
-
-	/**
-	 * @param string $method cache method
-	 * @param array $args
-	 * @return FileInfo[]
-	 */
-	private function searchCommon($method, $args) {
-		$files = [];
-		$rootLength = strlen($this->fakeRoot);
-
-		$mount = $this->getMount('');
-		$mountPoint = $mount->getMountPoint();
-		$storage = $mount->getStorage();
-		$userManager = \OC::$server->getUserManager();
-		if ($storage) {
-			$cache = $storage->getCache('');
-
-			$results = call_user_func_array([$cache, $method], $args);
-			foreach ($results as $result) {
-				if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
-					$internalPath = $result['path'];
-					$path = $mountPoint . $result['path'];
-					$result['path'] = substr($mountPoint . $result['path'], $rootLength);
-					$owner = $userManager->get($storage->getOwner($internalPath));
-					$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
-				}
-			}
-
-			$mounts = Filesystem::getMountManager()->findIn($this->fakeRoot);
-			foreach ($mounts as $mount) {
-				$mountPoint = $mount->getMountPoint();
-				$storage = $mount->getStorage();
-				if ($storage) {
-					$cache = $storage->getCache('');
-
-					$relativeMountPoint = substr($mountPoint, $rootLength);
-					$results = call_user_func_array([$cache, $method], $args);
-					if ($results) {
-						foreach ($results as $result) {
-							$internalPath = $result['path'];
-							$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
-							$path = rtrim($mountPoint . $internalPath, '/');
-							$owner = $userManager->get($storage->getOwner($internalPath));
-							$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
-						}
-					}
-				}
-			}
-		}
-		return $files;
-	}
-
-	/**
-	 * Get the owner for a file or folder
-	 *
-	 * @param string $path
-	 * @return string the user id of the owner
-	 * @throws NotFoundException
-	 */
-	public function getOwner($path) {
-		$info = $this->getFileInfo($path);
-		if (!$info) {
-			throw new NotFoundException($path . ' not found while trying to get owner');
-		}
-
-		if ($info->getOwner() === null) {
-			throw new NotFoundException($path . ' has no owner');
-		}
-
-		return $info->getOwner()->getUID();
-	}
-
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getETag($path) {
-		/**
-		 * @var Storage\Storage $storage
-		 * @var string $internalPath
-		 */
-		[$storage, $internalPath] = $this->resolvePath($path);
-		if ($storage) {
-			return $storage->getETag($internalPath);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the path of a file by id, relative to the view
-	 *
-	 * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
-	 *
-	 * @param int $id
-	 * @param int|null $storageId
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	public function getPath($id, int $storageId = null) {
-		$id = (int)$id;
-		$manager = Filesystem::getMountManager();
-		$mounts = $manager->findIn($this->fakeRoot);
-		$mounts[] = $manager->find($this->fakeRoot);
-		$mounts = array_filter($mounts);
-		// reverse the array, so we start with the storage this view is in
-		// which is the most likely to contain the file we're looking for
-		$mounts = array_reverse($mounts);
-
-		// put non-shared mounts in front of the shared mount
-		// this prevents unneeded recursion into shares
-		usort($mounts, function (IMountPoint $a, IMountPoint $b) {
-			return $a instanceof SharedMount && (!$b instanceof SharedMount) ? 1 : -1;
-		});
-
-		if (!is_null($storageId)) {
-			$mounts = array_filter($mounts, function (IMountPoint $mount) use ($storageId) {
-				return $mount->getNumericStorageId() === $storageId;
-			});
-		}
-
-		foreach ($mounts as $mount) {
-			/**
-			 * @var \OC\Files\Mount\MountPoint $mount
-			 */
-			if ($mount->getStorage()) {
-				$cache = $mount->getStorage()->getCache();
-				$internalPath = $cache->getPathById($id);
-				if (is_string($internalPath)) {
-					$fullPath = $mount->getMountPoint() . $internalPath;
-					if (!is_null($path = $this->getRelativePath($fullPath))) {
-						return $path;
-					}
-				}
-			}
-		}
-		throw new NotFoundException(sprintf('File with id "%s" has not been found.', $id));
-	}
-
-	/**
-	 * @param string $path
-	 * @throws InvalidPathException
-	 */
-	private function assertPathLength($path) {
-		$maxLen = min(PHP_MAXPATHLEN, 4000);
-		// Check for the string length - performed using isset() instead of strlen()
-		// because isset() is about 5x-40x faster.
-		if (isset($path[$maxLen])) {
-			$pathLen = strlen($path);
-			throw new \OCP\Files\InvalidPathException("Path length($pathLen) exceeds max path length($maxLen): $path");
-		}
-	}
-
-	/**
-	 * check if it is allowed to move a mount point to a given target.
-	 * It is not allowed to move a mount point into a different mount point or
-	 * into an already shared folder
-	 *
-	 * @param IStorage $targetStorage
-	 * @param string $targetInternalPath
-	 * @return boolean
-	 */
-	private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) {
-
-		// note: cannot use the view because the target is already locked
-		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
-		if ($fileId === -1) {
-			// target might not exist, need to check parent instead
-			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
-		}
-
-		// check if any of the parents were shared by the current owner (include collections)
-		$shares = \OCP\Share::getItemShared(
-			'folder',
-			$fileId,
-			\OCP\Share::FORMAT_NONE,
-			null,
-			true
-		);
-
-		if (count($shares) > 0) {
-			\OCP\Util::writeLog('files',
-				'It is not allowed to move one mount point into a shared folder',
-				ILogger::DEBUG);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get a fileinfo object for files that are ignored in the cache (part files)
-	 *
-	 * @param string $path
-	 * @return \OCP\Files\FileInfo
-	 */
-	private function getPartFileInfo($path) {
-		$mount = $this->getMount($path);
-		$storage = $mount->getStorage();
-		$internalPath = $mount->getInternalPath($this->getAbsolutePath($path));
-		$owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath));
-		return new FileInfo(
-			$this->getAbsolutePath($path),
-			$storage,
-			$internalPath,
-			[
-				'fileid' => null,
-				'mimetype' => $storage->getMimeType($internalPath),
-				'name' => basename($path),
-				'etag' => null,
-				'size' => $storage->filesize($internalPath),
-				'mtime' => $storage->filemtime($internalPath),
-				'encrypted' => false,
-				'permissions' => \OCP\Constants::PERMISSION_ALL
-			],
-			$mount,
-			$owner
-		);
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $fileName
-	 * @throws InvalidPathException
-	 */
-	public function verifyPath($path, $fileName) {
-		try {
-			/** @type \OCP\Files\Storage $storage */
-			[$storage, $internalPath] = $this->resolvePath($path);
-			$storage->verifyPath($internalPath, $fileName);
-		} catch (ReservedWordException $ex) {
-			$l = \OC::$server->getL10N('lib');
-			throw new InvalidPathException($l->t('File name is a reserved word'));
-		} catch (InvalidCharacterInPathException $ex) {
-			$l = \OC::$server->getL10N('lib');
-			throw new InvalidPathException($l->t('File name contains at least one invalid character'));
-		} catch (FileNameTooLongException $ex) {
-			$l = \OC::$server->getL10N('lib');
-			throw new InvalidPathException($l->t('File name is too long'));
-		} catch (InvalidDirectoryException $ex) {
-			$l = \OC::$server->getL10N('lib');
-			throw new InvalidPathException($l->t('Dot files are not allowed'));
-		} catch (EmptyFileNameException $ex) {
-			$l = \OC::$server->getL10N('lib');
-			throw new InvalidPathException($l->t('Empty filename is not allowed'));
-		}
-	}
-
-	/**
-	 * get all parent folders of $path
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	private function getParents($path) {
-		$path = trim($path, '/');
-		if (!$path) {
-			return [];
-		}
-
-		$parts = explode('/', $path);
-
-		// remove the single file
-		array_pop($parts);
-		$result = ['/'];
-		$resultPath = '';
-		foreach ($parts as $part) {
-			if ($part) {
-				$resultPath .= '/' . $part;
-				$result[] = $resultPath;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Returns the mount point for which to lock
-	 *
-	 * @param string $absolutePath absolute path
-	 * @param bool $useParentMount true to return parent mount instead of whatever
-	 * is mounted directly on the given path, false otherwise
-	 * @return IMountPoint mount point for which to apply locks
-	 */
-	private function getMountForLock($absolutePath, $useParentMount = false) {
-		$mount = Filesystem::getMountManager()->find($absolutePath);
-
-		if ($useParentMount) {
-			// find out if something is mounted directly on the path
-			$internalPath = $mount->getInternalPath($absolutePath);
-			if ($internalPath === '') {
-				// resolve the parent mount instead
-				$mount = Filesystem::getMountManager()->find(dirname($absolutePath));
-			}
-		}
-
-		return $mount;
-	}
-
-	/**
-	 * Lock the given path
-	 *
-	 * @param string $path the path of the file to lock, relative to the view
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
-	 *
-	 * @return bool False if the path is excluded from locking, true otherwise
-	 * @throws LockedException if the path is already locked
-	 */
-	private function lockPath($path, $type, $lockMountPoint = false) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$absolutePath = Filesystem::normalizePath($absolutePath);
-		if (!$this->shouldLockFile($absolutePath)) {
-			return false;
-		}
-
-		$mount = $this->getMountForLock($absolutePath, $lockMountPoint);
-		if ($mount) {
-			try {
-				$storage = $mount->getStorage();
-				if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-					$storage->acquireLock(
-						$mount->getInternalPath($absolutePath),
-						$type,
-						$this->lockingProvider
-					);
-				}
-			} catch (LockedException $e) {
-				// rethrow with the a human-readable path
-				throw new LockedException(
-					$this->getPathRelativeToFiles($absolutePath),
-					$e,
-					$e->getExistingLock()
-				);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Change the lock type
-	 *
-	 * @param string $path the path of the file to lock, relative to the view
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
-	 *
-	 * @return bool False if the path is excluded from locking, true otherwise
-	 * @throws LockedException if the path is already locked
-	 */
-	public function changeLock($path, $type, $lockMountPoint = false) {
-		$path = Filesystem::normalizePath($path);
-		$absolutePath = $this->getAbsolutePath($path);
-		$absolutePath = Filesystem::normalizePath($absolutePath);
-		if (!$this->shouldLockFile($absolutePath)) {
-			return false;
-		}
-
-		$mount = $this->getMountForLock($absolutePath, $lockMountPoint);
-		if ($mount) {
-			try {
-				$storage = $mount->getStorage();
-				if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-					$storage->changeLock(
-						$mount->getInternalPath($absolutePath),
-						$type,
-						$this->lockingProvider
-					);
-				}
-			} catch (LockedException $e) {
-				try {
-					// rethrow with the a human-readable path
-					throw new LockedException(
-						$this->getPathRelativeToFiles($absolutePath),
-						$e,
-						$e->getExistingLock()
-					);
-				} catch (\InvalidArgumentException $ex) {
-					throw new LockedException(
-						$absolutePath,
-						$ex,
-						$e->getExistingLock()
-					);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Unlock the given path
-	 *
-	 * @param string $path the path of the file to unlock, relative to the view
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
-	 *
-	 * @return bool False if the path is excluded from locking, true otherwise
-	 * @throws LockedException
-	 */
-	private function unlockPath($path, $type, $lockMountPoint = false) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$absolutePath = Filesystem::normalizePath($absolutePath);
-		if (!$this->shouldLockFile($absolutePath)) {
-			return false;
-		}
-
-		$mount = $this->getMountForLock($absolutePath, $lockMountPoint);
-		if ($mount) {
-			$storage = $mount->getStorage();
-			if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-				$storage->releaseLock(
-					$mount->getInternalPath($absolutePath),
-					$type,
-					$this->lockingProvider
-				);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Lock a path and all its parents up to the root of the view
-	 *
-	 * @param string $path the path of the file to lock relative to the view
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
-	 *
-	 * @return bool False if the path is excluded from locking, true otherwise
-	 * @throws LockedException
-	 */
-	public function lockFile($path, $type, $lockMountPoint = false) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$absolutePath = Filesystem::normalizePath($absolutePath);
-		if (!$this->shouldLockFile($absolutePath)) {
-			return false;
-		}
-
-		$this->lockPath($path, $type, $lockMountPoint);
-
-		$parents = $this->getParents($path);
-		foreach ($parents as $parent) {
-			$this->lockPath($parent, ILockingProvider::LOCK_SHARED);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Unlock a path and all its parents up to the root of the view
-	 *
-	 * @param string $path the path of the file to lock relative to the view
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
-	 *
-	 * @return bool False if the path is excluded from locking, true otherwise
-	 * @throws LockedException
-	 */
-	public function unlockFile($path, $type, $lockMountPoint = false) {
-		$absolutePath = $this->getAbsolutePath($path);
-		$absolutePath = Filesystem::normalizePath($absolutePath);
-		if (!$this->shouldLockFile($absolutePath)) {
-			return false;
-		}
-
-		$this->unlockPath($path, $type, $lockMountPoint);
-
-		$parents = $this->getParents($path);
-		foreach ($parents as $parent) {
-			$this->unlockPath($parent, ILockingProvider::LOCK_SHARED);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Only lock files in data/user/files/
-	 *
-	 * @param string $path Absolute path to the file/folder we try to (un)lock
-	 * @return bool
-	 */
-	protected function shouldLockFile($path) {
-		$path = Filesystem::normalizePath($path);
-
-		$pathSegments = explode('/', $path);
-		if (isset($pathSegments[2])) {
-			// E.g.: /username/files/path-to-file
-			return ($pathSegments[2] === 'files') && (count($pathSegments) > 3);
-		}
-
-		return strpos($path, '/appdata_') !== 0;
-	}
-
-	/**
-	 * Shortens the given absolute path to be relative to
-	 * "$user/files".
-	 *
-	 * @param string $absolutePath absolute path which is under "files"
-	 *
-	 * @return string path relative to "files" with trimmed slashes or null
-	 * if the path was NOT relative to files
-	 *
-	 * @throws \InvalidArgumentException if the given path was not under "files"
-	 * @since 8.1.0
-	 */
-	public function getPathRelativeToFiles($absolutePath) {
-		$path = Filesystem::normalizePath($absolutePath);
-		$parts = explode('/', trim($path, '/'), 3);
-		// "$user", "files", "path/to/dir"
-		if (!isset($parts[1]) || $parts[1] !== 'files') {
-			$this->logger->error(
-				'$absolutePath must be relative to "files", value is "%s"',
-				[
-					$absolutePath
-				]
-			);
-			throw new \InvalidArgumentException('$absolutePath must be relative to "files"');
-		}
-		if (isset($parts[2])) {
-			return $parts[2];
-		}
-		return '';
-	}
-
-	/**
-	 * @param string $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 * @throws NotFoundException
-	 */
-	public function getUidAndFilename($filename) {
-		$info = $this->getFileInfo($filename);
-		if (!$info instanceof \OCP\Files\FileInfo) {
-			throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
-		}
-		$uid = $info->getOwner()->getUID();
-		if ($uid != \OC_User::getUser()) {
-			Filesystem::initMountPoints($uid);
-			$ownerView = new View('/' . $uid . '/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				throw new NotFoundException('File with id ' . $info['fileid'] . ' not found for user ' . $uid);
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Creates parent non-existing folders
-	 *
-	 * @param string $filePath
-	 * @return bool
-	 */
-	private function createParentDirectories($filePath) {
-		$directoryParts = explode('/', $filePath);
-		$directoryParts = array_filter($directoryParts);
-		foreach ($directoryParts as $key => $part) {
-			$currentPathElements = array_slice($directoryParts, 0, $key);
-			$currentPath = '/' . implode('/', $currentPathElements);
-			if ($this->is_file($currentPath)) {
-				return false;
-			}
-			if (!$this->file_exists($currentPath)) {
-				$this->mkdir($currentPath);
-			}
-		}
-
-		return true;
-	}
+    /** @var string */
+    private $fakeRoot = '';
+
+    /**
+     * @var \OCP\Lock\ILockingProvider
+     */
+    protected $lockingProvider;
+
+    private $lockingEnabled;
+
+    private $updaterEnabled = true;
+
+    /** @var \OC\User\Manager */
+    private $userManager;
+
+    /** @var \OCP\ILogger */
+    private $logger;
+
+    /**
+     * @param string $root
+     * @throws \Exception If $root contains an invalid path
+     */
+    public function __construct($root = '') {
+        if (is_null($root)) {
+            throw new \InvalidArgumentException('Root can\'t be null');
+        }
+        if (!Filesystem::isValidPath($root)) {
+            throw new \Exception();
+        }
+
+        $this->fakeRoot = $root;
+        $this->lockingProvider = \OC::$server->getLockingProvider();
+        $this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
+        $this->userManager = \OC::$server->getUserManager();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    public function getAbsolutePath($path = '/') {
+        if ($path === null) {
+            return null;
+        }
+        $this->assertPathLength($path);
+        if ($path === '') {
+            $path = '/';
+        }
+        if ($path[0] !== '/') {
+            $path = '/' . $path;
+        }
+        return $this->fakeRoot . $path;
+    }
+
+    /**
+     * change the root to a fake root
+     *
+     * @param string $fakeRoot
+     * @return boolean|null
+     */
+    public function chroot($fakeRoot) {
+        if (!$fakeRoot == '') {
+            if ($fakeRoot[0] !== '/') {
+                $fakeRoot = '/' . $fakeRoot;
+            }
+        }
+        $this->fakeRoot = $fakeRoot;
+    }
+
+    /**
+     * get the fake root
+     *
+     * @return string
+     */
+    public function getRoot() {
+        return $this->fakeRoot;
+    }
+
+    /**
+     * get path relative to the root of the view
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getRelativePath($path) {
+        $this->assertPathLength($path);
+        if ($this->fakeRoot == '') {
+            return $path;
+        }
+
+        if (rtrim($path, '/') === rtrim($this->fakeRoot, '/')) {
+            return '/';
+        }
+
+        // missing slashes can cause wrong matches!
+        $root = rtrim($this->fakeRoot, '/') . '/';
+
+        if (strpos($path, $root) !== 0) {
+            return null;
+        } else {
+            $path = substr($path, strlen($this->fakeRoot));
+            if (strlen($path) === 0) {
+                return '/';
+            } else {
+                return $path;
+            }
+        }
+    }
+
+    /**
+     * get the mountpoint of the storage object for a path
+     * ( note: because a storage is not always mounted inside the fakeroot, the
+     * returned mountpoint is relative to the absolute root of the filesystem
+     * and does not take the chroot into account )
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getMountPoint($path) {
+        return Filesystem::getMountPoint($this->getAbsolutePath($path));
+    }
+
+    /**
+     * get the mountpoint of the storage object for a path
+     * ( note: because a storage is not always mounted inside the fakeroot, the
+     * returned mountpoint is relative to the absolute root of the filesystem
+     * and does not take the chroot into account )
+     *
+     * @param string $path
+     * @return \OCP\Files\Mount\IMountPoint
+     */
+    public function getMount($path) {
+        return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
+    }
+
+    /**
+     * resolve a path to a storage and internal path
+     *
+     * @param string $path
+     * @return array an array consisting of the storage and the internal path
+     */
+    public function resolvePath($path) {
+        $a = $this->getAbsolutePath($path);
+        $p = Filesystem::normalizePath($a);
+        return Filesystem::resolvePath($p);
+    }
+
+    /**
+     * return the path to a local version of the file
+     * we need this because we can't know if a file is stored local or not from
+     * outside the filestorage and for some purposes a local file is needed
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getLocalFile($path) {
+        $parent = substr($path, 0, strrpos($path, '/'));
+        $path = $this->getAbsolutePath($path);
+        [$storage, $internalPath] = Filesystem::resolvePath($path);
+        if (Filesystem::isValidPath($parent) and $storage) {
+            return $storage->getLocalFile($internalPath);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getLocalFolder($path) {
+        $parent = substr($path, 0, strrpos($path, '/'));
+        $path = $this->getAbsolutePath($path);
+        [$storage, $internalPath] = Filesystem::resolvePath($path);
+        if (Filesystem::isValidPath($parent) and $storage) {
+            return $storage->getLocalFolder($internalPath);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * the following functions operate with arguments and return values identical
+     * to those of their PHP built-in equivalents. Mostly they are merely wrappers
+     * for \OC\Files\Storage\Storage via basicOperation().
+     */
+    public function mkdir($path) {
+        return $this->basicOperation('mkdir', $path, ['create', 'write']);
+    }
+
+    /**
+     * remove mount point
+     *
+     * @param IMountPoint $mount
+     * @param string $path relative to data/
+     * @return boolean
+     */
+    protected function removeMount($mount, $path) {
+        if ($mount instanceof MoveableMount) {
+            // cut of /user/files to get the relative path to data/user/files
+            $pathParts = explode('/', $path, 4);
+            $relPath = '/' . $pathParts[3];
+            $this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true);
+            \OC_Hook::emit(
+                Filesystem::CLASSNAME, "umount",
+                [Filesystem::signal_param_path => $relPath]
+            );
+            $this->changeLock($relPath, ILockingProvider::LOCK_EXCLUSIVE, true);
+            $result = $mount->removeMount();
+            $this->changeLock($relPath, ILockingProvider::LOCK_SHARED, true);
+            if ($result) {
+                \OC_Hook::emit(
+                    Filesystem::CLASSNAME, "post_umount",
+                    [Filesystem::signal_param_path => $relPath]
+                );
+            }
+            $this->unlockFile($relPath, ILockingProvider::LOCK_SHARED, true);
+            return $result;
+        } else {
+            // do not allow deleting the storage's root / the mount point
+            // because for some storages it might delete the whole contents
+            // but isn't supposed to work that way
+            return false;
+        }
+    }
+
+    public function disableCacheUpdate() {
+        $this->updaterEnabled = false;
+    }
+
+    public function enableCacheUpdate() {
+        $this->updaterEnabled = true;
+    }
+
+    protected function writeUpdate(Storage $storage, $internalPath, $time = null) {
+        if ($this->updaterEnabled) {
+            if (is_null($time)) {
+                $time = time();
+            }
+            $storage->getUpdater()->update($internalPath, $time);
+        }
+    }
+
+    protected function removeUpdate(Storage $storage, $internalPath) {
+        if ($this->updaterEnabled) {
+            $storage->getUpdater()->remove($internalPath);
+        }
+    }
+
+    protected function renameUpdate(Storage $sourceStorage, Storage $targetStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($this->updaterEnabled) {
+            $targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function rmdir($path) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $mount = Filesystem::getMountManager()->find($absolutePath);
+        if ($mount->getInternalPath($absolutePath) === '') {
+            return $this->removeMount($mount, $absolutePath);
+        }
+        if ($this->is_dir($path)) {
+            $result = $this->basicOperation('rmdir', $path, ['delete']);
+        } else {
+            $result = false;
+        }
+
+        if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
+            $storage = $mount->getStorage();
+            $internalPath = $mount->getInternalPath($absolutePath);
+            $storage->getUpdater()->remove($internalPath);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @return resource
+     */
+    public function opendir($path) {
+        return $this->basicOperation('opendir', $path, ['read']);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function is_dir($path) {
+        if ($path == '/') {
+            return true;
+        }
+        return $this->basicOperation('is_dir', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function is_file($path) {
+        if ($path == '/') {
+            return false;
+        }
+        return $this->basicOperation('is_file', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function stat($path) {
+        return $this->basicOperation('stat', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function filetype($path) {
+        return $this->basicOperation('filetype', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function filesize($path) {
+        return $this->basicOperation('filesize', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function readfile($path) {
+        $this->assertPathLength($path);
+        if (ob_get_level()) {
+            ob_end_clean();
+        }
+        $handle = $this->fopen($path, 'rb');
+        if ($handle) {
+            $chunkSize = 524288; // 512 kB chunks
+            while (!feof($handle)) {
+                echo fread($handle, $chunkSize);
+                flush();
+            }
+            fclose($handle);
+            return $this->filesize($path);
+        }
+        return false;
+    }
+
+    /**
+     * @param string $path
+     * @param int $from
+     * @param int $to
+     * @return bool|mixed
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\UnseekableException
+     */
+    public function readfilePart($path, $from, $to) {
+        $this->assertPathLength($path);
+        if (ob_get_level()) {
+            ob_end_clean();
+        }
+        $handle = $this->fopen($path, 'rb');
+        if ($handle) {
+            $chunkSize = 524288; // 512 kB chunks
+            $startReading = true;
+
+            if ($from !== 0 && $from !== '0' && fseek($handle, $from) !== 0) {
+                // forward file handle via chunked fread because fseek seem to have failed
+
+                $end = $from + 1;
+                while (!feof($handle) && ftell($handle) < $end && ftell($handle) !== $from) {
+                    $len = $from - ftell($handle);
+                    if ($len > $chunkSize) {
+                        $len = $chunkSize;
+                    }
+                    $result = fread($handle, $len);
+
+                    if ($result === false) {
+                        $startReading = false;
+                        break;
+                    }
+                }
+            }
+
+            if ($startReading) {
+                $end = $to + 1;
+                while (!feof($handle) && ftell($handle) < $end) {
+                    $len = $end - ftell($handle);
+                    if ($len > $chunkSize) {
+                        $len = $chunkSize;
+                    }
+                    echo fread($handle, $len);
+                    flush();
+                }
+                return ftell($handle) - $from;
+            }
+
+            throw new \OCP\Files\UnseekableException('fseek error');
+        }
+        return false;
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function isCreatable($path) {
+        return $this->basicOperation('isCreatable', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function isReadable($path) {
+        return $this->basicOperation('isReadable', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function isUpdatable($path) {
+        return $this->basicOperation('isUpdatable', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function isDeletable($path) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $mount = Filesystem::getMountManager()->find($absolutePath);
+        if ($mount->getInternalPath($absolutePath) === '') {
+            return $mount instanceof MoveableMount;
+        }
+        return $this->basicOperation('isDeletable', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function isSharable($path) {
+        return $this->basicOperation('isSharable', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function file_exists($path) {
+        if ($path == '/') {
+            return true;
+        }
+        return $this->basicOperation('file_exists', $path);
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     */
+    public function filemtime($path) {
+        return $this->basicOperation('filemtime', $path);
+    }
+
+    /**
+     * @param string $path
+     * @param int|string $mtime
+     * @return bool
+     */
+    public function touch($path, $mtime = null) {
+        if (!is_null($mtime) and !is_numeric($mtime)) {
+            $mtime = strtotime($mtime);
+        }
+
+        $hooks = ['touch'];
+
+        if (!$this->file_exists($path)) {
+            $hooks[] = 'create';
+            $hooks[] = 'write';
+        }
+        try {
+            $result = $this->basicOperation('touch', $path, $hooks, $mtime);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['level' => ILogger::INFO, 'message' => 'Error while setting modified time']);
+            $result = false;
+        }
+        if (!$result) {
+            // If create file fails because of permissions on external storage like SMB folders,
+            // check file exists and return false if not.
+            if (!$this->file_exists($path)) {
+                return false;
+            }
+            if (is_null($mtime)) {
+                $mtime = time();
+            }
+            //if native touch fails, we emulate it by changing the mtime in the cache
+            $this->putFileInfo($path, ['mtime' => floor($mtime)]);
+        }
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     * @throws LockedException
+     */
+    public function file_get_contents($path) {
+        return $this->basicOperation('file_get_contents', $path, ['read']);
+    }
+
+    /**
+     * @param bool $exists
+     * @param string $path
+     * @param bool $run
+     */
+    protected function emit_file_hooks_pre($exists, $path, &$run) {
+        if (!$exists) {
+            \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_create, [
+                Filesystem::signal_param_path => $this->getHookPath($path),
+                Filesystem::signal_param_run => &$run,
+            ]);
+        } else {
+            \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_update, [
+                Filesystem::signal_param_path => $this->getHookPath($path),
+                Filesystem::signal_param_run => &$run,
+            ]);
+        }
+        \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_write, [
+            Filesystem::signal_param_path => $this->getHookPath($path),
+            Filesystem::signal_param_run => &$run,
+        ]);
+    }
+
+    /**
+     * @param bool $exists
+     * @param string $path
+     */
+    protected function emit_file_hooks_post($exists, $path) {
+        if (!$exists) {
+            \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_create, [
+                Filesystem::signal_param_path => $this->getHookPath($path),
+            ]);
+        } else {
+            \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_update, [
+                Filesystem::signal_param_path => $this->getHookPath($path),
+            ]);
+        }
+        \OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_write, [
+            Filesystem::signal_param_path => $this->getHookPath($path),
+        ]);
+    }
+
+    /**
+     * @param string $path
+     * @param string|resource $data
+     * @return bool|mixed
+     * @throws LockedException
+     */
+    public function file_put_contents($path, $data) {
+        if (is_resource($data)) { //not having to deal with streams in file_put_contents makes life easier
+            $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
+            if (Filesystem::isValidPath($path)
+                and !Filesystem::isFileBlacklisted($path)
+            ) {
+                $path = $this->getRelativePath($absolutePath);
+
+                $this->lockFile($path, ILockingProvider::LOCK_SHARED);
+
+                $exists = $this->file_exists($path);
+                $run = true;
+                if ($this->shouldEmitHooks($path)) {
+                    $this->emit_file_hooks_pre($exists, $path, $run);
+                }
+                if (!$run) {
+                    $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                    return false;
+                }
+
+                try {
+                    $this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
+                } catch (\Exception $e) {
+                    // Release the shared lock before throwing.
+                    $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                    throw $e;
+                }
+
+                /** @var \OC\Files\Storage\Storage $storage */
+                [$storage, $internalPath] = $this->resolvePath($path);
+                $target = $storage->fopen($internalPath, 'w');
+                if ($target) {
+                    [, $result] = \OC_Helper::streamCopy($data, $target);
+                    fclose($target);
+                    fclose($data);
+
+                    $this->writeUpdate($storage, $internalPath);
+
+                    $this->changeLock($path, ILockingProvider::LOCK_SHARED);
+
+                    if ($this->shouldEmitHooks($path) && $result !== false) {
+                        $this->emit_file_hooks_post($exists, $path);
+                    }
+                    $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                    return $result;
+                } else {
+                    $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            $hooks = $this->file_exists($path) ? ['update', 'write'] : ['create', 'write'];
+            return $this->basicOperation('file_put_contents', $path, $hooks, $data);
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return bool|mixed
+     */
+    public function unlink($path) {
+        if ($path === '' || $path === '/') {
+            // do not allow deleting the root
+            return false;
+        }
+        $postFix = (substr($path, -1) === '/') ? '/' : '';
+        $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
+        $mount = Filesystem::getMountManager()->find($absolutePath . $postFix);
+        if ($mount->getInternalPath($absolutePath) === '') {
+            return $this->removeMount($mount, $absolutePath);
+        }
+        if ($this->is_dir($path)) {
+            $result = $this->basicOperation('rmdir', $path, ['delete']);
+        } else {
+            $result = $this->basicOperation('unlink', $path, ['delete']);
+        }
+        if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
+            $storage = $mount->getStorage();
+            $internalPath = $mount->getInternalPath($absolutePath);
+            $storage->getUpdater()->remove($internalPath);
+            return true;
+        } else {
+            return $result;
+        }
+    }
+
+    /**
+     * @param string $directory
+     * @return bool|mixed
+     */
+    public function deleteAll($directory) {
+        return $this->rmdir($directory);
+    }
+
+    /**
+     * Rename/move a file or folder from the source path to target path.
+     *
+     * @param string $path1 source path
+     * @param string $path2 target path
+     *
+     * @return bool|mixed
+     * @throws LockedException
+     */
+    public function rename($path1, $path2) {
+        $absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
+        $absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
+        $result = false;
+        if (
+            Filesystem::isValidPath($path2)
+            and Filesystem::isValidPath($path1)
+            and !Filesystem::isFileBlacklisted($path2)
+        ) {
+            $path1 = $this->getRelativePath($absolutePath1);
+            $path2 = $this->getRelativePath($absolutePath2);
+            $exists = $this->file_exists($path2);
+
+            if ($path1 == null or $path2 == null) {
+                return false;
+            }
+
+            $this->lockFile($path1, ILockingProvider::LOCK_SHARED, true);
+            try {
+                $this->lockFile($path2, ILockingProvider::LOCK_SHARED, true);
+
+                $run = true;
+                if ($this->shouldEmitHooks($path1) && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
+                    // if it was a rename from a part file to a regular file it was a write and not a rename operation
+                    $this->emit_file_hooks_pre($exists, $path2, $run);
+                } elseif ($this->shouldEmitHooks($path1)) {
+                    \OC_Hook::emit(
+                        Filesystem::CLASSNAME, Filesystem::signal_rename,
+                        [
+                            Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+                            Filesystem::signal_param_newpath => $this->getHookPath($path2),
+                            Filesystem::signal_param_run => &$run
+                        ]
+                    );
+                }
+                if ($run) {
+                    $this->verifyPath(dirname($path2), basename($path2));
+
+                    $manager = Filesystem::getMountManager();
+                    $mount1 = $this->getMount($path1);
+                    $mount2 = $this->getMount($path2);
+                    $storage1 = $mount1->getStorage();
+                    $storage2 = $mount2->getStorage();
+                    $internalPath1 = $mount1->getInternalPath($absolutePath1);
+                    $internalPath2 = $mount2->getInternalPath($absolutePath2);
+
+                    $this->changeLock($path1, ILockingProvider::LOCK_EXCLUSIVE, true);
+                    try {
+                        $this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE, true);
+
+                        if ($internalPath1 === '') {
+                            if ($mount1 instanceof MoveableMount) {
+                                $sourceParentMount = $this->getMount(dirname($path1));
+                                if ($sourceParentMount === $mount2 && $this->targetIsNotShared($storage2, $internalPath2)) {
+                                    /**
+                                     * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
+                                     */
+                                    $sourceMountPoint = $mount1->getMountPoint();
+                                    $result = $mount1->moveMount($absolutePath2);
+                                    $manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
+                                } else {
+                                    $result = false;
+                                }
+                            } else {
+                                $result = false;
+                            }
+                            // moving a file/folder within the same mount point
+                        } elseif ($storage1 === $storage2) {
+                            if ($storage1) {
+                                $result = $storage1->rename($internalPath1, $internalPath2);
+                            } else {
+                                $result = false;
+                            }
+                            // moving a file/folder between storages (from $storage1 to $storage2)
+                        } else {
+                            $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
+                        }
+
+                        if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+                            // if it was a rename from a part file to a regular file it was a write and not a rename operation
+                            $this->writeUpdate($storage2, $internalPath2);
+                        } elseif ($result) {
+                            if ($internalPath1 !== '') { // don't do a cache update for moved mounts
+                                $this->renameUpdate($storage1, $storage2, $internalPath1, $internalPath2);
+                            }
+                        }
+                    } catch (\Exception $e) {
+                        throw $e;
+                    } finally {
+                        $this->changeLock($path1, ILockingProvider::LOCK_SHARED, true);
+                        $this->changeLock($path2, ILockingProvider::LOCK_SHARED, true);
+                    }
+
+                    if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+                        if ($this->shouldEmitHooks()) {
+                            $this->emit_file_hooks_post($exists, $path2);
+                        }
+                    } elseif ($result) {
+                        if ($this->shouldEmitHooks($path1) and $this->shouldEmitHooks($path2)) {
+                            \OC_Hook::emit(
+                                Filesystem::CLASSNAME,
+                                Filesystem::signal_post_rename,
+                                [
+                                    Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+                                    Filesystem::signal_param_newpath => $this->getHookPath($path2)
+                                ]
+                            );
+                        }
+                    }
+                }
+            } catch (\Exception $e) {
+                throw $e;
+            } finally {
+                $this->unlockFile($path1, ILockingProvider::LOCK_SHARED, true);
+                $this->unlockFile($path2, ILockingProvider::LOCK_SHARED, true);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Copy a file/folder from the source path to target path
+     *
+     * @param string $path1 source path
+     * @param string $path2 target path
+     * @param bool $preserveMtime whether to preserve mtime on the copy
+     *
+     * @return bool|mixed
+     */
+    public function copy($path1, $path2, $preserveMtime = false) {
+        $absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
+        $absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
+        $result = false;
+        if (
+            Filesystem::isValidPath($path2)
+            and Filesystem::isValidPath($path1)
+            and !Filesystem::isFileBlacklisted($path2)
+        ) {
+            $path1 = $this->getRelativePath($absolutePath1);
+            $path2 = $this->getRelativePath($absolutePath2);
+
+            if ($path1 == null or $path2 == null) {
+                return false;
+            }
+            $run = true;
+
+            $this->lockFile($path2, ILockingProvider::LOCK_SHARED);
+            $this->lockFile($path1, ILockingProvider::LOCK_SHARED);
+            $lockTypePath1 = ILockingProvider::LOCK_SHARED;
+            $lockTypePath2 = ILockingProvider::LOCK_SHARED;
+
+            try {
+                $exists = $this->file_exists($path2);
+                if ($this->shouldEmitHooks()) {
+                    \OC_Hook::emit(
+                        Filesystem::CLASSNAME,
+                        Filesystem::signal_copy,
+                        [
+                            Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+                            Filesystem::signal_param_newpath => $this->getHookPath($path2),
+                            Filesystem::signal_param_run => &$run
+                        ]
+                    );
+                    $this->emit_file_hooks_pre($exists, $path2, $run);
+                }
+                if ($run) {
+                    $mount1 = $this->getMount($path1);
+                    $mount2 = $this->getMount($path2);
+                    $storage1 = $mount1->getStorage();
+                    $internalPath1 = $mount1->getInternalPath($absolutePath1);
+                    $storage2 = $mount2->getStorage();
+                    $internalPath2 = $mount2->getInternalPath($absolutePath2);
+
+                    $this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE);
+                    $lockTypePath2 = ILockingProvider::LOCK_EXCLUSIVE;
+
+                    if ($mount1->getMountPoint() == $mount2->getMountPoint()) {
+                        if ($storage1) {
+                            $result = $storage1->copy($internalPath1, $internalPath2);
+                        } else {
+                            $result = false;
+                        }
+                    } else {
+                        $result = $storage2->copyFromStorage($storage1, $internalPath1, $internalPath2);
+                    }
+
+                    $this->writeUpdate($storage2, $internalPath2);
+
+                    $this->changeLock($path2, ILockingProvider::LOCK_SHARED);
+                    $lockTypePath2 = ILockingProvider::LOCK_SHARED;
+
+                    if ($this->shouldEmitHooks() && $result !== false) {
+                        \OC_Hook::emit(
+                            Filesystem::CLASSNAME,
+                            Filesystem::signal_post_copy,
+                            [
+                                Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+                                Filesystem::signal_param_newpath => $this->getHookPath($path2)
+                            ]
+                        );
+                        $this->emit_file_hooks_post($exists, $path2);
+                    }
+                }
+            } catch (\Exception $e) {
+                $this->unlockFile($path2, $lockTypePath2);
+                $this->unlockFile($path1, $lockTypePath1);
+                throw $e;
+            }
+
+            $this->unlockFile($path2, $lockTypePath2);
+            $this->unlockFile($path1, $lockTypePath1);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @param string $mode 'r' or 'w'
+     * @return resource
+     * @throws LockedException
+     */
+    public function fopen($path, $mode) {
+        $mode = str_replace('b', '', $mode); // the binary flag is a windows only feature which we do not support
+        $hooks = [];
+        switch ($mode) {
+            case 'r':
+                $hooks[] = 'read';
+                break;
+            case 'r+':
+            case 'w+':
+            case 'x+':
+            case 'a+':
+                $hooks[] = 'read';
+                $hooks[] = 'write';
+                break;
+            case 'w':
+            case 'x':
+            case 'a':
+                $hooks[] = 'write';
+                break;
+            default:
+                \OCP\Util::writeLog('core', 'invalid mode (' . $mode . ') for ' . $path, ILogger::ERROR);
+        }
+
+        if ($mode !== 'r' && $mode !== 'w') {
+            \OC::$server->getLogger()->info('Trying to open a file with a mode other than "r" or "w" can cause severe performance issues with some backends');
+        }
+
+        return $this->basicOperation('fopen', $path, $hooks, $mode);
+    }
+
+    /**
+     * @param string $path
+     * @return bool|string
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function toTmpFile($path) {
+        $this->assertPathLength($path);
+        if (Filesystem::isValidPath($path)) {
+            $source = $this->fopen($path, 'r');
+            if ($source) {
+                $extension = pathinfo($path, PATHINFO_EXTENSION);
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
+                file_put_contents($tmpFile, $source);
+                return $tmpFile;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $tmpFile
+     * @param string $path
+     * @return bool|mixed
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function fromTmpFile($tmpFile, $path) {
+        $this->assertPathLength($path);
+        if (Filesystem::isValidPath($path)) {
+
+            // Get directory that the file is going into
+            $filePath = dirname($path);
+
+            // Create the directories if any
+            if (!$this->file_exists($filePath)) {
+                $result = $this->createParentDirectories($filePath);
+                if ($result === false) {
+                    return false;
+                }
+            }
+
+            $source = fopen($tmpFile, 'r');
+            if ($source) {
+                $result = $this->file_put_contents($path, $source);
+                // $this->file_put_contents() might have already closed
+                // the resource, so we check it, before trying to close it
+                // to avoid messages in the error log.
+                if (is_resource($source)) {
+                    fclose($source);
+                }
+                unlink($tmpFile);
+                return $result;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @return mixed
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function getMimeType($path) {
+        $this->assertPathLength($path);
+        return $this->basicOperation('getMimeType', $path);
+    }
+
+    /**
+     * @param string $type
+     * @param string $path
+     * @param bool $raw
+     * @return bool|string
+     */
+    public function hash($type, $path, $raw = false) {
+        $postFix = (substr($path, -1) === '/') ? '/' : '';
+        $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
+        if (Filesystem::isValidPath($path)) {
+            $path = $this->getRelativePath($absolutePath);
+            if ($path == null) {
+                return false;
+            }
+            if ($this->shouldEmitHooks($path)) {
+                \OC_Hook::emit(
+                    Filesystem::CLASSNAME,
+                    Filesystem::signal_read,
+                    [Filesystem::signal_param_path => $this->getHookPath($path)]
+                );
+            }
+            [$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
+            if ($storage) {
+                return $storage->hash($type, $internalPath, $raw);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param string $path
+     * @return mixed
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function free_space($path = '/') {
+        $this->assertPathLength($path);
+        $result = $this->basicOperation('free_space', $path);
+        if ($result === null) {
+            throw new InvalidPathException();
+        }
+        return $result;
+    }
+
+    /**
+     * abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
+     *
+     * @param string $operation
+     * @param string $path
+     * @param array $hooks (optional)
+     * @param mixed $extraParam (optional)
+     * @return mixed
+     * @throws LockedException
+     *
+     * This method takes requests for basic filesystem functions (e.g. reading & writing
+     * files), processes hooks and proxies, sanitises paths, and finally passes them on to
+     * \OC\Files\Storage\Storage for delegation to a storage backend for execution
+     */
+    private function basicOperation($operation, $path, $hooks = [], $extraParam = null) {
+        $postFix = (substr($path, -1) === '/') ? '/' : '';
+        $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
+        if (Filesystem::isValidPath($path)
+            and !Filesystem::isFileBlacklisted($path)
+        ) {
+            $path = $this->getRelativePath($absolutePath);
+            if ($path == null) {
+                return false;
+            }
+
+            if (in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks)) {
+                // always a shared lock during pre-hooks so the hook can read the file
+                $this->lockFile($path, ILockingProvider::LOCK_SHARED);
+            }
+
+            $run = $this->runHooks($hooks, $path);
+            /** @var \OC\Files\Storage\Storage $storage */
+            [$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
+            if ($run and $storage) {
+                if (in_array('write', $hooks) || in_array('delete', $hooks)) {
+                    try {
+                        $this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
+                    } catch (LockedException $e) {
+                        // release the shared lock we acquired before quiting
+                        $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                        throw $e;
+                    }
+                }
+                try {
+                    if (!is_null($extraParam)) {
+                        $result = $storage->$operation($internalPath, $extraParam);
+                    } else {
+                        $result = $storage->$operation($internalPath);
+                    }
+                } catch (\Exception $e) {
+                    if (in_array('write', $hooks) || in_array('delete', $hooks)) {
+                        $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
+                    } elseif (in_array('read', $hooks)) {
+                        $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                    }
+                    throw $e;
+                }
+
+                if ($result && in_array('delete', $hooks) and $result) {
+                    $this->removeUpdate($storage, $internalPath);
+                }
+                if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
+                    $this->writeUpdate($storage, $internalPath);
+                }
+                if ($result && in_array('touch', $hooks)) {
+                    $this->writeUpdate($storage, $internalPath, $extraParam);
+                }
+
+                if ((in_array('write', $hooks) || in_array('delete', $hooks)) && ($operation !== 'fopen' || $result === false)) {
+                    $this->changeLock($path, ILockingProvider::LOCK_SHARED);
+                }
+
+                $unlockLater = false;
+                if ($this->lockingEnabled && $operation === 'fopen' && is_resource($result)) {
+                    $unlockLater = true;
+                    // make sure our unlocking callback will still be called if connection is aborted
+                    ignore_user_abort(true);
+                    $result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
+                        if (in_array('write', $hooks)) {
+                            $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
+                        } elseif (in_array('read', $hooks)) {
+                            $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                        }
+                    });
+                }
+
+                if ($this->shouldEmitHooks($path) && $result !== false) {
+                    if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
+                        $this->runHooks($hooks, $path, true);
+                    }
+                }
+
+                if (!$unlockLater
+                    && (in_array('write', $hooks) || in_array('delete', $hooks) || in_array('read', $hooks))
+                ) {
+                    $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+                }
+                return $result;
+            } else {
+                $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * get the path relative to the default root for hook usage
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getHookPath($path) {
+        if (!Filesystem::getView()) {
+            return $path;
+        }
+        return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path));
+    }
+
+    private function shouldEmitHooks($path = '') {
+        if ($path && Cache\Scanner::isPartialFile($path)) {
+            return false;
+        }
+        if (!Filesystem::$loaded) {
+            return false;
+        }
+        $defaultRoot = Filesystem::getRoot();
+        if ($defaultRoot === null) {
+            return false;
+        }
+        if ($this->fakeRoot === $defaultRoot) {
+            return true;
+        }
+        $fullPath = $this->getAbsolutePath($path);
+
+        if ($fullPath === $defaultRoot) {
+            return true;
+        }
+
+        return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
+    }
+
+    /**
+     * @param string[] $hooks
+     * @param string $path
+     * @param bool $post
+     * @return bool
+     */
+    private function runHooks($hooks, $path, $post = false) {
+        $relativePath = $path;
+        $path = $this->getHookPath($path);
+        $prefix = $post ? 'post_' : '';
+        $run = true;
+        if ($this->shouldEmitHooks($relativePath)) {
+            foreach ($hooks as $hook) {
+                if ($hook != 'read') {
+                    \OC_Hook::emit(
+                        Filesystem::CLASSNAME,
+                        $prefix . $hook,
+                        [
+                            Filesystem::signal_param_run => &$run,
+                            Filesystem::signal_param_path => $path
+                        ]
+                    );
+                } elseif (!$post) {
+                    \OC_Hook::emit(
+                        Filesystem::CLASSNAME,
+                        $prefix . $hook,
+                        [
+                            Filesystem::signal_param_path => $path
+                        ]
+                    );
+                }
+            }
+        }
+        return $run;
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        return $this->basicOperation('hasUpdated', $path, [], $time);
+    }
+
+    /**
+     * @param string $ownerId
+     * @return \OC\User\User
+     */
+    private function getUserObjectForOwner($ownerId) {
+        $owner = $this->userManager->get($ownerId);
+        if ($owner instanceof IUser) {
+            return $owner;
+        } else {
+            return new User($ownerId, null, \OC::$server->getEventDispatcher());
+        }
+    }
+
+    /**
+     * Get file info from cache
+     *
+     * If the file is not in cached it will be scanned
+     * If the file has changed on storage the cache will be updated
+     *
+     * @param \OC\Files\Storage\Storage $storage
+     * @param string $internalPath
+     * @param string $relativePath
+     * @return ICacheEntry|bool
+     */
+    private function getCacheEntry($storage, $internalPath, $relativePath) {
+        $cache = $storage->getCache($internalPath);
+        $data = $cache->get($internalPath);
+        $watcher = $storage->getWatcher($internalPath);
+
+        try {
+            // if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
+            if (!$data || (isset($data['size']) && $data['size'] === -1)) {
+                if (!$storage->file_exists($internalPath)) {
+                    return false;
+                }
+                // don't need to get a lock here since the scanner does it's own locking
+                $scanner = $storage->getScanner($internalPath);
+                $scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
+                $data = $cache->get($internalPath);
+            } elseif (!Cache\Scanner::isPartialFile($internalPath) && $watcher->needsUpdate($internalPath, $data)) {
+                $this->lockFile($relativePath, ILockingProvider::LOCK_SHARED);
+                $watcher->update($internalPath, $data);
+                $storage->getPropagator()->propagateChange($internalPath, time());
+                $data = $cache->get($internalPath);
+                $this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
+            }
+        } catch (LockedException $e) {
+            // if the file is locked we just use the old cache info
+        }
+
+        return $data;
+    }
+
+    /**
+     * get the filesystem info
+     *
+     * @param string $path
+     * @param boolean|string $includeMountPoints true to add mountpoint sizes,
+     * 'ext' to add only ext storage mount point sizes. Defaults to true.
+     * defaults to true
+     * @return \OC\Files\FileInfo|false False if file does not exist
+     */
+    public function getFileInfo($path, $includeMountPoints = true) {
+        $this->assertPathLength($path);
+        if (!Filesystem::isValidPath($path)) {
+            return false;
+        }
+        if (Cache\Scanner::isPartialFile($path)) {
+            return $this->getPartFileInfo($path);
+        }
+        $relativePath = $path;
+        $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+
+        $mount = Filesystem::getMountManager()->find($path);
+        $storage = $mount->getStorage();
+        $internalPath = $mount->getInternalPath($path);
+        if ($storage) {
+            $data = $this->getCacheEntry($storage, $internalPath, $relativePath);
+
+            if (!$data instanceof ICacheEntry) {
+                return false;
+            }
+
+            if ($mount instanceof MoveableMount && $internalPath === '') {
+                $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE;
+            }
+            $ownerId = $storage->getOwner($internalPath);
+            $owner = null;
+            if ($ownerId !== null && $ownerId !== false) {
+                // ownerId might be null if files are accessed with an access token without file system access
+                $owner = $this->getUserObjectForOwner($ownerId);
+            }
+            $info = new FileInfo($path, $storage, $internalPath, $data, $mount, $owner);
+
+            if (isset($data['fileid'])) {
+                if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') {
+                    //add the sizes of other mount points to the folder
+                    $extOnly = ($includeMountPoints === 'ext');
+                    $mounts = Filesystem::getMountManager()->findIn($path);
+                    $info->setSubMounts(array_filter($mounts, function (IMountPoint $mount) use ($extOnly) {
+                        $subStorage = $mount->getStorage();
+                        return !($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage);
+                    }));
+                }
+            }
+
+            return $info;
+        } else {
+            \OC::$server->getLogger()->warning('Storage not valid for mountpoint: ' . $mount->getMountPoint());
+        }
+
+        return false;
+    }
+
+    /**
+     * get the content of a directory
+     *
+     * @param string $directory path under datadirectory
+     * @param string $mimetype_filter limit returned content to this mimetype or mimepart
+     * @return FileInfo[]
+     */
+    public function getDirectoryContent($directory, $mimetype_filter = '') {
+        $this->assertPathLength($directory);
+        if (!Filesystem::isValidPath($directory)) {
+            return [];
+        }
+        $path = $this->getAbsolutePath($directory);
+        $path = Filesystem::normalizePath($path);
+        $mount = $this->getMount($directory);
+        if (!$mount) {
+            return [];
+        }
+        $storage = $mount->getStorage();
+        $internalPath = $mount->getInternalPath($path);
+        if ($storage) {
+            $cache = $storage->getCache($internalPath);
+            $user = \OC_User::getUser();
+
+            $data = $this->getCacheEntry($storage, $internalPath, $directory);
+
+            if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() && Constants::PERMISSION_READ)) {
+                return [];
+            }
+
+            $folderId = $data['fileid'];
+            $contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
+
+            $sharingDisabled = \OCP\Util::isSharingDisabledForUser();
+
+            $fileNames = array_map(function (ICacheEntry $content) {
+                return $content->getName();
+            }, $contents);
+            /**
+             * @var \OC\Files\FileInfo[] $fileInfos
+             */
+            $fileInfos = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
+                if ($sharingDisabled) {
+                    $content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
+                }
+                $owner = $this->getUserObjectForOwner($storage->getOwner($content['path']));
+                return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner);
+            }, $contents);
+            $files = array_combine($fileNames, $fileInfos);
+
+            //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
+            $mounts = Filesystem::getMountManager()->findIn($path);
+            $dirLength = strlen($path);
+            foreach ($mounts as $mount) {
+                $mountPoint = $mount->getMountPoint();
+                $subStorage = $mount->getStorage();
+                if ($subStorage) {
+                    $subCache = $subStorage->getCache('');
+
+                    $rootEntry = $subCache->get('');
+                    if (!$rootEntry) {
+                        $subScanner = $subStorage->getScanner();
+                        try {
+                            $subScanner->scanFile('');
+                        } catch (\OCP\Files\StorageNotAvailableException $e) {
+                            continue;
+                        } catch (\OCP\Files\StorageInvalidException $e) {
+                            continue;
+                        } catch (\Exception $e) {
+                            // sometimes when the storage is not available it can be any exception
+                            \OC::$server->getLogger()->logException($e, [
+                                'message' => 'Exception while scanning storage "' . $subStorage->getId() . '"',
+                                'level' => ILogger::ERROR,
+                                'app' => 'lib',
+                            ]);
+                            continue;
+                        }
+                        $rootEntry = $subCache->get('');
+                    }
+
+                    if ($rootEntry && ($rootEntry->getPermissions() && Constants::PERMISSION_READ)) {
+                        $relativePath = trim(substr($mountPoint, $dirLength), '/');
+                        if ($pos = strpos($relativePath, '/')) {
+                            //mountpoint inside subfolder add size to the correct folder
+                            $entryName = substr($relativePath, 0, $pos);
+                            foreach ($files as &$entry) {
+                                if ($entry->getName() === $entryName) {
+                                    $entry->addSubEntry($rootEntry, $mountPoint);
+                                }
+                            }
+                        } else { //mountpoint in this folder, add an entry for it
+                            $rootEntry['name'] = $relativePath;
+                            $rootEntry['type'] = $rootEntry['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
+                            $permissions = $rootEntry['permissions'];
+                            // do not allow renaming/deleting the mount point if they are not shared files/folders
+                            // for shared files/folders we use the permissions given by the owner
+                            if ($mount instanceof MoveableMount) {
+                                $rootEntry['permissions'] = $permissions | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
+                            } else {
+                                $rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
+                            }
+
+                            $rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/
+
+                            // if sharing was disabled for the user we remove the share permissions
+                            if (\OCP\Util::isSharingDisabledForUser()) {
+                                $rootEntry['permissions'] = $rootEntry['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
+                            }
+
+                            $owner = $this->getUserObjectForOwner($subStorage->getOwner(''));
+                            $files[$rootEntry->getName()] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
+                        }
+                    }
+                }
+            }
+
+            if ($mimetype_filter) {
+                $files = array_filter($files, function (FileInfo $file) use ($mimetype_filter) {
+                    if (strpos($mimetype_filter, '/')) {
+                        return $file->getMimetype() === $mimetype_filter;
+                    } else {
+                        return $file->getMimePart() === $mimetype_filter;
+                    }
+                });
+            }
+
+            return array_values($files);
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * change file metadata
+     *
+     * @param string $path
+     * @param array|\OCP\Files\FileInfo $data
+     * @return int
+     *
+     * returns the fileid of the updated file
+     */
+    public function putFileInfo($path, $data) {
+        $this->assertPathLength($path);
+        if ($data instanceof FileInfo) {
+            $data = $data->getData();
+        }
+        $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+        /**
+         * @var \OC\Files\Storage\Storage $storage
+         * @var string $internalPath
+         */
+        [$storage, $internalPath] = Filesystem::resolvePath($path);
+        if ($storage) {
+            $cache = $storage->getCache($path);
+
+            if (!$cache->inCache($internalPath)) {
+                $scanner = $storage->getScanner($internalPath);
+                $scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
+            }
+
+            return $cache->put($internalPath, $data);
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * search for files with the name matching $query
+     *
+     * @param string $query
+     * @return FileInfo[]
+     */
+    public function search($query) {
+        return $this->searchCommon('search', ['%' . $query . '%']);
+    }
+
+    /**
+     * search for files with the name matching $query
+     *
+     * @param string $query
+     * @return FileInfo[]
+     */
+    public function searchRaw($query) {
+        return $this->searchCommon('search', [$query]);
+    }
+
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype
+     * @return FileInfo[]
+     */
+    public function searchByMime($mimetype) {
+        return $this->searchCommon('searchByMime', [$mimetype]);
+    }
+
+    /**
+     * search for files by tag
+     *
+     * @param string|int $tag name or tag id
+     * @param string $userId owner of the tags
+     * @return FileInfo[]
+     */
+    public function searchByTag($tag, $userId) {
+        return $this->searchCommon('searchByTag', [$tag, $userId]);
+    }
+
+    /**
+     * @param string $method cache method
+     * @param array $args
+     * @return FileInfo[]
+     */
+    private function searchCommon($method, $args) {
+        $files = [];
+        $rootLength = strlen($this->fakeRoot);
+
+        $mount = $this->getMount('');
+        $mountPoint = $mount->getMountPoint();
+        $storage = $mount->getStorage();
+        $userManager = \OC::$server->getUserManager();
+        if ($storage) {
+            $cache = $storage->getCache('');
+
+            $results = call_user_func_array([$cache, $method], $args);
+            foreach ($results as $result) {
+                if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
+                    $internalPath = $result['path'];
+                    $path = $mountPoint . $result['path'];
+                    $result['path'] = substr($mountPoint . $result['path'], $rootLength);
+                    $owner = $userManager->get($storage->getOwner($internalPath));
+                    $files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
+                }
+            }
+
+            $mounts = Filesystem::getMountManager()->findIn($this->fakeRoot);
+            foreach ($mounts as $mount) {
+                $mountPoint = $mount->getMountPoint();
+                $storage = $mount->getStorage();
+                if ($storage) {
+                    $cache = $storage->getCache('');
+
+                    $relativeMountPoint = substr($mountPoint, $rootLength);
+                    $results = call_user_func_array([$cache, $method], $args);
+                    if ($results) {
+                        foreach ($results as $result) {
+                            $internalPath = $result['path'];
+                            $result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
+                            $path = rtrim($mountPoint . $internalPath, '/');
+                            $owner = $userManager->get($storage->getOwner($internalPath));
+                            $files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
+                        }
+                    }
+                }
+            }
+        }
+        return $files;
+    }
+
+    /**
+     * Get the owner for a file or folder
+     *
+     * @param string $path
+     * @return string the user id of the owner
+     * @throws NotFoundException
+     */
+    public function getOwner($path) {
+        $info = $this->getFileInfo($path);
+        if (!$info) {
+            throw new NotFoundException($path . ' not found while trying to get owner');
+        }
+
+        if ($info->getOwner() === null) {
+            throw new NotFoundException($path . ' has no owner');
+        }
+
+        return $info->getOwner()->getUID();
+    }
+
+    /**
+     * get the ETag for a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getETag($path) {
+        /**
+         * @var Storage\Storage $storage
+         * @var string $internalPath
+         */
+        [$storage, $internalPath] = $this->resolvePath($path);
+        if ($storage) {
+            return $storage->getETag($internalPath);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the path of a file by id, relative to the view
+     *
+     * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
+     *
+     * @param int $id
+     * @param int|null $storageId
+     * @return string
+     * @throws NotFoundException
+     */
+    public function getPath($id, int $storageId = null) {
+        $id = (int)$id;
+        $manager = Filesystem::getMountManager();
+        $mounts = $manager->findIn($this->fakeRoot);
+        $mounts[] = $manager->find($this->fakeRoot);
+        $mounts = array_filter($mounts);
+        // reverse the array, so we start with the storage this view is in
+        // which is the most likely to contain the file we're looking for
+        $mounts = array_reverse($mounts);
+
+        // put non-shared mounts in front of the shared mount
+        // this prevents unneeded recursion into shares
+        usort($mounts, function (IMountPoint $a, IMountPoint $b) {
+            return $a instanceof SharedMount && (!$b instanceof SharedMount) ? 1 : -1;
+        });
+
+        if (!is_null($storageId)) {
+            $mounts = array_filter($mounts, function (IMountPoint $mount) use ($storageId) {
+                return $mount->getNumericStorageId() === $storageId;
+            });
+        }
+
+        foreach ($mounts as $mount) {
+            /**
+             * @var \OC\Files\Mount\MountPoint $mount
+             */
+            if ($mount->getStorage()) {
+                $cache = $mount->getStorage()->getCache();
+                $internalPath = $cache->getPathById($id);
+                if (is_string($internalPath)) {
+                    $fullPath = $mount->getMountPoint() . $internalPath;
+                    if (!is_null($path = $this->getRelativePath($fullPath))) {
+                        return $path;
+                    }
+                }
+            }
+        }
+        throw new NotFoundException(sprintf('File with id "%s" has not been found.', $id));
+    }
+
+    /**
+     * @param string $path
+     * @throws InvalidPathException
+     */
+    private function assertPathLength($path) {
+        $maxLen = min(PHP_MAXPATHLEN, 4000);
+        // Check for the string length - performed using isset() instead of strlen()
+        // because isset() is about 5x-40x faster.
+        if (isset($path[$maxLen])) {
+            $pathLen = strlen($path);
+            throw new \OCP\Files\InvalidPathException("Path length($pathLen) exceeds max path length($maxLen): $path");
+        }
+    }
+
+    /**
+     * check if it is allowed to move a mount point to a given target.
+     * It is not allowed to move a mount point into a different mount point or
+     * into an already shared folder
+     *
+     * @param IStorage $targetStorage
+     * @param string $targetInternalPath
+     * @return boolean
+     */
+    private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) {
+
+        // note: cannot use the view because the target is already locked
+        $fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
+        if ($fileId === -1) {
+            // target might not exist, need to check parent instead
+            $fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
+        }
+
+        // check if any of the parents were shared by the current owner (include collections)
+        $shares = \OCP\Share::getItemShared(
+            'folder',
+            $fileId,
+            \OCP\Share::FORMAT_NONE,
+            null,
+            true
+        );
+
+        if (count($shares) > 0) {
+            \OCP\Util::writeLog('files',
+                'It is not allowed to move one mount point into a shared folder',
+                ILogger::DEBUG);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a fileinfo object for files that are ignored in the cache (part files)
+     *
+     * @param string $path
+     * @return \OCP\Files\FileInfo
+     */
+    private function getPartFileInfo($path) {
+        $mount = $this->getMount($path);
+        $storage = $mount->getStorage();
+        $internalPath = $mount->getInternalPath($this->getAbsolutePath($path));
+        $owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath));
+        return new FileInfo(
+            $this->getAbsolutePath($path),
+            $storage,
+            $internalPath,
+            [
+                'fileid' => null,
+                'mimetype' => $storage->getMimeType($internalPath),
+                'name' => basename($path),
+                'etag' => null,
+                'size' => $storage->filesize($internalPath),
+                'mtime' => $storage->filemtime($internalPath),
+                'encrypted' => false,
+                'permissions' => \OCP\Constants::PERMISSION_ALL
+            ],
+            $mount,
+            $owner
+        );
+    }
+
+    /**
+     * @param string $path
+     * @param string $fileName
+     * @throws InvalidPathException
+     */
+    public function verifyPath($path, $fileName) {
+        try {
+            /** @type \OCP\Files\Storage $storage */
+            [$storage, $internalPath] = $this->resolvePath($path);
+            $storage->verifyPath($internalPath, $fileName);
+        } catch (ReservedWordException $ex) {
+            $l = \OC::$server->getL10N('lib');
+            throw new InvalidPathException($l->t('File name is a reserved word'));
+        } catch (InvalidCharacterInPathException $ex) {
+            $l = \OC::$server->getL10N('lib');
+            throw new InvalidPathException($l->t('File name contains at least one invalid character'));
+        } catch (FileNameTooLongException $ex) {
+            $l = \OC::$server->getL10N('lib');
+            throw new InvalidPathException($l->t('File name is too long'));
+        } catch (InvalidDirectoryException $ex) {
+            $l = \OC::$server->getL10N('lib');
+            throw new InvalidPathException($l->t('Dot files are not allowed'));
+        } catch (EmptyFileNameException $ex) {
+            $l = \OC::$server->getL10N('lib');
+            throw new InvalidPathException($l->t('Empty filename is not allowed'));
+        }
+    }
+
+    /**
+     * get all parent folders of $path
+     *
+     * @param string $path
+     * @return string[]
+     */
+    private function getParents($path) {
+        $path = trim($path, '/');
+        if (!$path) {
+            return [];
+        }
+
+        $parts = explode('/', $path);
+
+        // remove the single file
+        array_pop($parts);
+        $result = ['/'];
+        $resultPath = '';
+        foreach ($parts as $part) {
+            if ($part) {
+                $resultPath .= '/' . $part;
+                $result[] = $resultPath;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Returns the mount point for which to lock
+     *
+     * @param string $absolutePath absolute path
+     * @param bool $useParentMount true to return parent mount instead of whatever
+     * is mounted directly on the given path, false otherwise
+     * @return IMountPoint mount point for which to apply locks
+     */
+    private function getMountForLock($absolutePath, $useParentMount = false) {
+        $mount = Filesystem::getMountManager()->find($absolutePath);
+
+        if ($useParentMount) {
+            // find out if something is mounted directly on the path
+            $internalPath = $mount->getInternalPath($absolutePath);
+            if ($internalPath === '') {
+                // resolve the parent mount instead
+                $mount = Filesystem::getMountManager()->find(dirname($absolutePath));
+            }
+        }
+
+        return $mount;
+    }
+
+    /**
+     * Lock the given path
+     *
+     * @param string $path the path of the file to lock, relative to the view
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
+     *
+     * @return bool False if the path is excluded from locking, true otherwise
+     * @throws LockedException if the path is already locked
+     */
+    private function lockPath($path, $type, $lockMountPoint = false) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $absolutePath = Filesystem::normalizePath($absolutePath);
+        if (!$this->shouldLockFile($absolutePath)) {
+            return false;
+        }
+
+        $mount = $this->getMountForLock($absolutePath, $lockMountPoint);
+        if ($mount) {
+            try {
+                $storage = $mount->getStorage();
+                if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+                    $storage->acquireLock(
+                        $mount->getInternalPath($absolutePath),
+                        $type,
+                        $this->lockingProvider
+                    );
+                }
+            } catch (LockedException $e) {
+                // rethrow with the a human-readable path
+                throw new LockedException(
+                    $this->getPathRelativeToFiles($absolutePath),
+                    $e,
+                    $e->getExistingLock()
+                );
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Change the lock type
+     *
+     * @param string $path the path of the file to lock, relative to the view
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
+     *
+     * @return bool False if the path is excluded from locking, true otherwise
+     * @throws LockedException if the path is already locked
+     */
+    public function changeLock($path, $type, $lockMountPoint = false) {
+        $path = Filesystem::normalizePath($path);
+        $absolutePath = $this->getAbsolutePath($path);
+        $absolutePath = Filesystem::normalizePath($absolutePath);
+        if (!$this->shouldLockFile($absolutePath)) {
+            return false;
+        }
+
+        $mount = $this->getMountForLock($absolutePath, $lockMountPoint);
+        if ($mount) {
+            try {
+                $storage = $mount->getStorage();
+                if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+                    $storage->changeLock(
+                        $mount->getInternalPath($absolutePath),
+                        $type,
+                        $this->lockingProvider
+                    );
+                }
+            } catch (LockedException $e) {
+                try {
+                    // rethrow with the a human-readable path
+                    throw new LockedException(
+                        $this->getPathRelativeToFiles($absolutePath),
+                        $e,
+                        $e->getExistingLock()
+                    );
+                } catch (\InvalidArgumentException $ex) {
+                    throw new LockedException(
+                        $absolutePath,
+                        $ex,
+                        $e->getExistingLock()
+                    );
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Unlock the given path
+     *
+     * @param string $path the path of the file to unlock, relative to the view
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
+     *
+     * @return bool False if the path is excluded from locking, true otherwise
+     * @throws LockedException
+     */
+    private function unlockPath($path, $type, $lockMountPoint = false) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $absolutePath = Filesystem::normalizePath($absolutePath);
+        if (!$this->shouldLockFile($absolutePath)) {
+            return false;
+        }
+
+        $mount = $this->getMountForLock($absolutePath, $lockMountPoint);
+        if ($mount) {
+            $storage = $mount->getStorage();
+            if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+                $storage->releaseLock(
+                    $mount->getInternalPath($absolutePath),
+                    $type,
+                    $this->lockingProvider
+                );
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Lock a path and all its parents up to the root of the view
+     *
+     * @param string $path the path of the file to lock relative to the view
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
+     *
+     * @return bool False if the path is excluded from locking, true otherwise
+     * @throws LockedException
+     */
+    public function lockFile($path, $type, $lockMountPoint = false) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $absolutePath = Filesystem::normalizePath($absolutePath);
+        if (!$this->shouldLockFile($absolutePath)) {
+            return false;
+        }
+
+        $this->lockPath($path, $type, $lockMountPoint);
+
+        $parents = $this->getParents($path);
+        foreach ($parents as $parent) {
+            $this->lockPath($parent, ILockingProvider::LOCK_SHARED);
+        }
+
+        return true;
+    }
+
+    /**
+     * Unlock a path and all its parents up to the root of the view
+     *
+     * @param string $path the path of the file to lock relative to the view
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param bool $lockMountPoint true to lock the mount point, false to lock the attached mount/storage
+     *
+     * @return bool False if the path is excluded from locking, true otherwise
+     * @throws LockedException
+     */
+    public function unlockFile($path, $type, $lockMountPoint = false) {
+        $absolutePath = $this->getAbsolutePath($path);
+        $absolutePath = Filesystem::normalizePath($absolutePath);
+        if (!$this->shouldLockFile($absolutePath)) {
+            return false;
+        }
+
+        $this->unlockPath($path, $type, $lockMountPoint);
+
+        $parents = $this->getParents($path);
+        foreach ($parents as $parent) {
+            $this->unlockPath($parent, ILockingProvider::LOCK_SHARED);
+        }
+
+        return true;
+    }
+
+    /**
+     * Only lock files in data/user/files/
+     *
+     * @param string $path Absolute path to the file/folder we try to (un)lock
+     * @return bool
+     */
+    protected function shouldLockFile($path) {
+        $path = Filesystem::normalizePath($path);
+
+        $pathSegments = explode('/', $path);
+        if (isset($pathSegments[2])) {
+            // E.g.: /username/files/path-to-file
+            return ($pathSegments[2] === 'files') && (count($pathSegments) > 3);
+        }
+
+        return strpos($path, '/appdata_') !== 0;
+    }
+
+    /**
+     * Shortens the given absolute path to be relative to
+     * "$user/files".
+     *
+     * @param string $absolutePath absolute path which is under "files"
+     *
+     * @return string path relative to "files" with trimmed slashes or null
+     * if the path was NOT relative to files
+     *
+     * @throws \InvalidArgumentException if the given path was not under "files"
+     * @since 8.1.0
+     */
+    public function getPathRelativeToFiles($absolutePath) {
+        $path = Filesystem::normalizePath($absolutePath);
+        $parts = explode('/', trim($path, '/'), 3);
+        // "$user", "files", "path/to/dir"
+        if (!isset($parts[1]) || $parts[1] !== 'files') {
+            $this->logger->error(
+                '$absolutePath must be relative to "files", value is "%s"',
+                [
+                    $absolutePath
+                ]
+            );
+            throw new \InvalidArgumentException('$absolutePath must be relative to "files"');
+        }
+        if (isset($parts[2])) {
+            return $parts[2];
+        }
+        return '';
+    }
+
+    /**
+     * @param string $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     * @throws NotFoundException
+     */
+    public function getUidAndFilename($filename) {
+        $info = $this->getFileInfo($filename);
+        if (!$info instanceof \OCP\Files\FileInfo) {
+            throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
+        }
+        $uid = $info->getOwner()->getUID();
+        if ($uid != \OC_User::getUser()) {
+            Filesystem::initMountPoints($uid);
+            $ownerView = new View('/' . $uid . '/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+            } catch (NotFoundException $e) {
+                throw new NotFoundException('File with id ' . $info['fileid'] . ' not found for user ' . $uid);
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * Creates parent non-existing folders
+     *
+     * @param string $filePath
+     * @return bool
+     */
+    private function createParentDirectories($filePath) {
+        $directoryParts = explode('/', $filePath);
+        $directoryParts = array_filter($directoryParts);
+        foreach ($directoryParts as $key => $part) {
+            $currentPathElements = array_slice($directoryParts, 0, $key);
+            $currentPath = '/' . implode('/', $currentPathElements);
+            if ($this->is_file($currentPath)) {
+                return false;
+            }
+            if (!$this->file_exists($currentPath)) {
+                $this->mkdir($currentPath);
+            }
+        }
+
+        return true;
+    }
 }

Spacing +43 added lines, -43 removed lines

@@ -130,9 +130,9 @@ 
 			$path = '/';
 		}
 		if ($path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
-		return $this->fakeRoot . $path;
+		return $this->fakeRoot.$path;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	public function chroot($fakeRoot) {
 		if (!$fakeRoot == '') {
 			if ($fakeRoot[0] !== '/') {
-				$fakeRoot = '/' . $fakeRoot;
+				$fakeRoot = '/'.$fakeRoot;
 			}
 		}
 		$this->fakeRoot = $fakeRoot;
@@ -176,7 +176,7 @@ 
 		}
 
 		// missing slashes can cause wrong matches!
-		$root = rtrim($this->fakeRoot, '/') . '/';
+		$root = rtrim($this->fakeRoot, '/').'/';
 
 		if (strpos($path, $root) !== 0) {
 			return null;
@@ -282,7 +282,7 @@ 
 		if ($mount instanceof MoveableMount) {
 			// cut of /user/files to get the relative path to data/user/files
 			$pathParts = explode('/', $path, 4);
-			$relPath = '/' . $pathParts[3];
+			$relPath = '/'.$pathParts[3];
 			$this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true);
 			\OC_Hook::emit(
 				Filesystem::CLASSNAME, "umount",
@@ -718,7 +718,7 @@ 
 		}
 		$postFix = (substr($path, -1) === '/') ? '/' : '';
 		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		$mount = Filesystem::getMountManager()->find($absolutePath . $postFix);
+		$mount = Filesystem::getMountManager()->find($absolutePath.$postFix);
 		if ($mount->getInternalPath($absolutePath) === '') {
 			return $this->removeMount($mount, $absolutePath);
 		}
@@ -995,7 +995,7 @@ 
 				$hooks[] = 'write';
 				break;
 			default:
-				\OCP\Util::writeLog('core', 'invalid mode (' . $mode . ') for ' . $path, ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'invalid mode ('.$mode.') for '.$path, ILogger::ERROR);
 		}
 
 		if ($mode !== 'r' && $mode !== 'w') {
@@ -1099,7 +1099,7 @@ 
 					[Filesystem::signal_param_path => $this->getHookPath($path)]
 				);
 			}
-			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
+			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath.$postFix);
 			if ($storage) {
 				return $storage->hash($type, $internalPath, $raw);
 			}
@@ -1153,7 +1153,7 @@ 
 
 			$run = $this->runHooks($hooks, $path);
 			/** @var \OC\Files\Storage\Storage $storage */
-			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath . $postFix);
+			[$storage, $internalPath] = Filesystem::resolvePath($absolutePath.$postFix);
 			if ($run and $storage) {
 				if (in_array('write', $hooks) || in_array('delete', $hooks)) {
 					try {
@@ -1198,7 +1198,7 @@ 
 					$unlockLater = true;
 					// make sure our unlocking callback will still be called if connection is aborted
 					ignore_user_abort(true);
-					$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
+					$result = CallbackWrapper::wrap($result, null, null, function() use ($hooks, $path) {
 						if (in_array('write', $hooks)) {
 							$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
 						} elseif (in_array('read', $hooks)) {
@@ -1259,7 +1259,7 @@ 
 			return true;
 		}
 
-		return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
+		return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot.'/');
 	}
 
 	/**
@@ -1278,7 +1278,7 @@ 
 				if ($hook != 'read') {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
-						$prefix . $hook,
+						$prefix.$hook,
 						[
 							Filesystem::signal_param_run => &$run,
 							Filesystem::signal_param_path => $path
@@ -1287,7 +1287,7 @@ 
 				} elseif (!$post) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
-						$prefix . $hook,
+						$prefix.$hook,
 						[
 							Filesystem::signal_param_path => $path
 						]
@@ -1380,7 +1380,7 @@ 
 			return $this->getPartFileInfo($path);
 		}
 		$relativePath = $path;
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+		$path = Filesystem::normalizePath($this->fakeRoot.'/'.$path);
 
 		$mount = Filesystem::getMountManager()->find($path);
 		$storage = $mount->getStorage();
@@ -1408,7 +1408,7 @@ 
 					//add the sizes of other mount points to the folder
 					$extOnly = ($includeMountPoints === 'ext');
 					$mounts = Filesystem::getMountManager()->findIn($path);
-					$info->setSubMounts(array_filter($mounts, function (IMountPoint $mount) use ($extOnly) {
+					$info->setSubMounts(array_filter($mounts, function(IMountPoint $mount) use ($extOnly) {
 						$subStorage = $mount->getStorage();
 						return !($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage);
 					}));
@@ -1417,7 +1417,7 @@ 
 
 			return $info;
 		} else {
-			\OC::$server->getLogger()->warning('Storage not valid for mountpoint: ' . $mount->getMountPoint());
+			\OC::$server->getLogger()->warning('Storage not valid for mountpoint: '.$mount->getMountPoint());
 		}
 
 		return false;
@@ -1458,18 +1458,18 @@ 
 
 			$sharingDisabled = \OCP\Util::isSharingDisabledForUser();
 
-			$fileNames = array_map(function (ICacheEntry $content) {
+			$fileNames = array_map(function(ICacheEntry $content) {
 				return $content->getName();
 			}, $contents);
 			/**
 			 * @var \OC\Files\FileInfo[] $fileInfos
 			 */
-			$fileInfos = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
+			$fileInfos = array_map(function(ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
 				if ($sharingDisabled) {
 					$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 				}
 				$owner = $this->getUserObjectForOwner($storage->getOwner($content['path']));
-				return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner);
+				return new FileInfo($path.'/'.$content['name'], $storage, $content['path'], $content, $mount, $owner);
 			}, $contents);
 			$files = array_combine($fileNames, $fileInfos);
 
@@ -1494,7 +1494,7 @@ 
 						} catch (\Exception $e) {
 							// sometimes when the storage is not available it can be any exception
 							\OC::$server->getLogger()->logException($e, [
-								'message' => 'Exception while scanning storage "' . $subStorage->getId() . '"',
+								'message' => 'Exception while scanning storage "'.$subStorage->getId().'"',
 								'level' => ILogger::ERROR,
 								'app' => 'lib',
 							]);
@@ -1525,7 +1525,7 @@ 
 								$rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
 							}
 
-							$rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/
+							$rootEntry['path'] = substr(Filesystem::normalizePath($path.'/'.$rootEntry['name']), strlen($user) + 2); // full path without /$user/
 
 							// if sharing was disabled for the user we remove the share permissions
 							if (\OCP\Util::isSharingDisabledForUser()) {
@@ -1533,14 +1533,14 @@ 
 							}
 
 							$owner = $this->getUserObjectForOwner($subStorage->getOwner(''));
-							$files[$rootEntry->getName()] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
+							$files[$rootEntry->getName()] = new FileInfo($path.'/'.$rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
 						}
 					}
 				}
 			}
 
 			if ($mimetype_filter) {
-				$files = array_filter($files, function (FileInfo $file) use ($mimetype_filter) {
+				$files = array_filter($files, function(FileInfo $file) use ($mimetype_filter) {
 					if (strpos($mimetype_filter, '/')) {
 						return $file->getMimetype() === $mimetype_filter;
 					} else {
@@ -1569,7 +1569,7 @@ 
 		if ($data instanceof FileInfo) {
 			$data = $data->getData();
 		}
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+		$path = Filesystem::normalizePath($this->fakeRoot.'/'.$path);
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
 		 * @var string $internalPath
@@ -1596,7 +1596,7 @@ 
 	 * @return FileInfo[]
 	 */
 	public function search($query) {
-		return $this->searchCommon('search', ['%' . $query . '%']);
+		return $this->searchCommon('search', ['%'.$query.'%']);
 	}
 
 	/**
@@ -1648,10 +1648,10 @@ 
 
 			$results = call_user_func_array([$cache, $method], $args);
 			foreach ($results as $result) {
-				if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
+				if (substr($mountPoint.$result['path'], 0, $rootLength + 1) === $this->fakeRoot.'/') {
 					$internalPath = $result['path'];
-					$path = $mountPoint . $result['path'];
-					$result['path'] = substr($mountPoint . $result['path'], $rootLength);
+					$path = $mountPoint.$result['path'];
+					$result['path'] = substr($mountPoint.$result['path'], $rootLength);
 					$owner = $userManager->get($storage->getOwner($internalPath));
 					$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
 				}
@@ -1669,8 +1669,8 @@ 
 					if ($results) {
 						foreach ($results as $result) {
 							$internalPath = $result['path'];
-							$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
-							$path = rtrim($mountPoint . $internalPath, '/');
+							$result['path'] = rtrim($relativeMountPoint.$result['path'], '/');
+							$path = rtrim($mountPoint.$internalPath, '/');
 							$owner = $userManager->get($storage->getOwner($internalPath));
 							$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
 						}
@@ -1691,11 +1691,11 @@ 
 	public function getOwner($path) {
 		$info = $this->getFileInfo($path);
 		if (!$info) {
-			throw new NotFoundException($path . ' not found while trying to get owner');
+			throw new NotFoundException($path.' not found while trying to get owner');
 		}
 
 		if ($info->getOwner() === null) {
-			throw new NotFoundException($path . ' has no owner');
+			throw new NotFoundException($path.' has no owner');
 		}
 
 		return $info->getOwner()->getUID();
@@ -1731,7 +1731,7 @@ 
 	 * @throws NotFoundException
 	 */
 	public function getPath($id, int $storageId = null) {
-		$id = (int)$id;
+		$id = (int) $id;
 		$manager = Filesystem::getMountManager();
 		$mounts = $manager->findIn($this->fakeRoot);
 		$mounts[] = $manager->find($this->fakeRoot);
@@ -1742,12 +1742,12 @@ 
 
 		// put non-shared mounts in front of the shared mount
 		// this prevents unneeded recursion into shares
-		usort($mounts, function (IMountPoint $a, IMountPoint $b) {
+		usort($mounts, function(IMountPoint $a, IMountPoint $b) {
 			return $a instanceof SharedMount && (!$b instanceof SharedMount) ? 1 : -1;
 		});
 
 		if (!is_null($storageId)) {
-			$mounts = array_filter($mounts, function (IMountPoint $mount) use ($storageId) {
+			$mounts = array_filter($mounts, function(IMountPoint $mount) use ($storageId) {
 				return $mount->getNumericStorageId() === $storageId;
 			});
 		}
@@ -1760,7 +1760,7 @@ 
 				$cache = $mount->getStorage()->getCache();
 				$internalPath = $cache->getPathById($id);
 				if (is_string($internalPath)) {
-					$fullPath = $mount->getMountPoint() . $internalPath;
+					$fullPath = $mount->getMountPoint().$internalPath;
 					if (!is_null($path = $this->getRelativePath($fullPath))) {
 						return $path;
 					}
@@ -1796,10 +1796,10 @@ 
 	private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) {
 
 		// note: cannot use the view because the target is already locked
-		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
+		$fileId = (int) $targetStorage->getCache()->getId($targetInternalPath);
 		if ($fileId === -1) {
 			// target might not exist, need to check parent instead
-			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
+			$fileId = (int) $targetStorage->getCache()->getId(dirname($targetInternalPath));
 		}
 
 		// check if any of the parents were shared by the current owner (include collections)
@@ -1899,7 +1899,7 @@ 
 		$resultPath = '';
 		foreach ($parts as $part) {
 			if ($part) {
-				$resultPath .= '/' . $part;
+				$resultPath .= '/'.$part;
 				$result[] = $resultPath;
 			}
 		}
@@ -2164,16 +2164,16 @@ 
 	public function getUidAndFilename($filename) {
 		$info = $this->getFileInfo($filename);
 		if (!$info instanceof \OCP\Files\FileInfo) {
-			throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
+			throw new NotFoundException($this->getAbsolutePath($filename).' not found');
 		}
 		$uid = $info->getOwner()->getUID();
 		if ($uid != \OC_User::getUser()) {
 			Filesystem::initMountPoints($uid);
-			$ownerView = new View('/' . $uid . '/files');
+			$ownerView = new View('/'.$uid.'/files');
 			try {
 				$filename = $ownerView->getPath($info['fileid']);
 			} catch (NotFoundException $e) {
-				throw new NotFoundException('File with id ' . $info['fileid'] . ' not found for user ' . $uid);
+				throw new NotFoundException('File with id '.$info['fileid'].' not found for user '.$uid);
 			}
 		}
 		return [$uid, $filename];
@@ -2190,7 +2190,7 @@ 
 		$directoryParts = array_filter($directoryParts);
 		foreach ($directoryParts as $key => $part) {
 			$currentPathElements = array_slice($directoryParts, 0, $key);
-			$currentPath = '/' . implode('/', $currentPathElements);
+			$currentPath = '/'.implode('/', $currentPathElements);
 			if ($this->is_file($currentPath)) {
 				return false;
 			}