nextcloud / server

lib/private/Files/Config/UserMountCache.php

Indentation +535 added lines, -535 removed lines

@@ -32,539 +32,539 @@
  */
 class UserMountCache implements IUserMountCache {
 
-	/**
-	 * Cached mount info.
-	 * @var CappedMemoryCache<ICachedMountInfo[]>
-	 **/
-	private CappedMemoryCache $mountsForUsers;
-	/**
-	 * fileid => internal path mapping for cached mount info.
-	 * @var CappedMemoryCache<string>
-	 **/
-	private CappedMemoryCache $internalPathCache;
-	/** @var CappedMemoryCache<array> */
-	private CappedMemoryCache $cacheInfoCache;
-
-	/**
-	 * UserMountCache constructor.
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-		private IEventLogger $eventLogger,
-		private IEventDispatcher $eventDispatcher,
-	) {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->internalPathCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null) {
-		$this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
-		/** @var array<string, ICachedMountInfo> $newMounts */
-		$newMounts = [];
-		foreach ($mounts as $mount) {
-			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
-			if ($mount->getStorageRootId() !== -1) {
-				$mountInfo = new LazyStorageMountInfo($user, $mount);
-				$newMounts[$mountInfo->getKey()] = $mountInfo;
-			}
-		}
-
-		$cachedMounts = $this->getMountsForUser($user);
-		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
-				// for existing mounts that didn't have a mount provider set
-				// we still want the ones that map to new mounts
-				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {
-					return true;
-				}
-				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
-			});
-		}
-
-		$addedMounts = [];
-		$removedMounts = [];
-
-		foreach ($newMounts as $mountKey => $newMount) {
-			if (!isset($cachedMounts[$mountKey])) {
-				$addedMounts[] = $newMount;
-			}
-		}
-
-		foreach ($cachedMounts as $mountKey => $cachedMount) {
-			if (!isset($newMounts[$mountKey])) {
-				$removedMounts[] = $cachedMount;
-			}
-		}
-
-		$changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
-
-		if ($addedMounts || $removedMounts || $changedMounts) {
-			$this->connection->beginTransaction();
-			$userUID = $user->getUID();
-			try {
-				foreach ($addedMounts as $mount) {
-					$this->logger->debug("Adding mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
-					$this->addToCache($mount);
-					/** @psalm-suppress InvalidArgument */
-					$this->mountsForUsers[$userUID][$mount->getKey()] = $mount;
-				}
-				foreach ($removedMounts as $mount) {
-					$this->logger->debug("Removing mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
-					$this->removeFromCache($mount);
-					unset($this->mountsForUsers[$userUID][$mount->getKey()]);
-				}
-				foreach ($changedMounts as $mountPair) {
-					$newMount = $mountPair[1];
-					$this->logger->debug("Updating mount '{$newMount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $newMount->getMountProvider()]);
-					$this->updateCachedMount($newMount);
-					/** @psalm-suppress InvalidArgument */
-					$this->mountsForUsers[$userUID][$newMount->getKey()] = $newMount;
-				}
-				$this->connection->commit();
-			} catch (\Throwable $e) {
-				$this->connection->rollBack();
-				throw $e;
-			}
-
-			// Only fire events after all mounts have already been adjusted in the database.
-			foreach ($addedMounts as $mount) {
-				$this->eventDispatcher->dispatchTyped(new UserMountAddedEvent($mount));
-			}
-			foreach ($removedMounts as $mount) {
-				$this->eventDispatcher->dispatchTyped(new UserMountRemovedEvent($mount));
-			}
-			foreach ($changedMounts as $mountPair) {
-				$this->eventDispatcher->dispatchTyped(new UserMountUpdatedEvent($mountPair[0], $mountPair[1]));
-			}
-		}
-		$this->eventLogger->end('fs:setup:user:register');
-	}
-
-	/**
-	 * @param array<string, ICachedMountInfo> $newMounts
-	 * @param array<string, ICachedMountInfo> $cachedMounts
-	 * @return list<list{0: ICachedMountInfo, 1: ICachedMountInfo}> Pairs of old and new mounts
-	 */
-	private function findChangedMounts(array $newMounts, array $cachedMounts): array {
-		$changed = [];
-		foreach ($cachedMounts as $key => $cachedMount) {
-			if (isset($newMounts[$key])) {
-				$newMount = $newMounts[$key];
-				if (
-					$newMount->getStorageId() !== $cachedMount->getStorageId()
-					|| $newMount->getMountId() !== $cachedMount->getMountId()
-					|| $newMount->getMountProvider() !== $cachedMount->getMountProvider()
-				) {
-					$changed[] = [$cachedMount, $newMount];
-				}
-			}
-		}
-		return $changed;
-	}
-
-	private function addToCache(ICachedMountInfo $mount) {
-		if ($mount->getStorageId() !== -1) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb
-				->insert('mounts')
-				->values([
-					'storage_id' => $qb->createNamedParameter($mount->getStorageId(), IQueryBuilder::PARAM_INT),
-					'root_id' => $qb->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT),
-					'user_id' => $qb->createNamedParameter($mount->getUser()->getUID()),
-					'mount_point' => $qb->createNamedParameter($mount->getMountPoint()),
-					'mount_point_hash' => $qb->createNamedParameter(hash('xxh128', $mount->getMountPoint())),
-					'mount_id' => $qb->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT),
-					'mount_provider_class' => $qb->createNamedParameter($mount->getMountProvider()),
-				]);
-			try {
-				$qb->executeStatement();
-			} catch (Exception $e) {
-				if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-			}
-		} else {
-			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
-		}
-	}
-
-	private function updateCachedMount(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('mounts')
-			->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
-			->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
-			->set('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint())))
-			->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
-			->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	private function removeFromCache(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint()))));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param array $row
-	 * @param (callable(CachedMountInfo): string)|null $pathCallback
-	 * @return CachedMountInfo
-	 */
-	private function dbRowToMountInfo(array $row, ?callable $pathCallback = null): ICachedMountInfo {
-		$user = new LazyUser($row['user_id'], $this->userManager);
-		$mount_id = $row['mount_id'];
-		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
-		}
-		if ($pathCallback) {
-			return new LazyPathCachedMountInfo(
-				$user,
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_provider_class'] ?? '',
-				$mount_id,
-				$pathCallback,
-			);
-		} else {
-			return new CachedMountInfo(
-				$user,
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_provider_class'] ?? '',
-				$mount_id,
-				$row['path'] ?? '',
-			);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return ICachedMountInfo[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		$userUID = $user->getUID();
-		if (!$this->userManager->userExists($userUID)) {
-			return [];
-		}
-		if (!isset($this->mountsForUsers[$userUID])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'mount_provider_class')
-				->from('mounts', 'm')
-				->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID)));
-
-			$result = $query->executeQuery();
-			$rows = $result->fetchAll();
-			$result->closeCursor();
-
-			/** @var array<string, ICachedMountInfo> $mounts */
-			$mounts = [];
-			foreach ($rows as $row) {
-				$mount = $this->dbRowToMountInfo($row, [$this, 'getInternalPathForMountInfo']);
-				if ($mount !== null) {
-					$mounts[$mount->getKey()] = $mount;
-				}
-			}
-			$this->mountsForUsers[$userUID] = $mounts;
-		}
-		return $this->mountsForUsers[$userUID];
-	}
-
-	public function getInternalPathForMountInfo(CachedMountInfo $info): string {
-		$cached = $this->internalPathCache->get($info->getRootId());
-		if ($cached !== null) {
-			return $cached;
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('path')
-			->from('filecache')
-			->where($builder->expr()->eq('fileid', $builder->createNamedParameter($info->getRootId())));
-		return $query->executeQuery()->fetchOne() ?: '';
-	}
-
-	/**
-	 * @param int $numericStorageId
-	 * @param string|null $user limit the results to a single user
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForStorageId($numericStorageId, $user = null) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
-
-		if ($user) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
-		}
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param int $rootFileId
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForRootId($rootFileId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT)));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param $fileId
-	 * @return array{int, string, int}
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function getCacheInfoFromFileId($fileId): array {
-		if (!isset($this->cacheInfoCache[$fileId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage', 'path', 'mimetype')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-
-			$result = $query->executeQuery();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			if (is_array($row)) {
-				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
-				];
-			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
-			}
-		}
-		return $this->cacheInfoCache[$fileId];
-	}
-
-	/**
-	 * @param int $fileId
-	 * @param string|null $user optionally restrict the results to a single user
-	 * @return ICachedMountFileInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForFileId($fileId, $user = null) {
-		try {
-			[$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
-		} catch (NotFoundException $e) {
-			return [];
-		}
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere(
-				$builder->expr()->orX(
-					$builder->expr()->eq('f.fileid', $builder->createNamedParameter($fileId)),
-					$builder->expr()->emptyString('f.path'),
-					$builder->expr()->eq(
-						$builder->func()->concat('f.path', $builder->createNamedParameter('/')),
-						$builder->func()->substring(
-							$builder->createNamedParameter($internalPath),
-							$builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
-							$builder->func()->add(
-								$builder->func()->charLength('f.path'),
-								$builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
-							),
-						),
-					),
-				)
-			);
-
-		if ($user !== null) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
-		}
-		$result = $query->executeQuery();
-
-		$mounts = [];
-		while ($row = $result->fetch()) {
-			if ($user === null && !$this->userManager->userExists($row['user_id'])) {
-				continue;
-			}
-
-			$mounts[] = new CachedMountFileInfo(
-				new LazyUser($row['user_id'], $this->userManager),
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_id'] === null ? null : (int)$row['mount_id'],
-				$row['mount_provider_class'] ?? '',
-				$row['path'] ?? '',
-				$internalPath,
-			);
-		}
-
-		return $mounts;
-	}
-
-	/**
-	 * Remove all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 */
-	public function removeUserMounts(IUser $user) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
-		$query->executeStatement();
-	}
-
-	public function removeUserStorageMount($storageId, $userId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
-			->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	public function remoteStorageMounts($storageId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param array $users
-	 * @return array
-	 */
-	public function getUsedSpaceForUsers(array $users) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$mountPointHashes = array_map(static fn (IUser $user) => hash('xxh128', '/' . $user->getUID() . '/'), $users);
-		$userIds = array_map(static fn (IUser $user) => $user->getUID(), $users);
-
-		$query = $builder->select('m.user_id', 'f.size')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f',
-				$builder->expr()->andX(
-					$builder->expr()->eq('m.storage_id', 'f.storage'),
-					$builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
-				))
-			->where($builder->expr()->in('m.mount_point_hash', $builder->createNamedParameter($mountPointHashes, IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$result = $query->executeQuery();
-
-		$results = [];
-		while ($row = $result->fetch()) {
-			$results[$row['user_id']] = $row['size'];
-		}
-		$result->closeCursor();
-		return $results;
-	}
-
-	public function clear(): void {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
-		$mounts = [];
-		foreach ($this->getMountsForUser($user) as $mount) {
-			$mounts[$mount->getMountPoint()] = $mount;
-		}
-
-		$current = rtrim($path, '/');
-		// walk up the directory tree until we find a path that has a mountpoint set
-		// the loop will return if a mountpoint is found or break if none are found
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($mounts[$mountPoint])) {
-				return $mounts[$mountPoint];
-			} elseif ($current === '') {
-				break;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-
-		throw new NotFoundException('No cached mount for path ' . $path);
-	}
-
-	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
-		$result = [];
-		foreach ($this->getMountsForUser($user) as $key => $mount) {
-			$mountPoint = $mount->getMountPoint();
-			if ($mountPoint !== $path && str_starts_with($mountPoint, $path)) {
-				$result[$key] = $mount;
-			}
-		}
-		return $result;
-	}
-
-	public function removeMount(string $mountPoint): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('mounts')
-			->where($query->expr()->eq('mount_point', $query->createNamedParameter($mountPoint)));
-		$query->executeStatement();
-	}
-
-	public function addMount(IUser $user, string $mountPoint, ICacheEntry $rootCacheEntry, string $mountProvider, ?int $mountId = null): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('mounts')
-			->values([
-				'storage_id' => $query->createNamedParameter($rootCacheEntry->getStorageId()),
-				'root_id' => $query->createNamedParameter($rootCacheEntry->getId()),
-				'user_id' => $query->createNamedParameter($user->getUID()),
-				'mount_point' => $query->createNamedParameter($mountPoint),
-				'mount_point_hash' => $query->createNamedParameter(hash('xxh128', $mountPoint)),
-				'mount_id' => $query->createNamedParameter($mountId),
-				'mount_provider_class' => $query->createNamedParameter($mountProvider)
-			]);
-
-		try {
-			$query->executeStatement();
-		} catch (DbalException $e) {
-			if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-		}
-	}
-
-	/**
-	 * Clear the internal in-memory caches
-	 */
-	public function flush(): void {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->internalPathCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
+    /**
+     * Cached mount info.
+     * @var CappedMemoryCache<ICachedMountInfo[]>
+     **/
+    private CappedMemoryCache $mountsForUsers;
+    /**
+     * fileid => internal path mapping for cached mount info.
+     * @var CappedMemoryCache<string>
+     **/
+    private CappedMemoryCache $internalPathCache;
+    /** @var CappedMemoryCache<array> */
+    private CappedMemoryCache $cacheInfoCache;
+
+    /**
+     * UserMountCache constructor.
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+        private IEventLogger $eventLogger,
+        private IEventDispatcher $eventDispatcher,
+    ) {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->internalPathCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null) {
+        $this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
+        /** @var array<string, ICachedMountInfo> $newMounts */
+        $newMounts = [];
+        foreach ($mounts as $mount) {
+            // filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
+            if ($mount->getStorageRootId() !== -1) {
+                $mountInfo = new LazyStorageMountInfo($user, $mount);
+                $newMounts[$mountInfo->getKey()] = $mountInfo;
+            }
+        }
+
+        $cachedMounts = $this->getMountsForUser($user);
+        if (is_array($mountProviderClasses)) {
+            $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+                // for existing mounts that didn't have a mount provider set
+                // we still want the ones that map to new mounts
+                if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {
+                    return true;
+                }
+                return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
+            });
+        }
+
+        $addedMounts = [];
+        $removedMounts = [];
+
+        foreach ($newMounts as $mountKey => $newMount) {
+            if (!isset($cachedMounts[$mountKey])) {
+                $addedMounts[] = $newMount;
+            }
+        }
+
+        foreach ($cachedMounts as $mountKey => $cachedMount) {
+            if (!isset($newMounts[$mountKey])) {
+                $removedMounts[] = $cachedMount;
+            }
+        }
+
+        $changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
+
+        if ($addedMounts || $removedMounts || $changedMounts) {
+            $this->connection->beginTransaction();
+            $userUID = $user->getUID();
+            try {
+                foreach ($addedMounts as $mount) {
+                    $this->logger->debug("Adding mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
+                    $this->addToCache($mount);
+                    /** @psalm-suppress InvalidArgument */
+                    $this->mountsForUsers[$userUID][$mount->getKey()] = $mount;
+                }
+                foreach ($removedMounts as $mount) {
+                    $this->logger->debug("Removing mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
+                    $this->removeFromCache($mount);
+                    unset($this->mountsForUsers[$userUID][$mount->getKey()]);
+                }
+                foreach ($changedMounts as $mountPair) {
+                    $newMount = $mountPair[1];
+                    $this->logger->debug("Updating mount '{$newMount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $newMount->getMountProvider()]);
+                    $this->updateCachedMount($newMount);
+                    /** @psalm-suppress InvalidArgument */
+                    $this->mountsForUsers[$userUID][$newMount->getKey()] = $newMount;
+                }
+                $this->connection->commit();
+            } catch (\Throwable $e) {
+                $this->connection->rollBack();
+                throw $e;
+            }
+
+            // Only fire events after all mounts have already been adjusted in the database.
+            foreach ($addedMounts as $mount) {
+                $this->eventDispatcher->dispatchTyped(new UserMountAddedEvent($mount));
+            }
+            foreach ($removedMounts as $mount) {
+                $this->eventDispatcher->dispatchTyped(new UserMountRemovedEvent($mount));
+            }
+            foreach ($changedMounts as $mountPair) {
+                $this->eventDispatcher->dispatchTyped(new UserMountUpdatedEvent($mountPair[0], $mountPair[1]));
+            }
+        }
+        $this->eventLogger->end('fs:setup:user:register');
+    }
+
+    /**
+     * @param array<string, ICachedMountInfo> $newMounts
+     * @param array<string, ICachedMountInfo> $cachedMounts
+     * @return list<list{0: ICachedMountInfo, 1: ICachedMountInfo}> Pairs of old and new mounts
+     */
+    private function findChangedMounts(array $newMounts, array $cachedMounts): array {
+        $changed = [];
+        foreach ($cachedMounts as $key => $cachedMount) {
+            if (isset($newMounts[$key])) {
+                $newMount = $newMounts[$key];
+                if (
+                    $newMount->getStorageId() !== $cachedMount->getStorageId()
+                    || $newMount->getMountId() !== $cachedMount->getMountId()
+                    || $newMount->getMountProvider() !== $cachedMount->getMountProvider()
+                ) {
+                    $changed[] = [$cachedMount, $newMount];
+                }
+            }
+        }
+        return $changed;
+    }
+
+    private function addToCache(ICachedMountInfo $mount) {
+        if ($mount->getStorageId() !== -1) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb
+                ->insert('mounts')
+                ->values([
+                    'storage_id' => $qb->createNamedParameter($mount->getStorageId(), IQueryBuilder::PARAM_INT),
+                    'root_id' => $qb->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT),
+                    'user_id' => $qb->createNamedParameter($mount->getUser()->getUID()),
+                    'mount_point' => $qb->createNamedParameter($mount->getMountPoint()),
+                    'mount_point_hash' => $qb->createNamedParameter(hash('xxh128', $mount->getMountPoint())),
+                    'mount_id' => $qb->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT),
+                    'mount_provider_class' => $qb->createNamedParameter($mount->getMountProvider()),
+                ]);
+            try {
+                $qb->executeStatement();
+            } catch (Exception $e) {
+                if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    throw $e;
+                }
+            }
+        } else {
+            // in some cases this is legitimate, like orphaned shares
+            $this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+        }
+    }
+
+    private function updateCachedMount(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('mounts')
+            ->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
+            ->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
+            ->set('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint())))
+            ->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
+            ->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    private function removeFromCache(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint()))));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param array $row
+     * @param (callable(CachedMountInfo): string)|null $pathCallback
+     * @return CachedMountInfo
+     */
+    private function dbRowToMountInfo(array $row, ?callable $pathCallback = null): ICachedMountInfo {
+        $user = new LazyUser($row['user_id'], $this->userManager);
+        $mount_id = $row['mount_id'];
+        if (!is_null($mount_id)) {
+            $mount_id = (int)$mount_id;
+        }
+        if ($pathCallback) {
+            return new LazyPathCachedMountInfo(
+                $user,
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_provider_class'] ?? '',
+                $mount_id,
+                $pathCallback,
+            );
+        } else {
+            return new CachedMountInfo(
+                $user,
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_provider_class'] ?? '',
+                $mount_id,
+                $row['path'] ?? '',
+            );
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return ICachedMountInfo[]
+     */
+    public function getMountsForUser(IUser $user) {
+        $userUID = $user->getUID();
+        if (!$this->userManager->userExists($userUID)) {
+            return [];
+        }
+        if (!isset($this->mountsForUsers[$userUID])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'mount_provider_class')
+                ->from('mounts', 'm')
+                ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID)));
+
+            $result = $query->executeQuery();
+            $rows = $result->fetchAll();
+            $result->closeCursor();
+
+            /** @var array<string, ICachedMountInfo> $mounts */
+            $mounts = [];
+            foreach ($rows as $row) {
+                $mount = $this->dbRowToMountInfo($row, [$this, 'getInternalPathForMountInfo']);
+                if ($mount !== null) {
+                    $mounts[$mount->getKey()] = $mount;
+                }
+            }
+            $this->mountsForUsers[$userUID] = $mounts;
+        }
+        return $this->mountsForUsers[$userUID];
+    }
+
+    public function getInternalPathForMountInfo(CachedMountInfo $info): string {
+        $cached = $this->internalPathCache->get($info->getRootId());
+        if ($cached !== null) {
+            return $cached;
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('path')
+            ->from('filecache')
+            ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($info->getRootId())));
+        return $query->executeQuery()->fetchOne() ?: '';
+    }
+
+    /**
+     * @param int $numericStorageId
+     * @param string|null $user limit the results to a single user
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForStorageId($numericStorageId, $user = null) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
+
+        if ($user) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
+        }
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param int $rootFileId
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForRootId($rootFileId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT)));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param $fileId
+     * @return array{int, string, int}
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function getCacheInfoFromFileId($fileId): array {
+        if (!isset($this->cacheInfoCache[$fileId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage', 'path', 'mimetype')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+
+            $result = $query->executeQuery();
+            $row = $result->fetch();
+            $result->closeCursor();
+
+            if (is_array($row)) {
+                $this->cacheInfoCache[$fileId] = [
+                    (int)$row['storage'],
+                    (string)$row['path'],
+                    (int)$row['mimetype']
+                ];
+            } else {
+                throw new NotFoundException('File with id "' . $fileId . '" not found');
+            }
+        }
+        return $this->cacheInfoCache[$fileId];
+    }
+
+    /**
+     * @param int $fileId
+     * @param string|null $user optionally restrict the results to a single user
+     * @return ICachedMountFileInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForFileId($fileId, $user = null) {
+        try {
+            [$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
+        } catch (NotFoundException $e) {
+            return [];
+        }
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere(
+                $builder->expr()->orX(
+                    $builder->expr()->eq('f.fileid', $builder->createNamedParameter($fileId)),
+                    $builder->expr()->emptyString('f.path'),
+                    $builder->expr()->eq(
+                        $builder->func()->concat('f.path', $builder->createNamedParameter('/')),
+                        $builder->func()->substring(
+                            $builder->createNamedParameter($internalPath),
+                            $builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
+                            $builder->func()->add(
+                                $builder->func()->charLength('f.path'),
+                                $builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
+                            ),
+                        ),
+                    ),
+                )
+            );
+
+        if ($user !== null) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
+        }
+        $result = $query->executeQuery();
+
+        $mounts = [];
+        while ($row = $result->fetch()) {
+            if ($user === null && !$this->userManager->userExists($row['user_id'])) {
+                continue;
+            }
+
+            $mounts[] = new CachedMountFileInfo(
+                new LazyUser($row['user_id'], $this->userManager),
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_id'] === null ? null : (int)$row['mount_id'],
+                $row['mount_provider_class'] ?? '',
+                $row['path'] ?? '',
+                $internalPath,
+            );
+        }
+
+        return $mounts;
+    }
+
+    /**
+     * Remove all cached mounts for a user
+     *
+     * @param IUser $user
+     */
+    public function removeUserMounts(IUser $user) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
+        $query->executeStatement();
+    }
+
+    public function removeUserStorageMount($storageId, $userId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
+            ->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    public function remoteStorageMounts($storageId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param array $users
+     * @return array
+     */
+    public function getUsedSpaceForUsers(array $users) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $mountPointHashes = array_map(static fn (IUser $user) => hash('xxh128', '/' . $user->getUID() . '/'), $users);
+        $userIds = array_map(static fn (IUser $user) => $user->getUID(), $users);
+
+        $query = $builder->select('m.user_id', 'f.size')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f',
+                $builder->expr()->andX(
+                    $builder->expr()->eq('m.storage_id', 'f.storage'),
+                    $builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
+                ))
+            ->where($builder->expr()->in('m.mount_point_hash', $builder->createNamedParameter($mountPointHashes, IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $result = $query->executeQuery();
+
+        $results = [];
+        while ($row = $result->fetch()) {
+            $results[$row['user_id']] = $row['size'];
+        }
+        $result->closeCursor();
+        return $results;
+    }
+
+    public function clear(): void {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
+        $mounts = [];
+        foreach ($this->getMountsForUser($user) as $mount) {
+            $mounts[$mount->getMountPoint()] = $mount;
+        }
+
+        $current = rtrim($path, '/');
+        // walk up the directory tree until we find a path that has a mountpoint set
+        // the loop will return if a mountpoint is found or break if none are found
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($mounts[$mountPoint])) {
+                return $mounts[$mountPoint];
+            } elseif ($current === '') {
+                break;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+
+        throw new NotFoundException('No cached mount for path ' . $path);
+    }
+
+    public function getMountsInPath(IUser $user, string $path): array {
+        $path = rtrim($path, '/') . '/';
+        $result = [];
+        foreach ($this->getMountsForUser($user) as $key => $mount) {
+            $mountPoint = $mount->getMountPoint();
+            if ($mountPoint !== $path && str_starts_with($mountPoint, $path)) {
+                $result[$key] = $mount;
+            }
+        }
+        return $result;
+    }
+
+    public function removeMount(string $mountPoint): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('mounts')
+            ->where($query->expr()->eq('mount_point', $query->createNamedParameter($mountPoint)));
+        $query->executeStatement();
+    }
+
+    public function addMount(IUser $user, string $mountPoint, ICacheEntry $rootCacheEntry, string $mountProvider, ?int $mountId = null): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('mounts')
+            ->values([
+                'storage_id' => $query->createNamedParameter($rootCacheEntry->getStorageId()),
+                'root_id' => $query->createNamedParameter($rootCacheEntry->getId()),
+                'user_id' => $query->createNamedParameter($user->getUID()),
+                'mount_point' => $query->createNamedParameter($mountPoint),
+                'mount_point_hash' => $query->createNamedParameter(hash('xxh128', $mountPoint)),
+                'mount_id' => $query->createNamedParameter($mountId),
+                'mount_provider_class' => $query->createNamedParameter($mountProvider)
+            ]);
+
+        try {
+            $query->executeStatement();
+        } catch (DbalException $e) {
+            if ($e->getReason() !== DbalException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+        }
+    }
+
+    /**
+     * Clear the internal in-memory caches
+     */
+    public function flush(): void {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->internalPathCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
 }

apps/files_versions/tests/VersioningTest.php

Indentation +870 added lines, -870 removed lines

@@ -37,962 +37,962 @@
  */
 #[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
 class VersioningTest extends \Test\TestCase {
-	public const TEST_VERSIONS_USER = 'test-versions-user';
-	public const TEST_VERSIONS_USER2 = 'test-versions-user2';
-	public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
-
-	/**
-	 * @var View
-	 */
-	private $rootView;
-	/**
-	 * @var VersionsMapper
-	 */
-	private $versionsMapper;
-	/**
-	 * @var IMimeTypeLoader
-	 */
-	private $mimeTypeLoader;
-	private $user1;
-	private $user2;
-
-	public static function setUpBeforeClass(): void {
-		parent::setUpBeforeClass();
-
-		$application = new Application();
-
-		// create test user
-		self::loginHelper(self::TEST_VERSIONS_USER2, true);
-		self::loginHelper(self::TEST_VERSIONS_USER, true);
-	}
-
-	public static function tearDownAfterClass(): void {
-		// cleanup test user
-		$user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER);
-		if ($user !== null) {
-			$user->delete();
-		}
-		$user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER2);
-		if ($user !== null) {
-			$user->delete();
-		}
-
-		parent::tearDownAfterClass();
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$config = Server::get(IConfig::class);
-		$mockConfig = $this->getMockBuilder(AllConfig::class)
-			->onlyMethods(['getSystemValue'])
-			->setConstructorArgs([Server::get(SystemConfig::class)])
-			->getMock();
-		$mockConfig->expects($this->any())
-			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
-				if ($key === 'filesystem_check_changes') {
-					return Watcher::CHECK_ONCE;
-				} else {
-					return $config->getSystemValue($key, $default);
-				}
-			});
-		$this->overwriteService(AllConfig::class, $mockConfig);
-
-		// clear hooks
-		\OC_Hook::clear();
-		\OC::registerShareHooks(Server::get(SystemConfig::class));
-		\OC::$server->boot();
-
-		// ensure both users have an up-to-date state
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-		self::loginHelper(self::TEST_VERSIONS_USER);
-		$this->rootView = new View();
-		if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
-			$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
-		}
-
-		$this->versionsMapper = Server::get(VersionsMapper::class);
-		$this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
-
-		$this->user1 = $this->createMock(IUser::class);
-		$this->user1->method('getUID')
-			->willReturn(self::TEST_VERSIONS_USER);
-		$this->user2 = $this->createMock(IUser::class);
-		$this->user2->method('getUID')
-			->willReturn(self::TEST_VERSIONS_USER2);
-	}
-
-	protected function tearDown(): void {
-		$this->restoreService(AllConfig::class);
-
-		if ($this->rootView) {
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
-		}
-
-		\OC_Hook::clear();
-
-		parent::tearDown();
-	}
-
-	/**
-	 * test expire logic
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'versionsProvider')]
-	public function testGetExpireList($versions, $sizeOfAllDeletedFiles): void {
-
-		// last interval end at 2592000
-		$startTime = 5000000;
-
-		$testClass = new VersionStorageToTest();
-		[$deleted, $size] = $testClass->callProtectedGetExpireList($startTime, $versions);
-
-		// we should have deleted 16 files each of the size 1
-		$this->assertEquals($sizeOfAllDeletedFiles, $size);
-
-		// the deleted array should only contain versions which should be deleted
-		foreach ($deleted as $key => $path) {
-			unset($versions[$key]);
-			$this->assertEquals('delete', substr($path, 0, strlen('delete')));
-		}
-
-		// the versions array should only contain versions which should be kept
-		foreach ($versions as $version) {
-			$this->assertEquals('keep', $version['path']);
-		}
-	}
-
-	public static function versionsProvider(): array {
-		return [
-			// first set of versions uniformly distributed versions
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					['version' => 4999999, 'path' => 'keep', 'size' => 1],
-					['version' => 4999998, 'path' => 'delete', 'size' => 1],
-					['version' => 4999997, 'path' => 'keep', 'size' => 1],
-					['version' => 4999995, 'path' => 'keep', 'size' => 1],
-					['version' => 4999994, 'path' => 'delete', 'size' => 1],
-					//next slice (60sec) starts at 4999990 keep one version every 10 secons
-					['version' => 4999988, 'path' => 'keep', 'size' => 1],
-					['version' => 4999978, 'path' => 'keep', 'size' => 1],
-					['version' => 4999975, 'path' => 'delete', 'size' => 1],
-					['version' => 4999972, 'path' => 'delete', 'size' => 1],
-					['version' => 4999967, 'path' => 'keep', 'size' => 1],
-					['version' => 4999958, 'path' => 'delete', 'size' => 1],
-					['version' => 4999957, 'path' => 'keep', 'size' => 1],
-					//next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					['version' => 4999900, 'path' => 'keep', 'size' => 1],
-					['version' => 4999841, 'path' => 'delete', 'size' => 1],
-					['version' => 4999840, 'path' => 'keep', 'size' => 1],
-					['version' => 4999780, 'path' => 'keep', 'size' => 1],
-					['version' => 4996401, 'path' => 'keep', 'size' => 1],
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4992800, 'path' => 'keep', 'size' => 1],
-					['version' => 4989800, 'path' => 'delete', 'size' => 1],
-					['version' => 4989700, 'path' => 'delete', 'size' => 1],
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				16 // size of all deleted files (every file has the size 1)
-			],
-			// second set of versions, here we have only really old versions
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					// next slice (60sec) starts at 4999990 keep one version every 10 secons
-					// next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4996400, 'path' => 'keep', 'size' => 1],
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4992800, 'path' => 'keep', 'size' => 1],
-					['version' => 4989800, 'path' => 'delete', 'size' => 1],
-					['version' => 4989700, 'path' => 'delete', 'size' => 1],
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				11 // size of all deleted files (every file has the size 1)
-			],
-			// third set of versions, with some gaps between
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					['version' => 4999999, 'path' => 'keep', 'size' => 1],
-					['version' => 4999998, 'path' => 'delete', 'size' => 1],
-					['version' => 4999997, 'path' => 'keep', 'size' => 1],
-					['version' => 4999995, 'path' => 'keep', 'size' => 1],
-					['version' => 4999994, 'path' => 'delete', 'size' => 1],
-					//next slice (60sec) starts at 4999990 keep one version every 10 secons
-					['version' => 4999988, 'path' => 'keep', 'size' => 1],
-					['version' => 4999978, 'path' => 'keep', 'size' => 1],
-					//next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				9 // size of all deleted files (every file has the size 1)
-			],
-			// fourth set of versions: empty (see issue #19066)
-			[
-				[],
-				0
-			]
-
-		];
-	}
-
-	public function testRename(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
-
-		// execute rename hook of versions app
-		Filesystem::rename('test.txt', 'test2.txt');
-
-		$this->runCommands();
-
-		$this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
-		$this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
-
-		$this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
-	}
-
-	public function testRenameInSharedFolder(): void {
-		Filesystem::mkdir('folder1');
-		Filesystem::mkdir('folder1/folder2');
-		Filesystem::file_put_contents('folder1/test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
-
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-
-		$this->assertTrue(Filesystem::file_exists('folder1/test.txt'));
-
-		// execute rename hook of versions app
-		Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
-
-		$this->runCommands();
-
-		self::loginHelper(self::TEST_VERSIONS_USER);
-
-		$this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
-		$this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
-
-		$this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
-
-	public function testMoveFolder(): void {
-		Filesystem::mkdir('folder1');
-		Filesystem::mkdir('folder2');
-		Filesystem::file_put_contents('folder1/test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
+    public const TEST_VERSIONS_USER = 'test-versions-user';
+    public const TEST_VERSIONS_USER2 = 'test-versions-user2';
+    public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
+
+    /**
+     * @var View
+     */
+    private $rootView;
+    /**
+     * @var VersionsMapper
+     */
+    private $versionsMapper;
+    /**
+     * @var IMimeTypeLoader
+     */
+    private $mimeTypeLoader;
+    private $user1;
+    private $user2;
+
+    public static function setUpBeforeClass(): void {
+        parent::setUpBeforeClass();
+
+        $application = new Application();
+
+        // create test user
+        self::loginHelper(self::TEST_VERSIONS_USER2, true);
+        self::loginHelper(self::TEST_VERSIONS_USER, true);
+    }
+
+    public static function tearDownAfterClass(): void {
+        // cleanup test user
+        $user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER);
+        if ($user !== null) {
+            $user->delete();
+        }
+        $user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER2);
+        if ($user !== null) {
+            $user->delete();
+        }
+
+        parent::tearDownAfterClass();
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $config = Server::get(IConfig::class);
+        $mockConfig = $this->getMockBuilder(AllConfig::class)
+            ->onlyMethods(['getSystemValue'])
+            ->setConstructorArgs([Server::get(SystemConfig::class)])
+            ->getMock();
+        $mockConfig->expects($this->any())
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) use ($config) {
+                if ($key === 'filesystem_check_changes') {
+                    return Watcher::CHECK_ONCE;
+                } else {
+                    return $config->getSystemValue($key, $default);
+                }
+            });
+        $this->overwriteService(AllConfig::class, $mockConfig);
+
+        // clear hooks
+        \OC_Hook::clear();
+        \OC::registerShareHooks(Server::get(SystemConfig::class));
+        \OC::$server->boot();
+
+        // ensure both users have an up-to-date state
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+        self::loginHelper(self::TEST_VERSIONS_USER);
+        $this->rootView = new View();
+        if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
+            $this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
+        }
+
+        $this->versionsMapper = Server::get(VersionsMapper::class);
+        $this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
+
+        $this->user1 = $this->createMock(IUser::class);
+        $this->user1->method('getUID')
+            ->willReturn(self::TEST_VERSIONS_USER);
+        $this->user2 = $this->createMock(IUser::class);
+        $this->user2->method('getUID')
+            ->willReturn(self::TEST_VERSIONS_USER2);
+    }
+
+    protected function tearDown(): void {
+        $this->restoreService(AllConfig::class);
+
+        if ($this->rootView) {
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
+        }
+
+        \OC_Hook::clear();
+
+        parent::tearDown();
+    }
+
+    /**
+     * test expire logic
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'versionsProvider')]
+    public function testGetExpireList($versions, $sizeOfAllDeletedFiles): void {
+
+        // last interval end at 2592000
+        $startTime = 5000000;
+
+        $testClass = new VersionStorageToTest();
+        [$deleted, $size] = $testClass->callProtectedGetExpireList($startTime, $versions);
+
+        // we should have deleted 16 files each of the size 1
+        $this->assertEquals($sizeOfAllDeletedFiles, $size);
+
+        // the deleted array should only contain versions which should be deleted
+        foreach ($deleted as $key => $path) {
+            unset($versions[$key]);
+            $this->assertEquals('delete', substr($path, 0, strlen('delete')));
+        }
+
+        // the versions array should only contain versions which should be kept
+        foreach ($versions as $version) {
+            $this->assertEquals('keep', $version['path']);
+        }
+    }
+
+    public static function versionsProvider(): array {
+        return [
+            // first set of versions uniformly distributed versions
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    ['version' => 4999999, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999998, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999997, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999995, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999994, 'path' => 'delete', 'size' => 1],
+                    //next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    ['version' => 4999988, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999978, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999975, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999972, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999967, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999958, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999957, 'path' => 'keep', 'size' => 1],
+                    //next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    ['version' => 4999900, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999841, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999840, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999780, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4996401, 'path' => 'keep', 'size' => 1],
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4992800, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4989800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989700, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                16 // size of all deleted files (every file has the size 1)
+            ],
+            // second set of versions, here we have only really old versions
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    // next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    // next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4996400, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4992800, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4989800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989700, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                11 // size of all deleted files (every file has the size 1)
+            ],
+            // third set of versions, with some gaps between
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    ['version' => 4999999, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999998, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999997, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999995, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999994, 'path' => 'delete', 'size' => 1],
+                    //next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    ['version' => 4999988, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999978, 'path' => 'keep', 'size' => 1],
+                    //next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                9 // size of all deleted files (every file has the size 1)
+            ],
+            // fourth set of versions: empty (see issue #19066)
+            [
+                [],
+                0
+            ]
+
+        ];
+    }
+
+    public function testRename(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
+
+        // execute rename hook of versions app
+        Filesystem::rename('test.txt', 'test2.txt');
+
+        $this->runCommands();
+
+        $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+        $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
+
+        $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
+    }
+
+    public function testRenameInSharedFolder(): void {
+        Filesystem::mkdir('folder1');
+        Filesystem::mkdir('folder1/folder2');
+        Filesystem::file_put_contents('folder1/test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
+
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+
+        $this->assertTrue(Filesystem::file_exists('folder1/test.txt'));
+
+        // execute rename hook of versions app
+        Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
+
+        $this->runCommands();
+
+        self::loginHelper(self::TEST_VERSIONS_USER);
+
+        $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+        $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
+
+        $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
+
+    public function testMoveFolder(): void {
+        Filesystem::mkdir('folder1');
+        Filesystem::mkdir('folder2');
+        Filesystem::file_put_contents('folder1/test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+        $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute rename hook of versions app
-		Filesystem::rename('folder1', 'folder2/folder1');
+        // execute rename hook of versions app
+        Filesystem::rename('folder1', 'folder2/folder1');
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
-	}
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
+    }
 
 
-	public function testMoveFileIntoSharedFolderAsRecipient(): void {
-		Filesystem::mkdir('folder1');
-		$fileInfo = Filesystem::getFileInfo('folder1');
+    public function testMoveFileIntoSharedFolderAsRecipient(): void {
+        Filesystem::mkdir('folder1');
+        $fileInfo = Filesystem::getFileInfo('folder1');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		Filesystem::file_put_contents('test.txt', 'test file');
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+        $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir($versionsFolder2);
-		// create some versions
-		$v1 = $versionsFolder2 . '/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/test.txt.v' . $t2;
+        $this->rootView->mkdir($versionsFolder2);
+        // create some versions
+        $v1 = $versionsFolder2 . '/test.txt.v' . $t1;
+        $v2 = $versionsFolder2 . '/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// move file into the shared folder as recipient
-		$success = Filesystem::rename('/test.txt', '/folder1/test.txt');
+        // move file into the shared folder as recipient
+        $success = Filesystem::rename('/test.txt', '/folder1/test.txt');
 
-		$this->assertTrue($success);
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertTrue($success);
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+        $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
+        $v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testMoveFolderIntoSharedFolderAsRecipient(): void {
-		Filesystem::mkdir('folder1');
+    public function testMoveFolderIntoSharedFolderAsRecipient(): void {
+        Filesystem::mkdir('folder1');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		Filesystem::mkdir('folder2');
-		Filesystem::file_put_contents('folder2/test.txt', 'test file');
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+        $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+        Filesystem::mkdir('folder2');
+        Filesystem::file_put_contents('folder2/test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir($versionsFolder2);
-		$this->rootView->mkdir($versionsFolder2 . '/folder2');
-		// create some versions
-		$v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
+        $this->rootView->mkdir($versionsFolder2);
+        $this->rootView->mkdir($versionsFolder2 . '/folder2');
+        // create some versions
+        $v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
+        $v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// move file into the shared folder as recipient
-		Filesystem::rename('/folder2', '/folder1/folder2');
+        // move file into the shared folder as recipient
+        Filesystem::rename('/folder2', '/folder1/folder2');
 
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+        $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
+        $v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
+        $v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testRenameSharedFile(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
+    public function testRenameSharedFile(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		// the renamed versions should not exist! Because we only moved the mount point!
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        // the renamed versions should not exist! Because we only moved the mount point!
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('test.txt');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_SHARE);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('test.txt');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_SHARE);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
+        self::loginHelper(self::TEST_VERSIONS_USER2);
 
-		$this->assertTrue(Filesystem::file_exists('test.txt'));
+        $this->assertTrue(Filesystem::file_exists('test.txt'));
 
-		// execute rename hook of versions app
-		Filesystem::rename('test.txt', 'test2.txt');
+        // execute rename hook of versions app
+        Filesystem::rename('test.txt', 'test2.txt');
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertTrue($this->rootView->file_exists($v1));
-		$this->assertTrue($this->rootView->file_exists($v2));
+        $this->assertTrue($this->rootView->file_exists($v1));
+        $this->assertTrue($this->rootView->file_exists($v2));
 
-		$this->assertFalse($this->rootView->file_exists($v1Renamed));
-		$this->assertFalse($this->rootView->file_exists($v2Renamed));
+        $this->assertFalse($this->rootView->file_exists($v1Renamed));
+        $this->assertFalse($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testCopy(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
+    public function testCopy(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        $v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute copy hook of versions app
-		Filesystem::copy('test.txt', 'test2.txt');
+        // execute copy hook of versions app
+        Filesystem::copy('test.txt', 'test2.txt');
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertTrue($this->rootView->file_exists($v1), 'version 1 of original file exists');
-		$this->assertTrue($this->rootView->file_exists($v2), 'version 2 of original file exists');
+        $this->assertTrue($this->rootView->file_exists($v1), 'version 1 of original file exists');
+        $this->assertTrue($this->rootView->file_exists($v2), 'version 2 of original file exists');
 
-		$this->assertTrue($this->rootView->file_exists($v1Copied), 'version 1 of copied file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Copied), 'version 2 of copied file exists');
-	}
+        $this->assertTrue($this->rootView->file_exists($v1Copied), 'version 1 of copied file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Copied), 'version 2 of copied file exists');
+    }
 
-	/**
-	 * test if we find all versions and if the versions array contain
-	 * the correct 'path' and 'name'
-	 */
-	public function testGetVersions(): void {
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+    /**
+     * test if we find all versions and if the versions array contain
+     * the correct 'path' and 'name'
+     */
+    public function testGetVersions(): void {
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute copy hook of versions app
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
+        // execute copy hook of versions app
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
 
-		$this->assertCount(2, $versions);
+        $this->assertCount(2, $versions);
 
-		foreach ($versions as $version) {
-			$this->assertSame('/subfolder/test.txt', $version['path']);
-			$this->assertSame('test.txt', $version['name']);
-		}
+        foreach ($versions as $version) {
+            $this->assertSame('/subfolder/test.txt', $version['path']);
+            $this->assertSame('test.txt', $version['name']);
+        }
 
-		//cleanup
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
-	}
+        //cleanup
+        $this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
+    }
 
-	/**
-	 * test if we find all versions and if the versions array contain
-	 * the correct 'path' and 'name'
-	 */
-	public function testGetVersionsEmptyFile(): void {
-		// execute copy hook of versions app
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '');
-		$this->assertCount(0, $versions);
+    /**
+     * test if we find all versions and if the versions array contain
+     * the correct 'path' and 'name'
+     */
+    public function testGetVersionsEmptyFile(): void {
+        // execute copy hook of versions app
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, '');
+        $this->assertCount(0, $versions);
 
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, null);
-		$this->assertCount(0, $versions);
-	}
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, null);
+        $this->assertCount(0, $versions);
+    }
 
-	public function testExpireNonexistingFile(): void {
-		$this->logout();
-		// needed to have a FS setup (the background job does this)
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
+    public function testExpireNonexistingFile(): void {
+        $this->logout();
+        // needed to have a FS setup (the background job does this)
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$this->assertFalse(Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
-	}
+        $this->assertFalse(Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
+    }
 
 
-	public function testExpireNonexistingUser(): void {
-		$this->expectException(NoUserException::class);
+    public function testExpireNonexistingUser(): void {
+        $this->expectException(NoUserException::class);
 
-		$this->logout();
-		// needed to have a FS setup (the background job does this)
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
-		Filesystem::file_put_contents('test.txt', 'test file');
+        $this->logout();
+        // needed to have a FS setup (the background job does this)
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$this->assertFalse(Storage::expire('test.txt', 'unexist'));
-	}
+        $this->assertFalse(Storage::expire('test.txt', 'unexist'));
+    }
 
-	public function testRestoreSameStorage(): void {
-		Filesystem::mkdir('sub');
-		$this->doTestRestore();
-	}
+    public function testRestoreSameStorage(): void {
+        Filesystem::mkdir('sub');
+        $this->doTestRestore();
+    }
 
-	public function testRestoreCrossStorage(): void {
-		$storage2 = new Temporary([]);
-		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
+    public function testRestoreCrossStorage(): void {
+        $storage2 = new Temporary([]);
+        Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
 
-		$this->doTestRestore();
-	}
+        $this->doTestRestore();
+    }
 
-	public function testRestoreNoPermission(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
+    public function testRestoreNoPermission(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
 
-		$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
-		$node = $userHome->newFolder('folder');
-		$file = $node->newFile('test.txt');
+        $userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
+        $node = $userHome->newFolder('folder');
+        $file = $node->newFile('test.txt');
 
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_READ);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$versions = $this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		$file->putContent('test file');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_READ);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $versions = $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        $file->putContent('test file');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
 
-		$firstVersion = current($versions);
+        $firstVersion = current($versions);
 
-		$this->assertFalse(Storage::rollback('folder/test.txt', (int)$firstVersion['version'], $this->user2), 'Revert did not happen');
+        $this->assertFalse(Storage::rollback('folder/test.txt', (int)$firstVersion['version'], $this->user2), 'Revert did not happen');
 
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-		$this->assertEquals('test file', $file->getContent(), 'File content has not changed');
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+        $this->assertEquals('test file', $file->getContent(), 'File content has not changed');
+    }
 
-	public function testRestoreMovedShare(): void {
-		$this->markTestSkipped('Unreliable test');
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
-		$node = $userHome->newFolder('folder');
-		$file = $node->newFile('test.txt');
-
-		$userHome2 = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER2);
-		$userHome2->newFolder('subfolder');
-
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$share->setTarget('subfolder/folder');
-		$shareManager->moveShare($share, self::TEST_VERSIONS_USER2);
-
-		$versions = $this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		$file->putContent('test file');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
-
-		$firstVersion = current($versions);
-
-		$this->assertTrue(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-		$this->assertEquals('version 2', $file->getContent(), 'File content has not changed');
-	}
-
-	/**
-	 * @param string $hookName name of hook called
-	 * @param string $params variable to receive parameters provided by hook
-	 */
-	private function connectMockHooks($hookName, &$params) {
-		if ($hookName === null) {
-			return;
-		}
-
-		$eventHandler = $this->getMockBuilder(DummyHookListener::class)
-			->onlyMethods(['callback'])
-			->getMock();
-
-		$eventHandler->expects($this->any())
-			->method('callback')
-			->willReturnCallback(
-				function ($p) use (&$params): void {
-					$params = $p;
-				}
-			);
-
-		Util::connectHook(
-			'\OCP\Versions',
-			$hookName,
-			$eventHandler,
-			'callback'
-		);
-	}
-
-	private function doTestRestore(): void {
-		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
-		$this->rootView->file_put_contents($filePath, 'test file');
-
-		$fileInfo = $this->rootView->getFileInfo($filePath);
-		$t0 = $this->rootView->filemtime($filePath);
-
-		// not exactly the same timestamp as the file
-		$t1 = time() - 60;
-		// second version is two weeks older
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
-
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$fileInfoV1 = $this->rootView->getFileInfo($v1);
-		$versionEntity = new VersionEntity();
-		$versionEntity->setFileId($fileInfo->getId());
-		$versionEntity->setTimestamp($t1);
-		$versionEntity->setSize($fileInfoV1->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV1->getMimetype()));
-		$versionEntity->setMetadata([]);
-		$this->versionsMapper->insert($versionEntity);
-
-		$this->rootView->file_put_contents($v2, 'version2');
-		$fileInfoV2 = $this->rootView->getFileInfo($v2);
-		$versionEntity = new VersionEntity();
-		$versionEntity->setFileId($fileInfo->getId());
-		$versionEntity->setTimestamp($t2);
-		$versionEntity->setSize($fileInfoV2->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV2->getMimetype()));
-		$versionEntity->setMetadata([]);
-		$this->versionsMapper->insert($versionEntity);
-
-		$oldVersions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/sub/test.txt'
-		);
-
-		$this->assertCount(2, $oldVersions);
-
-		$this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
-		$info1 = $this->rootView->getFileInfo($filePath);
-
-		$eventDispatcher = Server::get(IEventDispatcher::class);
-		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2): void {
-			$eventFired = true;
-			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
-			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
-		});
-
-		$versionManager = Server::get(IVersionManager::class);
-		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
-		$version = array_filter($versions, function ($version) use ($t2) {
-			return $version->getRevisionId() === $t2;
-		});
-		$this->assertTrue($versionManager->rollback(current($version)));
-
-		$this->assertTrue($eventFired, 'VersionRestoredEvent was not fired');
-
-		$this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
-		$info2 = $this->rootView->getFileInfo($filePath);
-
-		$this->assertNotEquals(
-			$info2['etag'],
-			$info1['etag'],
-			'Etag must change after rolling back version'
-		);
-		$this->assertEquals(
-			$info2['fileid'],
-			$info1['fileid'],
-			'File id must not change after rolling back version'
-		);
-		$this->assertEquals(
-			$info2['mtime'],
-			$t2,
-			'Restored file has mtime from version'
-		);
-
-		$newVersions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/sub/test.txt'
-		);
-
-		$this->assertTrue(
-			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
-			'A version file was created for the file before restoration'
-		);
-		$this->assertTrue(
-			$this->rootView->file_exists($v1),
-			'Untouched version file is still there'
-		);
-		$this->assertFalse(
-			$this->rootView->file_exists($v2),
-			'Restored version file gone from files_version folder'
-		);
-
-		$this->assertCount(2, $newVersions, 'Additional version created');
-
-		$this->assertTrue(
-			isset($newVersions[$t0 . '#' . 'test.txt']),
-			'A version was created for the file before restoration'
-		);
-		$this->assertTrue(
-			isset($newVersions[$t1 . '#' . 'test.txt']),
-			'Untouched version is still there'
-		);
-		$this->assertFalse(
-			isset($newVersions[$t2 . '#' . 'test.txt']),
-			'Restored version is not in the list any more'
-		);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting as owner
-	 */
-	public function testStoreVersionAsOwner(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		$this->createAndCheckVersions(
-			Filesystem::getView(),
-			'test.txt'
-		);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting as share recipient
-	 */
-	public function testStoreVersionAsRecipient(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		Filesystem::mkdir('folder');
-		Filesystem::file_put_contents('folder/test.txt', 'test file');
-
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
-
-		$this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting anonymously.
-	 *
-	 * When uploading through a public link or publicwebdav, no user
-	 * is logged in. File modification must still be able to find
-	 * the owner and create versions.
-	 */
-	public function testStoreVersionAsAnonymous(): void {
-		$this->logout();
-
-		// note: public link upload does this,
-		// needed to make the hooks fire
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
-
-		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
-		$this->createAndCheckVersions(
-			$userView,
-			'test.txt'
-		);
-	}
-
-	private function createAndCheckVersions(View $view, string $path): array {
-		$view->file_put_contents($path, 'test file');
-		$view->file_put_contents($path, 'version 1');
-		$view->file_put_contents($path, 'version 2');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		// need to scan for the versions
-		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
-		$rootStorage->getScanner()->scan('files_versions');
-
-		$versions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/' . $path
-		);
-
-		// note: we cannot predict how many versions are created due to
-		// test run timing
-		$this->assertGreaterThan(0, count($versions));
-
-		return $versions;
-	}
-
-	public static function loginHelper(string $user, bool $create = false) {
-		if ($create) {
-			$backend = new \Test\Util\User\Dummy();
-			$backend->createUser($user, $user);
-			Server::get(IUserManager::class)->registerBackend($backend);
-		}
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		Filesystem::tearDown();
-		\OC_User::setUserId($user);
-		\OC_Util::setupFS($user);
-		\OC::$server->getUserFolder($user);
-	}
+    public function testRestoreMovedShare(): void {
+        $this->markTestSkipped('Unreliable test');
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        $userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
+        $node = $userHome->newFolder('folder');
+        $file = $node->newFile('test.txt');
+
+        $userHome2 = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER2);
+        $userHome2->newFolder('subfolder');
+
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $share->setTarget('subfolder/folder');
+        $shareManager->moveShare($share, self::TEST_VERSIONS_USER2);
+
+        $versions = $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        $file->putContent('test file');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
+
+        $firstVersion = current($versions);
+
+        $this->assertTrue(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+        $this->assertEquals('version 2', $file->getContent(), 'File content has not changed');
+    }
+
+    /**
+     * @param string $hookName name of hook called
+     * @param string $params variable to receive parameters provided by hook
+     */
+    private function connectMockHooks($hookName, &$params) {
+        if ($hookName === null) {
+            return;
+        }
+
+        $eventHandler = $this->getMockBuilder(DummyHookListener::class)
+            ->onlyMethods(['callback'])
+            ->getMock();
+
+        $eventHandler->expects($this->any())
+            ->method('callback')
+            ->willReturnCallback(
+                function ($p) use (&$params): void {
+                    $params = $p;
+                }
+            );
+
+        Util::connectHook(
+            '\OCP\Versions',
+            $hookName,
+            $eventHandler,
+            'callback'
+        );
+    }
+
+    private function doTestRestore(): void {
+        $filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
+        $this->rootView->file_put_contents($filePath, 'test file');
+
+        $fileInfo = $this->rootView->getFileInfo($filePath);
+        $t0 = $this->rootView->filemtime($filePath);
+
+        // not exactly the same timestamp as the file
+        $t1 = time() - 60;
+        // second version is two weeks older
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
+
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $fileInfoV1 = $this->rootView->getFileInfo($v1);
+        $versionEntity = new VersionEntity();
+        $versionEntity->setFileId($fileInfo->getId());
+        $versionEntity->setTimestamp($t1);
+        $versionEntity->setSize($fileInfoV1->getSize());
+        $versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV1->getMimetype()));
+        $versionEntity->setMetadata([]);
+        $this->versionsMapper->insert($versionEntity);
+
+        $this->rootView->file_put_contents($v2, 'version2');
+        $fileInfoV2 = $this->rootView->getFileInfo($v2);
+        $versionEntity = new VersionEntity();
+        $versionEntity->setFileId($fileInfo->getId());
+        $versionEntity->setTimestamp($t2);
+        $versionEntity->setSize($fileInfoV2->getSize());
+        $versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV2->getMimetype()));
+        $versionEntity->setMetadata([]);
+        $this->versionsMapper->insert($versionEntity);
+
+        $oldVersions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/sub/test.txt'
+        );
+
+        $this->assertCount(2, $oldVersions);
+
+        $this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
+        $info1 = $this->rootView->getFileInfo($filePath);
+
+        $eventDispatcher = Server::get(IEventDispatcher::class);
+        $eventFired = false;
+        $eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2): void {
+            $eventFired = true;
+            $this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
+            $this->assertTrue($event->getVersion()->getRevisionId() > 0);
+        });
+
+        $versionManager = Server::get(IVersionManager::class);
+        $versions = $versionManager->getVersionsForFile($this->user1, $info1);
+        $version = array_filter($versions, function ($version) use ($t2) {
+            return $version->getRevisionId() === $t2;
+        });
+        $this->assertTrue($versionManager->rollback(current($version)));
+
+        $this->assertTrue($eventFired, 'VersionRestoredEvent was not fired');
+
+        $this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
+        $info2 = $this->rootView->getFileInfo($filePath);
+
+        $this->assertNotEquals(
+            $info2['etag'],
+            $info1['etag'],
+            'Etag must change after rolling back version'
+        );
+        $this->assertEquals(
+            $info2['fileid'],
+            $info1['fileid'],
+            'File id must not change after rolling back version'
+        );
+        $this->assertEquals(
+            $info2['mtime'],
+            $t2,
+            'Restored file has mtime from version'
+        );
+
+        $newVersions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/sub/test.txt'
+        );
+
+        $this->assertTrue(
+            $this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
+            'A version file was created for the file before restoration'
+        );
+        $this->assertTrue(
+            $this->rootView->file_exists($v1),
+            'Untouched version file is still there'
+        );
+        $this->assertFalse(
+            $this->rootView->file_exists($v2),
+            'Restored version file gone from files_version folder'
+        );
+
+        $this->assertCount(2, $newVersions, 'Additional version created');
+
+        $this->assertTrue(
+            isset($newVersions[$t0 . '#' . 'test.txt']),
+            'A version was created for the file before restoration'
+        );
+        $this->assertTrue(
+            isset($newVersions[$t1 . '#' . 'test.txt']),
+            'Untouched version is still there'
+        );
+        $this->assertFalse(
+            isset($newVersions[$t2 . '#' . 'test.txt']),
+            'Restored version is not in the list any more'
+        );
+    }
+
+    /**
+     * Test whether versions are created when overwriting as owner
+     */
+    public function testStoreVersionAsOwner(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'test.txt'
+        );
+    }
+
+    /**
+     * Test whether versions are created when overwriting as share recipient
+     */
+    public function testStoreVersionAsRecipient(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        Filesystem::mkdir('folder');
+        Filesystem::file_put_contents('folder/test.txt', 'test file');
+
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
+
+        $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
+
+    /**
+     * Test whether versions are created when overwriting anonymously.
+     *
+     * When uploading through a public link or publicwebdav, no user
+     * is logged in. File modification must still be able to find
+     * the owner and create versions.
+     */
+    public function testStoreVersionAsAnonymous(): void {
+        $this->logout();
+
+        // note: public link upload does this,
+        // needed to make the hooks fire
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
+
+        $userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
+        $this->createAndCheckVersions(
+            $userView,
+            'test.txt'
+        );
+    }
+
+    private function createAndCheckVersions(View $view, string $path): array {
+        $view->file_put_contents($path, 'test file');
+        $view->file_put_contents($path, 'version 1');
+        $view->file_put_contents($path, 'version 2');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        // need to scan for the versions
+        [$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
+        $rootStorage->getScanner()->scan('files_versions');
+
+        $versions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/' . $path
+        );
+
+        // note: we cannot predict how many versions are created due to
+        // test run timing
+        $this->assertGreaterThan(0, count($versions));
+
+        return $versions;
+    }
+
+    public static function loginHelper(string $user, bool $create = false) {
+        if ($create) {
+            $backend = new \Test\Util\User\Dummy();
+            $backend->createUser($user, $user);
+            Server::get(IUserManager::class)->registerBackend($backend);
+        }
+
+        \OC_Util::tearDownFS();
+        \OC_User::setUserId('');
+        Filesystem::tearDown();
+        \OC_User::setUserId($user);
+        \OC_Util::setupFS($user);
+        \OC::$server->getUserFolder($user);
+    }
 }
 
 class DummyHookListener {
-	public function callback() {
-	}
+    public function callback() {
+    }
 }
 
 // extend the original class to make it possible to test protected methods
 class VersionStorageToTest extends Storage {
 
-	/**
-	 * @param integer $time
-	 */
-	public function callProtectedGetExpireList($time, $versions) {
-		return self::getExpireList($time, $versions);
-	}
+    /**
+     * @param integer $time
+     */
+    public function callProtectedGetExpireList($time, $versions) {
+        return self::getExpireList($time, $versions);
+    }
 }

apps/files_sharing/lib/AppInfo/Application.php

Indentation +103 added lines, -103 removed lines

@@ -64,107 +64,107 @@
 use Symfony\Component\EventDispatcher\GenericEvent as OldGenericEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'files_sharing';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		$context->registerService(ExternalMountProvider::class, function (ContainerInterface $c) {
-			return new ExternalMountProvider(
-				$c->get(IDBConnection::class),
-				function () use ($c) {
-					return $c->get(Manager::class);
-				},
-				$c->get(ICloudIdManager::class)
-			);
-		});
-
-		/**
-		 * Middleware
-		 */
-		$context->registerMiddleWare(SharingCheckMiddleware::class);
-		$context->registerMiddleWare(OCSShareAPIMiddleware::class);
-		$context->registerMiddleWare(ShareInfoMiddleware::class);
-
-		$context->registerCapability(Capabilities::class);
-
-		$context->registerNotifierService(Notifier::class);
-		$context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
-		$context->registerEventListener(UserDeletedEvent::class, DisplayNameCache::class);
-		$context->registerEventListener(GroupChangedEvent::class, GroupDisplayNameCache::class);
-		$context->registerEventListener(GroupDeletedEvent::class, GroupDisplayNameCache::class);
-
-		// Sidebar and files scripts
-		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
-		$context->registerEventListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$context->registerEventListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
-		$context->registerEventListener(UserAddedEvent::class, UserAddedToGroupListener::class);
-
-		// Publish activity for public download
-		$context->registerEventListener(BeforeNodeReadEvent::class, BeforeNodeReadListener::class);
-		$context->registerEventListener(BeforeZipCreatedEvent::class, BeforeNodeReadListener::class);
-
-		// Handle download events for view only checks. Priority higher than 0 to run early.
-		$context->registerEventListener(BeforeZipCreatedEvent::class, BeforeZipCreatedListener::class, 5);
-		$context->registerEventListener(BeforeDirectFileDownloadEvent::class, BeforeDirectFileDownloadListener::class, 5);
-
-		// File request auth
-		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadPublicFileRequestAuthListener::class);
-
-		// Update mounts
-		$context->registerEventListener(ShareCreatedEvent::class, SharesUpdatedListener::class);
-		$context->registerEventListener(BeforeShareDeletedEvent::class, SharesUpdatedListener::class);
-		$context->registerEventListener(UserAddedEvent::class, SharesUpdatedListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, SharesUpdatedListener::class);
-		$context->registerEventListener(UserShareAccessUpdatedEvent::class, SharesUpdatedListener::class);
-		$context->registerEventListener(FilesystemTornDownEvent::class, SharesUpdatedListener::class);
-
-		$context->registerConfigLexicon(ConfigLexicon::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn([$this, 'registerMountProviders']);
-		$context->injectFn([$this, 'registerEventsScripts']);
-
-		Helper::registerHooks();
-
-		Share::registerBackend('file', File::class);
-		Share::registerBackend('folder', Folder::class, 'file');
-	}
-
-
-	public function registerMountProviders(IMountProviderCollection $mountProviderCollection, MountProvider $mountProvider, ExternalMountProvider $externalMountProvider): void {
-		$mountProviderCollection->registerProvider($mountProvider);
-		$mountProviderCollection->registerProvider($externalMountProvider);
-	}
-
-	public function registerEventsScripts(IEventDispatcher $dispatcher): void {
-		$dispatcher->addListener(ResourcesLoadAdditionalScriptsEvent::class, function (): void {
-			Util::addScript('files_sharing', 'collaboration');
-		});
-		$dispatcher->addListener(BeforeTemplateRenderedEvent::class, function (): void {
-			/**
-			 * Always add main sharing script
-			 */
-			Util::addScript(self::APP_ID, 'main');
-		});
-
-		// notifications api to accept incoming user shares
-		$dispatcher->addListener(ShareCreatedEvent::class, function (ShareCreatedEvent $event): void {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->shareNotification($event);
-		});
-		$dispatcher->addListener(IGroup::class . '::postAddUser', function ($event): void {
-			if (!$event instanceof OldGenericEvent) {
-				return;
-			}
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->userAddedToGroup($event);
-		});
-	}
+    public const APP_ID = 'files_sharing';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        $context->registerService(ExternalMountProvider::class, function (ContainerInterface $c) {
+            return new ExternalMountProvider(
+                $c->get(IDBConnection::class),
+                function () use ($c) {
+                    return $c->get(Manager::class);
+                },
+                $c->get(ICloudIdManager::class)
+            );
+        });
+
+        /**
+         * Middleware
+         */
+        $context->registerMiddleWare(SharingCheckMiddleware::class);
+        $context->registerMiddleWare(OCSShareAPIMiddleware::class);
+        $context->registerMiddleWare(ShareInfoMiddleware::class);
+
+        $context->registerCapability(Capabilities::class);
+
+        $context->registerNotifierService(Notifier::class);
+        $context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
+        $context->registerEventListener(UserDeletedEvent::class, DisplayNameCache::class);
+        $context->registerEventListener(GroupChangedEvent::class, GroupDisplayNameCache::class);
+        $context->registerEventListener(GroupDeletedEvent::class, GroupDisplayNameCache::class);
+
+        // Sidebar and files scripts
+        $context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
+        $context->registerEventListener(ShareCreatedEvent::class, ShareInteractionListener::class);
+        $context->registerEventListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
+        $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupListener::class);
+
+        // Publish activity for public download
+        $context->registerEventListener(BeforeNodeReadEvent::class, BeforeNodeReadListener::class);
+        $context->registerEventListener(BeforeZipCreatedEvent::class, BeforeNodeReadListener::class);
+
+        // Handle download events for view only checks. Priority higher than 0 to run early.
+        $context->registerEventListener(BeforeZipCreatedEvent::class, BeforeZipCreatedListener::class, 5);
+        $context->registerEventListener(BeforeDirectFileDownloadEvent::class, BeforeDirectFileDownloadListener::class, 5);
+
+        // File request auth
+        $context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadPublicFileRequestAuthListener::class);
+
+        // Update mounts
+        $context->registerEventListener(ShareCreatedEvent::class, SharesUpdatedListener::class);
+        $context->registerEventListener(BeforeShareDeletedEvent::class, SharesUpdatedListener::class);
+        $context->registerEventListener(UserAddedEvent::class, SharesUpdatedListener::class);
+        $context->registerEventListener(UserRemovedEvent::class, SharesUpdatedListener::class);
+        $context->registerEventListener(UserShareAccessUpdatedEvent::class, SharesUpdatedListener::class);
+        $context->registerEventListener(FilesystemTornDownEvent::class, SharesUpdatedListener::class);
+
+        $context->registerConfigLexicon(ConfigLexicon::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        $context->injectFn([$this, 'registerMountProviders']);
+        $context->injectFn([$this, 'registerEventsScripts']);
+
+        Helper::registerHooks();
+
+        Share::registerBackend('file', File::class);
+        Share::registerBackend('folder', Folder::class, 'file');
+    }
+
+
+    public function registerMountProviders(IMountProviderCollection $mountProviderCollection, MountProvider $mountProvider, ExternalMountProvider $externalMountProvider): void {
+        $mountProviderCollection->registerProvider($mountProvider);
+        $mountProviderCollection->registerProvider($externalMountProvider);
+    }
+
+    public function registerEventsScripts(IEventDispatcher $dispatcher): void {
+        $dispatcher->addListener(ResourcesLoadAdditionalScriptsEvent::class, function (): void {
+            Util::addScript('files_sharing', 'collaboration');
+        });
+        $dispatcher->addListener(BeforeTemplateRenderedEvent::class, function (): void {
+            /**
+             * Always add main sharing script
+             */
+            Util::addScript(self::APP_ID, 'main');
+        });
+
+        // notifications api to accept incoming user shares
+        $dispatcher->addListener(ShareCreatedEvent::class, function (ShareCreatedEvent $event): void {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->shareNotification($event);
+        });
+        $dispatcher->addListener(IGroup::class . '::postAddUser', function ($event): void {
+            if (!$event instanceof OldGenericEvent) {
+                return;
+            }
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->userAddedToGroup($event);
+        });
+    }
 }

apps/files_sharing/lib/SharedMount.php

Indentation +165 added lines, -165 removed lines

@@ -25,169 +25,169 @@
  * Shared mount points can be moved by the user
  */
 class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint {
-	/**
-	 * @var SharedStorage $storage
-	 */
-	protected $storage = null;
-
-	/** @var IShare */
-	private $superShare;
-
-	/** @var IShare[] */
-	private $groupedShares;
-
-	public function __construct(
-		$storage,
-		$arguments,
-		IStorageFactory $loader,
-		private IEventDispatcher $eventDispatcher,
-		private IUser $user,
-	) {
-		$this->superShare = $arguments['superShare'];
-		$this->groupedShares = $arguments['groupedShares'];
-
-		$absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
-
-		parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param string $newPath
-	 * @param IShare $share
-	 * @return bool
-	 */
-	private function updateFileTarget($newPath, &$share) {
-		$share->setTarget($newPath);
-
-		foreach ($this->groupedShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			Server::get(\OCP\Share\IManager::class)->moveShare($tmpShare, $this->user->getUID());
-		}
-
-		$this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 *
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
-	 * @throws BrokenPath
-	 */
-	protected function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
-			throw new BrokenPath('Path does not start with /user/files', 10);
-		}
-
-		// skip 'user' and 'files'
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return '/' . $relPath;
-	}
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$relTargetPath = $this->stripUserFilesPath($target);
-		$share = $this->storage->getShare();
-
-		$result = true;
-
-		try {
-			$this->updateFileTarget($relTargetPath, $share);
-			$this->setMountPoint($target);
-			$this->storage->setMountPoint($relTargetPath);
-		} catch (\Exception $e) {
-			Server::get(LoggerInterface::class)->error(
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
-				[
-					'app' => 'files_sharing',
-					'exception' => $e,
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$mountManager = Filesystem::getMountManager();
-		/** @var SharedStorage $storage */
-		$storage = $this->getStorage();
-		$result = $storage->unshareStorage();
-		$mountManager->removeMount($this->mountPoint);
-
-		return $result;
-	}
-
-	/**
-	 * @return IShare
-	 */
-	public function getShare() {
-		return $this->superShare;
-	}
-
-	/**
-	 * @return IShare[]
-	 */
-	public function getGroupedShares(): array {
-		return $this->groupedShares;
-	}
-
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		return $this->getShare()->getNodeId();
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (!is_null($this->getShare()->getNodeCacheEntry())) {
-			return $this->getShare()->getNodeCacheEntry()->getStorageId();
-		} else {
-			$builder = Server::get(IDBConnection::class)->getQueryBuilder();
-
-			$query = $builder->select('storage')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
-
-			$result = $query->executeQuery();
-			$row = $result->fetchAssociative();
-			$result->closeCursor();
-			if ($row) {
-				return (int)$row['storage'];
-			}
-			return -1;
-		}
-	}
-
-	public function getMountType() {
-		return 'shared';
-	}
-
-	public function getUser(): IUser {
-		return $this->user;
-	}
+    /**
+     * @var SharedStorage $storage
+     */
+    protected $storage = null;
+
+    /** @var IShare */
+    private $superShare;
+
+    /** @var IShare[] */
+    private $groupedShares;
+
+    public function __construct(
+        $storage,
+        $arguments,
+        IStorageFactory $loader,
+        private IEventDispatcher $eventDispatcher,
+        private IUser $user,
+    ) {
+        $this->superShare = $arguments['superShare'];
+        $this->groupedShares = $arguments['groupedShares'];
+
+        $absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
+
+        parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param string $newPath
+     * @param IShare $share
+     * @return bool
+     */
+    private function updateFileTarget($newPath, &$share) {
+        $share->setTarget($newPath);
+
+        foreach ($this->groupedShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            Server::get(\OCP\Share\IManager::class)->moveShare($tmpShare, $this->user->getUID());
+        }
+
+        $this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     *
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
+     * @throws BrokenPath
+     */
+    protected function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+            throw new BrokenPath('Path does not start with /user/files', 10);
+        }
+
+        // skip 'user' and 'files'
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return '/' . $relPath;
+    }
+
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $relTargetPath = $this->stripUserFilesPath($target);
+        $share = $this->storage->getShare();
+
+        $result = true;
+
+        try {
+            $this->updateFileTarget($relTargetPath, $share);
+            $this->setMountPoint($target);
+            $this->storage->setMountPoint($relTargetPath);
+        } catch (\Exception $e) {
+            Server::get(LoggerInterface::class)->error(
+                'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+                [
+                    'app' => 'files_sharing',
+                    'exception' => $e,
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $mountManager = Filesystem::getMountManager();
+        /** @var SharedStorage $storage */
+        $storage = $this->getStorage();
+        $result = $storage->unshareStorage();
+        $mountManager->removeMount($this->mountPoint);
+
+        return $result;
+    }
+
+    /**
+     * @return IShare
+     */
+    public function getShare() {
+        return $this->superShare;
+    }
+
+    /**
+     * @return IShare[]
+     */
+    public function getGroupedShares(): array {
+        return $this->groupedShares;
+    }
+
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        return $this->getShare()->getNodeId();
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (!is_null($this->getShare()->getNodeCacheEntry())) {
+            return $this->getShare()->getNodeCacheEntry()->getStorageId();
+        } else {
+            $builder = Server::get(IDBConnection::class)->getQueryBuilder();
+
+            $query = $builder->select('storage')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
+
+            $result = $query->executeQuery();
+            $row = $result->fetchAssociative();
+            $result->closeCursor();
+            if ($row) {
+                return (int)$row['storage'];
+            }
+            return -1;
+        }
+    }
+
+    public function getMountType() {
+        return 'shared';
+    }
+
+    public function getUser(): IUser {
+        return $this->user;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
 		$this->superShare = $arguments['superShare'];
 		$this->groupedShares = $arguments['groupedShares'];
 
-		$absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
+		$absMountPoint = '/'.$user->getUID().'/files/'.trim($this->superShare->getTarget(), '/').'/';
 
 		parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
 	}
@@ -82,7 +82,7 @@ 
 
 		// it is not a file relative to data/user/files
 		if (count($split) < 3 || $split[1] !== 'files') {
-			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: '.$path, ['app' => 'files_sharing']);
 			throw new BrokenPath('Path does not start with /user/files', 10);
 		}
 
@@ -90,7 +90,7 @@ 
 		$sliced = array_slice($split, 2);
 		$relPath = implode('/', $sliced);
 
-		return '/' . $relPath;
+		return '/'.$relPath;
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 			$this->storage->setMountPoint($relTargetPath);
 		} catch (\Exception $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+				'Could not rename mount point for shared folder "'.$this->getMountPoint().'" to "'.$target.'"',
 				[
 					'app' => 'files_sharing',
 					'exception' => $e,
@@ -177,7 +177,7 @@ 
 			$row = $result->fetchAssociative();
 			$result->closeCursor();
 			if ($row) {
-				return (int)$row['storage'];
+				return (int) $row['storage'];
 			}
 			return -1;
 		}

apps/files_sharing/lib/Updater.php

Indentation +128 added lines, -128 removed lines

@@ -19,132 +19,132 @@
 
 class Updater {
 
-	/**
-	 * @param array $params
-	 */
-	public static function renameHook($params) {
-		self::renameChildren($params['oldpath'], $params['newpath']);
-		self::moveShareInOrOutOfShare($params['newpath']);
-	}
-
-	/**
-	 * Fix for https://github.com/owncloud/core/issues/20769
-	 *
-	 * The owner is allowed to move their files (if they are shared) into a receiving folder
-	 * In this case we need to update the parent of the moved share. Since they are
-	 * effectively handing over ownership of the file the rest of the code needs to know
-	 * they need to build up the reshare tree.
-	 *
-	 * @param string $path
-	 */
-	private static function moveShareInOrOutOfShare($path): void {
-		$userFolder = \OC::$server->getUserFolder();
-
-		// If the user folder can't be constructed (e.g. link share) just return.
-		if ($userFolder === null) {
-			return;
-		}
-		$user = $userFolder->getOwner();
-		if (!$user) {
-			throw new \Exception('user folder has no owner');
-		}
-
-		try {
-			$src = $userFolder->get($path);
-		} catch (NotFoundException) {
-			return;
-		}
-
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-
-		// We intentionally include invalid shares, as they have been automatically invalidated due to the node no longer
-		// being accessible for the user. Only in this case where we adjust the share after it was moved we want to ignore
-		// this to be able to still adjust it.
-
-		// FIXME: should CIRCLES be included here ??
-		$shares = $shareManager->getSharesBy($user->getUID(), IShare::TYPE_USER, $src, false, -1, onlyValid: false);
-		$shares = array_merge($shares, $shareManager->getSharesBy($user->getUID(), IShare::TYPE_GROUP, $src, false, -1, onlyValid: false));
-		$shares = array_merge($shares, $shareManager->getSharesBy($user->getUID(), IShare::TYPE_ROOM, $src, false, -1, onlyValid: false));
-
-		if ($src instanceof Folder) {
-			$cacheAccess = Server::get(FileAccess::class);
-
-			$sourceStorageId = $src->getStorage()->getCache()->getNumericStorageId();
-			$sourceInternalPath = $src->getInternalPath();
-			$subShares = array_merge(
-				$shareManager->getSharesBy($user->getUID(), IShare::TYPE_USER, onlyValid: false),
-				$shareManager->getSharesBy($user->getUID(), IShare::TYPE_GROUP, onlyValid: false),
-				$shareManager->getSharesBy($user->getUID(), IShare::TYPE_ROOM, onlyValid: false),
-			);
-			$shareSourceIds = array_map(fn (IShare $share) => $share->getNodeId(), $subShares);
-			$shareSources = $cacheAccess->getByFileIdsInStorage($shareSourceIds, $sourceStorageId);
-			foreach ($subShares as $subShare) {
-				$shareCacheEntry = $shareSources[$subShare->getNodeId()] ?? null;
-				if (
-					$shareCacheEntry
-					&& str_starts_with($shareCacheEntry->getPath(), $sourceInternalPath . '/')
-				) {
-					$shares[] = $subShare;
-				}
-			}
-		}
-
-		// If the path we move is not a share we don't care
-		if (empty($shares)) {
-			return;
-		}
-
-		// Check if the destination is inside a share
-		$mountManager = Server::get(IMountManager::class);
-		$dstMount = $mountManager->find($src->getPath());
-
-		//Ownership is moved over
-		foreach ($shares as $share) {
-			if (
-				$share->getShareType() !== IShare::TYPE_USER
-				&& $share->getShareType() !== IShare::TYPE_GROUP
-				&& $share->getShareType() !== IShare::TYPE_ROOM
-			) {
-				continue;
-			}
-
-			if ($dstMount instanceof SharedMount) {
-				if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
-					$shareManager->deleteShare($share);
-					continue;
-				}
-				$newOwner = $dstMount->getShare()->getShareOwner();
-				$newPermissions = $share->getPermissions() & $dstMount->getShare()->getPermissions();
-			} else {
-				$newOwner = $userFolder->getOwner()->getUID();
-				$newPermissions = $share->getPermissions();
-			}
-
-			$share->setShareOwner($newOwner);
-			$share->setPermissions($newPermissions);
-			$shareManager->updateShare($share, onlyValid: false);
-		}
-	}
-
-	/**
-	 * rename mount point from the children if the parent was renamed
-	 *
-	 * @param string $oldPath old path relative to data/user/files
-	 * @param string $newPath new path relative to data/user/files
-	 */
-	private static function renameChildren($oldPath, $newPath) {
-		$absNewPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $newPath);
-		$absOldPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $oldPath);
-
-		$mountManager = Filesystem::getMountManager();
-		$mountedShares = $mountManager->findIn('/' . \OC_User::getUser() . '/files/' . $oldPath);
-		foreach ($mountedShares as $mount) {
-			/** @var MountPoint $mount */
-			if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) {
-				$mountPoint = $mount->getMountPoint();
-				$target = str_replace($absOldPath, $absNewPath, $mountPoint);
-				$mount->moveMount($target);
-			}
-		}
-	}
+    /**
+     * @param array $params
+     */
+    public static function renameHook($params) {
+        self::renameChildren($params['oldpath'], $params['newpath']);
+        self::moveShareInOrOutOfShare($params['newpath']);
+    }
+
+    /**
+     * Fix for https://github.com/owncloud/core/issues/20769
+     *
+     * The owner is allowed to move their files (if they are shared) into a receiving folder
+     * In this case we need to update the parent of the moved share. Since they are
+     * effectively handing over ownership of the file the rest of the code needs to know
+     * they need to build up the reshare tree.
+     *
+     * @param string $path
+     */
+    private static function moveShareInOrOutOfShare($path): void {
+        $userFolder = \OC::$server->getUserFolder();
+
+        // If the user folder can't be constructed (e.g. link share) just return.
+        if ($userFolder === null) {
+            return;
+        }
+        $user = $userFolder->getOwner();
+        if (!$user) {
+            throw new \Exception('user folder has no owner');
+        }
+
+        try {
+            $src = $userFolder->get($path);
+        } catch (NotFoundException) {
+            return;
+        }
+
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+
+        // We intentionally include invalid shares, as they have been automatically invalidated due to the node no longer
+        // being accessible for the user. Only in this case where we adjust the share after it was moved we want to ignore
+        // this to be able to still adjust it.
+
+        // FIXME: should CIRCLES be included here ??
+        $shares = $shareManager->getSharesBy($user->getUID(), IShare::TYPE_USER, $src, false, -1, onlyValid: false);
+        $shares = array_merge($shares, $shareManager->getSharesBy($user->getUID(), IShare::TYPE_GROUP, $src, false, -1, onlyValid: false));
+        $shares = array_merge($shares, $shareManager->getSharesBy($user->getUID(), IShare::TYPE_ROOM, $src, false, -1, onlyValid: false));
+
+        if ($src instanceof Folder) {
+            $cacheAccess = Server::get(FileAccess::class);
+
+            $sourceStorageId = $src->getStorage()->getCache()->getNumericStorageId();
+            $sourceInternalPath = $src->getInternalPath();
+            $subShares = array_merge(
+                $shareManager->getSharesBy($user->getUID(), IShare::TYPE_USER, onlyValid: false),
+                $shareManager->getSharesBy($user->getUID(), IShare::TYPE_GROUP, onlyValid: false),
+                $shareManager->getSharesBy($user->getUID(), IShare::TYPE_ROOM, onlyValid: false),
+            );
+            $shareSourceIds = array_map(fn (IShare $share) => $share->getNodeId(), $subShares);
+            $shareSources = $cacheAccess->getByFileIdsInStorage($shareSourceIds, $sourceStorageId);
+            foreach ($subShares as $subShare) {
+                $shareCacheEntry = $shareSources[$subShare->getNodeId()] ?? null;
+                if (
+                    $shareCacheEntry
+                    && str_starts_with($shareCacheEntry->getPath(), $sourceInternalPath . '/')
+                ) {
+                    $shares[] = $subShare;
+                }
+            }
+        }
+
+        // If the path we move is not a share we don't care
+        if (empty($shares)) {
+            return;
+        }
+
+        // Check if the destination is inside a share
+        $mountManager = Server::get(IMountManager::class);
+        $dstMount = $mountManager->find($src->getPath());
+
+        //Ownership is moved over
+        foreach ($shares as $share) {
+            if (
+                $share->getShareType() !== IShare::TYPE_USER
+                && $share->getShareType() !== IShare::TYPE_GROUP
+                && $share->getShareType() !== IShare::TYPE_ROOM
+            ) {
+                continue;
+            }
+
+            if ($dstMount instanceof SharedMount) {
+                if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
+                    $shareManager->deleteShare($share);
+                    continue;
+                }
+                $newOwner = $dstMount->getShare()->getShareOwner();
+                $newPermissions = $share->getPermissions() & $dstMount->getShare()->getPermissions();
+            } else {
+                $newOwner = $userFolder->getOwner()->getUID();
+                $newPermissions = $share->getPermissions();
+            }
+
+            $share->setShareOwner($newOwner);
+            $share->setPermissions($newPermissions);
+            $shareManager->updateShare($share, onlyValid: false);
+        }
+    }
+
+    /**
+     * rename mount point from the children if the parent was renamed
+     *
+     * @param string $oldPath old path relative to data/user/files
+     * @param string $newPath new path relative to data/user/files
+     */
+    private static function renameChildren($oldPath, $newPath) {
+        $absNewPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $newPath);
+        $absOldPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $oldPath);
+
+        $mountManager = Filesystem::getMountManager();
+        $mountedShares = $mountManager->findIn('/' . \OC_User::getUser() . '/files/' . $oldPath);
+        foreach ($mountedShares as $mount) {
+            /** @var MountPoint $mount */
+            if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) {
+                $mountPoint = $mount->getMountPoint();
+                $target = str_replace($absOldPath, $absNewPath, $mountPoint);
+                $mount->moveMount($target);
+            }
+        }
+    }
 }

apps/files_sharing/lib/Listener/SharesUpdatedListener.php

Indentation +45 added lines, -45 removed lines

@@ -30,54 +30,54 @@
  * @template-implements IEventListener<UserAddedEvent|UserRemovedEvent|ShareCreatedEvent|BeforeShareDeletedEvent|UserShareAccessUpdatedEvent|FilesystemTornDownEvent>
  */
 class SharesUpdatedListener implements IEventListener {
-	private CappedMemoryCache $updatedUsers;
+    private CappedMemoryCache $updatedUsers;
 
-	public function __construct(
-		private readonly IManager $shareManager,
-		private readonly IUserMountCache $userMountCache,
-		private readonly MountProvider $shareMountProvider,
-		private readonly ShareTargetValidator $shareTargetValidator,
-	) {
-		$this->updatedUsers = new CappedMemoryCache();
-	}
-	public function handle(Event $event): void {
-		if ($event instanceof FilesystemTornDownEvent) {
-			$this->updatedUsers = new CappedMemoryCache();
-		}
-		if ($event instanceof UserShareAccessUpdatedEvent) {
-			foreach ($event->getUsers() as $user) {
-				$this->updateForUser($user);
-			}
-		}
-		if ($event instanceof UserAddedEvent || $event instanceof UserRemovedEvent) {
-			$this->updateForUser($event->getUser());
-		}
-		if ($event instanceof ShareCreatedEvent || $event instanceof BeforeShareDeletedEvent) {
-			foreach ($this->shareManager->getUsersForShare($event->getShare()) as $user) {
-				$this->updateForUser($user);
-			}
-		}
-	}
+    public function __construct(
+        private readonly IManager $shareManager,
+        private readonly IUserMountCache $userMountCache,
+        private readonly MountProvider $shareMountProvider,
+        private readonly ShareTargetValidator $shareTargetValidator,
+    ) {
+        $this->updatedUsers = new CappedMemoryCache();
+    }
+    public function handle(Event $event): void {
+        if ($event instanceof FilesystemTornDownEvent) {
+            $this->updatedUsers = new CappedMemoryCache();
+        }
+        if ($event instanceof UserShareAccessUpdatedEvent) {
+            foreach ($event->getUsers() as $user) {
+                $this->updateForUser($user);
+            }
+        }
+        if ($event instanceof UserAddedEvent || $event instanceof UserRemovedEvent) {
+            $this->updateForUser($event->getUser());
+        }
+        if ($event instanceof ShareCreatedEvent || $event instanceof BeforeShareDeletedEvent) {
+            foreach ($this->shareManager->getUsersForShare($event->getShare()) as $user) {
+                $this->updateForUser($user);
+            }
+        }
+    }
 
-	private function updateForUser(IUser $user): void {
-		if (isset($this->updatedUsers[$user->getUID()])) {
-			return;
-		}
-		$this->updatedUsers[$user->getUID()] = true;
+    private function updateForUser(IUser $user): void {
+        if (isset($this->updatedUsers[$user->getUID()])) {
+            return;
+        }
+        $this->updatedUsers[$user->getUID()] = true;
 
-		$cachedMounts = $this->userMountCache->getMountsForUser($user);
-		$mountPoints = array_map(fn (ICachedMountInfo $mount) => $mount->getMountPoint(), $cachedMounts);
-		$mountsByPath = array_combine($mountPoints, $cachedMounts);
+        $cachedMounts = $this->userMountCache->getMountsForUser($user);
+        $mountPoints = array_map(fn (ICachedMountInfo $mount) => $mount->getMountPoint(), $cachedMounts);
+        $mountsByPath = array_combine($mountPoints, $cachedMounts);
 
-		$shares = $this->shareMountProvider->getSuperSharesForUser($user);
+        $shares = $this->shareMountProvider->getSuperSharesForUser($user);
 
-		foreach ($shares as &$share) {
-			[$parentShare, $groupedShares] = $share;
-			$mountPoint = '/' . $user->getUID() . '/files/' . trim($parentShare->getTarget(), '/') . '/';
-			$mountKey = $parentShare->getNodeId() . '::' . $mountPoint;
-			if (!isset($cachedMounts[$mountKey])) {
-				$this->shareTargetValidator->verifyMountPoint($user, $parentShare, $mountsByPath, $groupedShares);
-			}
-		}
-	}
+        foreach ($shares as &$share) {
+            [$parentShare, $groupedShares] = $share;
+            $mountPoint = '/' . $user->getUID() . '/files/' . trim($parentShare->getTarget(), '/') . '/';
+            $mountKey = $parentShare->getNodeId() . '::' . $mountPoint;
+            if (!isset($cachedMounts[$mountKey])) {
+                $this->shareTargetValidator->verifyMountPoint($user, $parentShare, $mountsByPath, $groupedShares);
+            }
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -73,8 +73,8 @@
 
 		foreach ($shares as &$share) {
 			[$parentShare, $groupedShares] = $share;
-			$mountPoint = '/' . $user->getUID() . '/files/' . trim($parentShare->getTarget(), '/') . '/';
-			$mountKey = $parentShare->getNodeId() . '::' . $mountPoint;
+			$mountPoint = '/'.$user->getUID().'/files/'.trim($parentShare->getTarget(), '/').'/';
+			$mountKey = $parentShare->getNodeId().'::'.$mountPoint;
 			if (!isset($cachedMounts[$mountKey])) {
 				$this->shareTargetValidator->verifyMountPoint($user, $parentShare, $mountsByPath, $groupedShares);
 			}

apps/files_sharing/lib/MountProvider.php

Indentation +373 added lines, -373 removed lines

@@ -29,377 +29,377 @@
 use function count;
 
 class MountProvider implements IMountProvider, IPartialMountProvider {
-	/**
-	 * @param IConfig $config
-	 * @param IManager $shareManager
-	 * @param LoggerInterface $logger
-	 */
-	public function __construct(
-		protected IConfig $config,
-		protected IManager $shareManager,
-		protected LoggerInterface $logger,
-		protected IEventDispatcher $eventDispatcher,
-		protected ICacheFactory $cacheFactory,
-		protected IMountManager $mountManager,
-	) {
-	}
-
-	/**
-	 * Get all mountpoints applicable for the user and check for shares where we need to update the etags
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		return array_values($this->getMountsFromSuperShares($user, $this->getSuperSharesForUser($user), $loader));
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return list<array{IShare, array<IShare>}> Tuple of [superShare, groupedShares]
-	 */
-	public function getSuperSharesForUser(IUser $user): array {
-		$userId = $user->getUID();
-		$shares = $this->mergeIterables(
-			$this->shareManager->getSharedWith($userId, IShare::TYPE_USER, null, -1),
-			$this->shareManager->getSharedWith($userId, IShare::TYPE_GROUP, null, -1),
-			$this->shareManager->getSharedWith($userId, IShare::TYPE_CIRCLE, null, -1),
-			$this->shareManager->getSharedWith($userId, IShare::TYPE_ROOM, null, -1),
-			$this->shareManager->getSharedWith($userId, IShare::TYPE_DECK, null, -1),
-		);
-
-		$shares = $this->filterShares($shares, $userId);
-		return $this->buildSuperShares($shares, $user);
-	}
-
-	/**
-	 * Groups shares by path (nodeId) and target path
-	 *
-	 * @param iterable<IShare> $shares
-	 * @return IShare[][] array of grouped shares, each element in the
-	 *                    array is a group which itself is an array of shares
-	 */
-	private function groupShares(iterable $shares): array {
-		$tmp = [];
-
-		foreach ($shares as $share) {
-			$nodeId = $share->getNodeId();
-			if (!isset($tmp[$nodeId])) {
-				$tmp[$nodeId] = [];
-			}
-			$tmp[$nodeId][] = $share;
-		}
-
-		$result = [];
-		// sort by stime, the super share will be based on the least recent share
-		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
-				$aTime = $a->getShareTime()->getTimestamp();
-				$bTime = $b->getShareTime()->getTimestamp();
-				if ($aTime === $bTime) {
-					return $a->getId() < $b->getId() ? -1 : 1;
-				}
-				return $aTime < $bTime ? -1 : 1;
-			});
-			$result[] = $tmp2;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Groups shares by node ID and builds a new share object (super share)
-	 * which represents a summarized version of all the shares in the group.
-	 *
-	 * The permissions and attributes of the super share are accumulated from
-	 * the shares in the group, forming the most permissive combination
-	 * possible.
-	 *
-	 * @param iterable<IShare> $allShares
-	 * @param IUser $user user
-	 * @return list<array{IShare, array<IShare>}> Tuple of [superShare, groupedShares]
-	 */
-	private function buildSuperShares(iterable $allShares, IUser $user): array {
-		$result = [];
-
-		$groupedShares = $this->groupShares($allShares);
-
-		foreach ($groupedShares as $shares) {
-			if (count($shares) === 0) {
-				continue;
-			}
-
-			$superShare = $this->shareManager->newShare();
-
-			// compute super share based on first entry of the group
-			$superShare->setId($shares[0]->getId())
-				->setShareOwner($shares[0]->getShareOwner())
-				->setNodeId($shares[0]->getNodeId())
-				->setShareType($shares[0]->getShareType())
-				->setTarget($shares[0]->getTarget());
-
-			$this->combineNotes($shares, $superShare);
-
-			// use most permissive permissions
-			// this covers the case where there are multiple shares for the same
-			// file e.g. from different groups and different permissions
-			$superPermissions = 0;
-			$superAttributes = $this->shareManager->newShare()->newAttributes();
-			$status = IShare::STATUS_PENDING;
-			foreach ($shares as $share) {
-				$status = max($status, $share->getStatus());
-				// update permissions
-				$superPermissions |= $share->getPermissions();
-
-				// update share permission attributes
-				$attributes = $share->getAttributes();
-				if ($attributes !== null) {
-					$this->mergeAttributes($attributes, $superAttributes);
-				}
-
-				$this->adjustTarget($share, $superShare, $user);
-				if ($share->getNodeCacheEntry() !== null) {
-					$superShare->setNodeCacheEntry($share->getNodeCacheEntry());
-				}
-			}
-
-			$superShare->setPermissions($superPermissions);
-			$superShare->setStatus($status);
-			$superShare->setAttributes($superAttributes);
-
-			$result[] = [$superShare, $shares];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Combines $attributes into the most permissive set of attributes and
-	 * sets them in $superAttributes.
-	 */
-	private function mergeAttributes(
-		IAttributes $attributes,
-		IAttributes $superAttributes,
-	): void {
-		foreach ($attributes->toArray() as $attribute) {
-			if ($superAttributes->getAttribute(
-				$attribute['scope'],
-				$attribute['key']
-			) === true) {
-				// if super share attribute is already enabled, it is most permissive
-				continue;
-			}
-			// update super share attributes with subshare attribute
-			$superAttributes->setAttribute(
-				$attribute['scope'],
-				$attribute['key'],
-				$attribute['value']
-			);
-		}
-	}
-
-	/**
-	 * Gather notes from all the shares. Since these are readily available
-	 * here, storing them enables the DAV FilesPlugin to avoid executing many
-	 * DB queries to retrieve the same information.
-	 *
-	 * @param array<IShare> $shares
-	 * @param IShare $superShare
-	 * @return void
-	 */
-	private function combineNotes(
-		array &$shares,
-		IShare $superShare,
-	): void {
-		$allNotes = implode(
-			"\n",
-			array_map(static fn ($sh) => $sh->getNote(), $shares)
-		);
-		$superShare->setNote($allNotes);
-	}
-
-	/**
-	 * Adjusts the target in $share for DB consistency, if needed.
-	 */
-	private function adjustTarget(
-		IShare $share,
-		IShare $superShare,
-		IUser $user,
-	): void {
-		if ($share->getTarget() === $superShare->getTarget()) {
-			return;
-		}
-
-		$share->setTarget($superShare->getTarget());
-		try {
-			$this->shareManager->moveShare($share, $user->getUID());
-		} catch (InvalidArgumentException $e) {
-			// ignore as it is not important and we don't want to
-			// block FS setup
-
-			// the subsequent code anyway only uses the target of the
-			// super share
-
-			// such issue can usually happen when dealing with
-			// null groups which usually appear with group backend
-			// caching inconsistencies
-			$this->logger->debug(
-				'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
-				['app' => 'files_sharing']
-			);
-		}
-	}
-	/**
-	 * @param string $userId
-	 * @param list<array{IShare, array<IShare>}> $superShares
-	 * @param IStorageFactory $loader
-	 * @param IUser $user
-	 * @return array IMountPoint indexed by mount point
-	 * @throws Exception
-	 */
-	public function getMountsFromSuperShares(
-		IUser $user,
-		array $superShares,
-		IStorageFactory $loader,
-	): array {
-		$userId = $user->getUID();
-		$allMounts = $this->mountManager->getAll();
-		$mounts = [];
-		$view = new View('/' . $userId . '/files');
-		$ownerViews = [];
-		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($userId);
-		/** @var CappedMemoryCache<bool> $folderExistCache */
-		$foldersExistCache = new CappedMemoryCache();
-
-		$validShareCache = $this->cacheFactory->createLocal('share-valid-mountpoint-max');
-		$maxValidatedShare = $validShareCache->get($userId) ?? 0;
-		$newMaxValidatedShare = $maxValidatedShare;
-
-		foreach ($superShares as $share) {
-			[$parentShare, $groupedShares] = $share;
-			try {
-				if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED
-					&& ($parentShare->getShareType() === IShare::TYPE_GROUP
-						|| $parentShare->getShareType() === IShare::TYPE_USERGROUP
-						|| $parentShare->getShareType() === IShare::TYPE_USER)
-				) {
-					continue;
-				}
-
-				$owner = $parentShare->getShareOwner();
-				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $owner . '/files');
-				}
-				$shareId = (int)$parentShare->getId();
-				$mount = new SharedMount(
-					'\OCA\Files_Sharing\SharedStorage',
-					[
-						'user' => $userId,
-						// parent share
-						'superShare' => $parentShare,
-						// children/component of the superShare
-						'groupedShares' => $groupedShares,
-						'ownerView' => $ownerViews[$owner],
-						'sharingDisabledForUser' => $sharingDisabledForUser
-					],
-					$loader,
-					$this->eventDispatcher,
-					$user,
-				);
-
-				$newMaxValidatedShare = max($shareId, $newMaxValidatedShare);
-
-				$event = new ShareMountedEvent($mount);
-				$this->eventDispatcher->dispatchTyped($event);
-
-				$mounts[$mount->getMountPoint()] = $allMounts[$mount->getMountPoint()] = $mount;
-				foreach ($event->getAdditionalMounts() as $additionalMount) {
-					$mounts[$additionalMount->getMountPoint()] = $additionalMount;
-					$allMounts[$additionalMount->getMountPoint()] = $additionalMount;
-				}
-			} catch (Exception $e) {
-				$this->logger->error(
-					'Error while trying to create shared mount',
-					[
-						'app' => 'files_sharing',
-						'exception' => $e,
-					],
-				);
-			}
-		}
-
-		$validShareCache->set($userId, $newMaxValidatedShare, 24 * 60 * 60);
-
-		// array_filter removes the null values from the array
-		return array_filter($mounts);
-	}
-
-	/**
-	 * Filters out shares owned or shared by the user and ones for which the
-	 * user has no permissions.
-	 *
-	 * @param iterable<IShare> $shares
-	 * @return iterable<IShare>
-	 */
-	private function filterShares(iterable $shares, string $userId): iterable {
-		foreach ($shares as $share) {
-			if (
-				$share->getPermissions() > 0
-				&& $share->getShareOwner() !== $userId
-				&& $share->getSharedBy() !== $userId
-			) {
-				yield $share;
-			}
-		}
-	}
-
-	public function getMountsForPath(
-		string $setupPathHint,
-		bool $forChildren,
-		array $mountProviderArgs,
-		IStorageFactory $loader,
-	): array {
-		$limit = -1;
-		$user = $mountProviderArgs[0]->mountInfo->getUser();
-		$userId = $user->getUID();
-
-		if (!$forChildren) {
-			// override path with mount point when fetching without children
-			$setupPathHint = $mountProviderArgs[0]->mountInfo->getMountPoint();
-		}
-
-		// remove /uid/files as the target is stored without
-		$setupPathHint = \substr($setupPathHint, \strlen('/' . $userId . '/files'));
-		// remove trailing slash
-		$setupPathHint = \rtrim($setupPathHint, '/');
-
-		// make sure trailing slash is present when loading children
-		if ($forChildren || $setupPathHint === '') {
-			$setupPathHint .= '/';
-		}
-
-		$shares = $this->mergeIterables(
-			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_USER, $setupPathHint, $forChildren, $limit),
-			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_GROUP, $setupPathHint, $forChildren, $limit),
-			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_CIRCLE, $setupPathHint, $forChildren, $limit),
-			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_ROOM, $setupPathHint, $forChildren, $limit),
-			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_DECK, $setupPathHint, $forChildren, $limit),
-		);
-
-		$shares = $this->filterShares($shares, $userId);
-		$superShares = $this->buildSuperShares($shares, $user);
-
-		return $this->getMountsFromSuperShares($user, $superShares, $loader);
-	}
-
-	/**
-	 * @param iterable ...$iterables
-	 * @return iterable
-	 */
-	private function mergeIterables(...$iterables): iterable {
-		foreach ($iterables as $iterable) {
-			yield from $iterable;
-		}
-	}
+    /**
+     * @param IConfig $config
+     * @param IManager $shareManager
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        protected IConfig $config,
+        protected IManager $shareManager,
+        protected LoggerInterface $logger,
+        protected IEventDispatcher $eventDispatcher,
+        protected ICacheFactory $cacheFactory,
+        protected IMountManager $mountManager,
+    ) {
+    }
+
+    /**
+     * Get all mountpoints applicable for the user and check for shares where we need to update the etags
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        return array_values($this->getMountsFromSuperShares($user, $this->getSuperSharesForUser($user), $loader));
+    }
+
+    /**
+     * @param IUser $user
+     * @return list<array{IShare, array<IShare>}> Tuple of [superShare, groupedShares]
+     */
+    public function getSuperSharesForUser(IUser $user): array {
+        $userId = $user->getUID();
+        $shares = $this->mergeIterables(
+            $this->shareManager->getSharedWith($userId, IShare::TYPE_USER, null, -1),
+            $this->shareManager->getSharedWith($userId, IShare::TYPE_GROUP, null, -1),
+            $this->shareManager->getSharedWith($userId, IShare::TYPE_CIRCLE, null, -1),
+            $this->shareManager->getSharedWith($userId, IShare::TYPE_ROOM, null, -1),
+            $this->shareManager->getSharedWith($userId, IShare::TYPE_DECK, null, -1),
+        );
+
+        $shares = $this->filterShares($shares, $userId);
+        return $this->buildSuperShares($shares, $user);
+    }
+
+    /**
+     * Groups shares by path (nodeId) and target path
+     *
+     * @param iterable<IShare> $shares
+     * @return IShare[][] array of grouped shares, each element in the
+     *                    array is a group which itself is an array of shares
+     */
+    private function groupShares(iterable $shares): array {
+        $tmp = [];
+
+        foreach ($shares as $share) {
+            $nodeId = $share->getNodeId();
+            if (!isset($tmp[$nodeId])) {
+                $tmp[$nodeId] = [];
+            }
+            $tmp[$nodeId][] = $share;
+        }
+
+        $result = [];
+        // sort by stime, the super share will be based on the least recent share
+        foreach ($tmp as &$tmp2) {
+            @usort($tmp2, function ($a, $b) {
+                $aTime = $a->getShareTime()->getTimestamp();
+                $bTime = $b->getShareTime()->getTimestamp();
+                if ($aTime === $bTime) {
+                    return $a->getId() < $b->getId() ? -1 : 1;
+                }
+                return $aTime < $bTime ? -1 : 1;
+            });
+            $result[] = $tmp2;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Groups shares by node ID and builds a new share object (super share)
+     * which represents a summarized version of all the shares in the group.
+     *
+     * The permissions and attributes of the super share are accumulated from
+     * the shares in the group, forming the most permissive combination
+     * possible.
+     *
+     * @param iterable<IShare> $allShares
+     * @param IUser $user user
+     * @return list<array{IShare, array<IShare>}> Tuple of [superShare, groupedShares]
+     */
+    private function buildSuperShares(iterable $allShares, IUser $user): array {
+        $result = [];
+
+        $groupedShares = $this->groupShares($allShares);
+
+        foreach ($groupedShares as $shares) {
+            if (count($shares) === 0) {
+                continue;
+            }
+
+            $superShare = $this->shareManager->newShare();
+
+            // compute super share based on first entry of the group
+            $superShare->setId($shares[0]->getId())
+                ->setShareOwner($shares[0]->getShareOwner())
+                ->setNodeId($shares[0]->getNodeId())
+                ->setShareType($shares[0]->getShareType())
+                ->setTarget($shares[0]->getTarget());
+
+            $this->combineNotes($shares, $superShare);
+
+            // use most permissive permissions
+            // this covers the case where there are multiple shares for the same
+            // file e.g. from different groups and different permissions
+            $superPermissions = 0;
+            $superAttributes = $this->shareManager->newShare()->newAttributes();
+            $status = IShare::STATUS_PENDING;
+            foreach ($shares as $share) {
+                $status = max($status, $share->getStatus());
+                // update permissions
+                $superPermissions |= $share->getPermissions();
+
+                // update share permission attributes
+                $attributes = $share->getAttributes();
+                if ($attributes !== null) {
+                    $this->mergeAttributes($attributes, $superAttributes);
+                }
+
+                $this->adjustTarget($share, $superShare, $user);
+                if ($share->getNodeCacheEntry() !== null) {
+                    $superShare->setNodeCacheEntry($share->getNodeCacheEntry());
+                }
+            }
+
+            $superShare->setPermissions($superPermissions);
+            $superShare->setStatus($status);
+            $superShare->setAttributes($superAttributes);
+
+            $result[] = [$superShare, $shares];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Combines $attributes into the most permissive set of attributes and
+     * sets them in $superAttributes.
+     */
+    private function mergeAttributes(
+        IAttributes $attributes,
+        IAttributes $superAttributes,
+    ): void {
+        foreach ($attributes->toArray() as $attribute) {
+            if ($superAttributes->getAttribute(
+                $attribute['scope'],
+                $attribute['key']
+            ) === true) {
+                // if super share attribute is already enabled, it is most permissive
+                continue;
+            }
+            // update super share attributes with subshare attribute
+            $superAttributes->setAttribute(
+                $attribute['scope'],
+                $attribute['key'],
+                $attribute['value']
+            );
+        }
+    }
+
+    /**
+     * Gather notes from all the shares. Since these are readily available
+     * here, storing them enables the DAV FilesPlugin to avoid executing many
+     * DB queries to retrieve the same information.
+     *
+     * @param array<IShare> $shares
+     * @param IShare $superShare
+     * @return void
+     */
+    private function combineNotes(
+        array &$shares,
+        IShare $superShare,
+    ): void {
+        $allNotes = implode(
+            "\n",
+            array_map(static fn ($sh) => $sh->getNote(), $shares)
+        );
+        $superShare->setNote($allNotes);
+    }
+
+    /**
+     * Adjusts the target in $share for DB consistency, if needed.
+     */
+    private function adjustTarget(
+        IShare $share,
+        IShare $superShare,
+        IUser $user,
+    ): void {
+        if ($share->getTarget() === $superShare->getTarget()) {
+            return;
+        }
+
+        $share->setTarget($superShare->getTarget());
+        try {
+            $this->shareManager->moveShare($share, $user->getUID());
+        } catch (InvalidArgumentException $e) {
+            // ignore as it is not important and we don't want to
+            // block FS setup
+
+            // the subsequent code anyway only uses the target of the
+            // super share
+
+            // such issue can usually happen when dealing with
+            // null groups which usually appear with group backend
+            // caching inconsistencies
+            $this->logger->debug(
+                'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+                ['app' => 'files_sharing']
+            );
+        }
+    }
+    /**
+     * @param string $userId
+     * @param list<array{IShare, array<IShare>}> $superShares
+     * @param IStorageFactory $loader
+     * @param IUser $user
+     * @return array IMountPoint indexed by mount point
+     * @throws Exception
+     */
+    public function getMountsFromSuperShares(
+        IUser $user,
+        array $superShares,
+        IStorageFactory $loader,
+    ): array {
+        $userId = $user->getUID();
+        $allMounts = $this->mountManager->getAll();
+        $mounts = [];
+        $view = new View('/' . $userId . '/files');
+        $ownerViews = [];
+        $sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($userId);
+        /** @var CappedMemoryCache<bool> $folderExistCache */
+        $foldersExistCache = new CappedMemoryCache();
+
+        $validShareCache = $this->cacheFactory->createLocal('share-valid-mountpoint-max');
+        $maxValidatedShare = $validShareCache->get($userId) ?? 0;
+        $newMaxValidatedShare = $maxValidatedShare;
+
+        foreach ($superShares as $share) {
+            [$parentShare, $groupedShares] = $share;
+            try {
+                if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED
+                    && ($parentShare->getShareType() === IShare::TYPE_GROUP
+                        || $parentShare->getShareType() === IShare::TYPE_USERGROUP
+                        || $parentShare->getShareType() === IShare::TYPE_USER)
+                ) {
+                    continue;
+                }
+
+                $owner = $parentShare->getShareOwner();
+                if (!isset($ownerViews[$owner])) {
+                    $ownerViews[$owner] = new View('/' . $owner . '/files');
+                }
+                $shareId = (int)$parentShare->getId();
+                $mount = new SharedMount(
+                    '\OCA\Files_Sharing\SharedStorage',
+                    [
+                        'user' => $userId,
+                        // parent share
+                        'superShare' => $parentShare,
+                        // children/component of the superShare
+                        'groupedShares' => $groupedShares,
+                        'ownerView' => $ownerViews[$owner],
+                        'sharingDisabledForUser' => $sharingDisabledForUser
+                    ],
+                    $loader,
+                    $this->eventDispatcher,
+                    $user,
+                );
+
+                $newMaxValidatedShare = max($shareId, $newMaxValidatedShare);
+
+                $event = new ShareMountedEvent($mount);
+                $this->eventDispatcher->dispatchTyped($event);
+
+                $mounts[$mount->getMountPoint()] = $allMounts[$mount->getMountPoint()] = $mount;
+                foreach ($event->getAdditionalMounts() as $additionalMount) {
+                    $mounts[$additionalMount->getMountPoint()] = $additionalMount;
+                    $allMounts[$additionalMount->getMountPoint()] = $additionalMount;
+                }
+            } catch (Exception $e) {
+                $this->logger->error(
+                    'Error while trying to create shared mount',
+                    [
+                        'app' => 'files_sharing',
+                        'exception' => $e,
+                    ],
+                );
+            }
+        }
+
+        $validShareCache->set($userId, $newMaxValidatedShare, 24 * 60 * 60);
+
+        // array_filter removes the null values from the array
+        return array_filter($mounts);
+    }
+
+    /**
+     * Filters out shares owned or shared by the user and ones for which the
+     * user has no permissions.
+     *
+     * @param iterable<IShare> $shares
+     * @return iterable<IShare>
+     */
+    private function filterShares(iterable $shares, string $userId): iterable {
+        foreach ($shares as $share) {
+            if (
+                $share->getPermissions() > 0
+                && $share->getShareOwner() !== $userId
+                && $share->getSharedBy() !== $userId
+            ) {
+                yield $share;
+            }
+        }
+    }
+
+    public function getMountsForPath(
+        string $setupPathHint,
+        bool $forChildren,
+        array $mountProviderArgs,
+        IStorageFactory $loader,
+    ): array {
+        $limit = -1;
+        $user = $mountProviderArgs[0]->mountInfo->getUser();
+        $userId = $user->getUID();
+
+        if (!$forChildren) {
+            // override path with mount point when fetching without children
+            $setupPathHint = $mountProviderArgs[0]->mountInfo->getMountPoint();
+        }
+
+        // remove /uid/files as the target is stored without
+        $setupPathHint = \substr($setupPathHint, \strlen('/' . $userId . '/files'));
+        // remove trailing slash
+        $setupPathHint = \rtrim($setupPathHint, '/');
+
+        // make sure trailing slash is present when loading children
+        if ($forChildren || $setupPathHint === '') {
+            $setupPathHint .= '/';
+        }
+
+        $shares = $this->mergeIterables(
+            $this->shareManager->getSharedWithByPath($userId, IShare::TYPE_USER, $setupPathHint, $forChildren, $limit),
+            $this->shareManager->getSharedWithByPath($userId, IShare::TYPE_GROUP, $setupPathHint, $forChildren, $limit),
+            $this->shareManager->getSharedWithByPath($userId, IShare::TYPE_CIRCLE, $setupPathHint, $forChildren, $limit),
+            $this->shareManager->getSharedWithByPath($userId, IShare::TYPE_ROOM, $setupPathHint, $forChildren, $limit),
+            $this->shareManager->getSharedWithByPath($userId, IShare::TYPE_DECK, $setupPathHint, $forChildren, $limit),
+        );
+
+        $shares = $this->filterShares($shares, $userId);
+        $superShares = $this->buildSuperShares($shares, $user);
+
+        return $this->getMountsFromSuperShares($user, $superShares, $loader);
+    }
+
+    /**
+     * @param iterable ...$iterables
+     * @return iterable
+     */
+    private function mergeIterables(...$iterables): iterable {
+        foreach ($iterables as $iterable) {
+            yield from $iterable;
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
 		$result = [];
 		// sort by stime, the super share will be based on the least recent share
 		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
+			@usort($tmp2, function($a, $b) {
 				$aTime = $a->getShareTime()->getTimestamp();
 				$bTime = $b->getShareTime()->getTimestamp();
 				if ($aTime === $bTime) {
@@ -245,7 +245,7 @@ 
 			// null groups which usually appear with group backend
 			// caching inconsistencies
 			$this->logger->debug(
-				'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+				'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(),
 				['app' => 'files_sharing']
 			);
 		}
@@ -266,7 +266,7 @@ 
 		$userId = $user->getUID();
 		$allMounts = $this->mountManager->getAll();
 		$mounts = [];
-		$view = new View('/' . $userId . '/files');
+		$view = new View('/'.$userId.'/files');
 		$ownerViews = [];
 		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($userId);
 		/** @var CappedMemoryCache<bool> $folderExistCache */
@@ -289,9 +289,9 @@ 
 
 				$owner = $parentShare->getShareOwner();
 				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $owner . '/files');
+					$ownerViews[$owner] = new View('/'.$owner.'/files');
 				}
-				$shareId = (int)$parentShare->getId();
+				$shareId = (int) $parentShare->getId();
 				$mount = new SharedMount(
 					'\OCA\Files_Sharing\SharedStorage',
 					[
@@ -370,7 +370,7 @@ 
 		}
 
 		// remove /uid/files as the target is stored without
-		$setupPathHint = \substr($setupPathHint, \strlen('/' . $userId . '/files'));
+		$setupPathHint = \substr($setupPathHint, \strlen('/'.$userId.'/files'));
 		// remove trailing slash
 		$setupPathHint = \rtrim($setupPathHint, '/');
 

apps/files_sharing/lib/ShareTargetValidator.php

Indentation +136 added lines, -136 removed lines

@@ -25,140 +25,140 @@
  * Validate that mount target is valid
  */
 class ShareTargetValidator {
-	private CappedMemoryCache $folderExistsCache;
-
-	public function __construct(
-		private readonly IManager $shareManager,
-		private readonly IEventDispatcher $eventDispatcher,
-		private readonly SetupManager $setupManager,
-		private readonly IMountManager $mountManager,
-	) {
-		$this->folderExistsCache = new CappedMemoryCache();
-	}
-
-	private function getViewForUser(IUser $user): View {
-		/**
-		 * @psalm-suppress InternalClass
-		 * @psalm-suppress InternalMethod
-		 */
-		return new View('/' . $user->getUID() . '/files');
-	}
-
-	/**
-	 * check if the parent folder exists otherwise move the mount point up
-	 *
-	 * @param array<string, ICachedMountInfo> $allCachedMounts Other mounts for the user, indexed by path
-	 * @param IShare[] $childShares
-	 * @return string
-	 */
-	public function verifyMountPoint(
-		IUser $user,
-		IShare &$share,
-		array $allCachedMounts,
-		array $childShares,
-	): string {
-		$mountPoint = basename($share->getTarget());
-		$parent = dirname($share->getTarget());
-
-		$recipientView = $this->getViewForUser($user);
-		$event = new VerifyMountPointEvent($share, $recipientView, $parent);
-		$this->eventDispatcher->dispatchTyped($event);
-		$parent = $event->getParent();
-
-		/** @psalm-suppress InternalMethod */
-		$absoluteParent = $recipientView->getAbsolutePath($parent);
-		$this->setupManager->setupForPath($absoluteParent);
-		$parentMount = $this->mountManager->find($absoluteParent);
-
-		$cached = $this->folderExistsCache->get($parent);
-		if ($cached) {
-			$parentExists = $cached;
-		} else {
-			$parentCache = $parentMount->getStorage()->getCache();
-			$parentExists = $parentCache->inCache($parentMount->getInternalPath($absoluteParent));
-			$this->folderExistsCache->set($parent, $parentExists);
-		}
-		if (!$parentExists) {
-			$parent = Helper::getShareFolder($recipientView, $user->getUID());
-			/** @psalm-suppress InternalMethod */
-			$absoluteParent = $recipientView->getAbsolutePath($parent);
-		}
-
-		$newAbsoluteMountPoint = $this->generateUniqueTarget(
-			$share,
-			Filesystem::normalizePath($absoluteParent . '/' . $mountPoint),
-			$parentMount,
-			$allCachedMounts,
-		);
-
-		/** @psalm-suppress InternalMethod */
-		$newMountPoint = $recipientView->getRelativePath($newAbsoluteMountPoint);
-		if ($newMountPoint === null) {
-			return $share->getTarget();
-		}
-
-		if ($newMountPoint !== $share->getTarget()) {
-			$this->updateFileTarget($user, $newMountPoint, $share, $childShares);
-		}
-
-		return $newMountPoint;
-	}
-
-
-	/**
-	 * @param ICachedMountInfo[] $allCachedMounts
-	 */
-	private function generateUniqueTarget(
-		IShare $share,
-		string $absolutePath,
-		IMountPoint $parentMount,
-		array $allCachedMounts,
-	): string {
-		$pathInfo = pathinfo($absolutePath);
-		$ext = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
-		$name = $pathInfo['filename'];
-		$dir = $pathInfo['dirname'];
-
-		$i = 2;
-		$parentCache = $parentMount->getStorage()->getCache();
-		$internalPath = $parentMount->getInternalPath($absolutePath);
-		while ($parentCache->inCache($internalPath) || $this->hasConflictingMount($share, $allCachedMounts, $absolutePath)) {
-			$absolutePath = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$internalPath = $parentMount->getInternalPath($absolutePath);
-			$i++;
-		}
-
-		return $absolutePath;
-	}
-
-	/**
-	 * @param ICachedMountInfo[] $allCachedMounts
-	 */
-	private function hasConflictingMount(IShare $share, array $allCachedMounts, string $absolutePath): bool {
-		if (!isset($allCachedMounts[$absolutePath . '/'])) {
-			return false;
-		}
-
-		$mount = $allCachedMounts[$absolutePath . '/'];
-		if ($mount->getMountProvider() === MountProvider::class && $mount->getRootId() === $share->getNodeId()) {
-			// "conflicting" mount is a mount for the current share
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param IShare[] $childShares
-	 */
-	private function updateFileTarget(IUser $user, string $newPath, IShare &$share, array $childShares) {
-		$share->setTarget($newPath);
-
-		foreach ($childShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			$this->shareManager->moveShare($tmpShare, $user->getUID());
-		}
-	}
+    private CappedMemoryCache $folderExistsCache;
+
+    public function __construct(
+        private readonly IManager $shareManager,
+        private readonly IEventDispatcher $eventDispatcher,
+        private readonly SetupManager $setupManager,
+        private readonly IMountManager $mountManager,
+    ) {
+        $this->folderExistsCache = new CappedMemoryCache();
+    }
+
+    private function getViewForUser(IUser $user): View {
+        /**
+         * @psalm-suppress InternalClass
+         * @psalm-suppress InternalMethod
+         */
+        return new View('/' . $user->getUID() . '/files');
+    }
+
+    /**
+     * check if the parent folder exists otherwise move the mount point up
+     *
+     * @param array<string, ICachedMountInfo> $allCachedMounts Other mounts for the user, indexed by path
+     * @param IShare[] $childShares
+     * @return string
+     */
+    public function verifyMountPoint(
+        IUser $user,
+        IShare &$share,
+        array $allCachedMounts,
+        array $childShares,
+    ): string {
+        $mountPoint = basename($share->getTarget());
+        $parent = dirname($share->getTarget());
+
+        $recipientView = $this->getViewForUser($user);
+        $event = new VerifyMountPointEvent($share, $recipientView, $parent);
+        $this->eventDispatcher->dispatchTyped($event);
+        $parent = $event->getParent();
+
+        /** @psalm-suppress InternalMethod */
+        $absoluteParent = $recipientView->getAbsolutePath($parent);
+        $this->setupManager->setupForPath($absoluteParent);
+        $parentMount = $this->mountManager->find($absoluteParent);
+
+        $cached = $this->folderExistsCache->get($parent);
+        if ($cached) {
+            $parentExists = $cached;
+        } else {
+            $parentCache = $parentMount->getStorage()->getCache();
+            $parentExists = $parentCache->inCache($parentMount->getInternalPath($absoluteParent));
+            $this->folderExistsCache->set($parent, $parentExists);
+        }
+        if (!$parentExists) {
+            $parent = Helper::getShareFolder($recipientView, $user->getUID());
+            /** @psalm-suppress InternalMethod */
+            $absoluteParent = $recipientView->getAbsolutePath($parent);
+        }
+
+        $newAbsoluteMountPoint = $this->generateUniqueTarget(
+            $share,
+            Filesystem::normalizePath($absoluteParent . '/' . $mountPoint),
+            $parentMount,
+            $allCachedMounts,
+        );
+
+        /** @psalm-suppress InternalMethod */
+        $newMountPoint = $recipientView->getRelativePath($newAbsoluteMountPoint);
+        if ($newMountPoint === null) {
+            return $share->getTarget();
+        }
+
+        if ($newMountPoint !== $share->getTarget()) {
+            $this->updateFileTarget($user, $newMountPoint, $share, $childShares);
+        }
+
+        return $newMountPoint;
+    }
+
+
+    /**
+     * @param ICachedMountInfo[] $allCachedMounts
+     */
+    private function generateUniqueTarget(
+        IShare $share,
+        string $absolutePath,
+        IMountPoint $parentMount,
+        array $allCachedMounts,
+    ): string {
+        $pathInfo = pathinfo($absolutePath);
+        $ext = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
+        $name = $pathInfo['filename'];
+        $dir = $pathInfo['dirname'];
+
+        $i = 2;
+        $parentCache = $parentMount->getStorage()->getCache();
+        $internalPath = $parentMount->getInternalPath($absolutePath);
+        while ($parentCache->inCache($internalPath) || $this->hasConflictingMount($share, $allCachedMounts, $absolutePath)) {
+            $absolutePath = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+            $internalPath = $parentMount->getInternalPath($absolutePath);
+            $i++;
+        }
+
+        return $absolutePath;
+    }
+
+    /**
+     * @param ICachedMountInfo[] $allCachedMounts
+     */
+    private function hasConflictingMount(IShare $share, array $allCachedMounts, string $absolutePath): bool {
+        if (!isset($allCachedMounts[$absolutePath . '/'])) {
+            return false;
+        }
+
+        $mount = $allCachedMounts[$absolutePath . '/'];
+        if ($mount->getMountProvider() === MountProvider::class && $mount->getRootId() === $share->getNodeId()) {
+            // "conflicting" mount is a mount for the current share
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param IShare[] $childShares
+     */
+    private function updateFileTarget(IUser $user, string $newPath, IShare &$share, array $childShares) {
+        $share->setTarget($newPath);
+
+        foreach ($childShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            $this->shareManager->moveShare($tmpShare, $user->getUID());
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 		 * @psalm-suppress InternalClass
 		 * @psalm-suppress InternalMethod
 		 */
-		return new View('/' . $user->getUID() . '/files');
+		return new View('/'.$user->getUID().'/files');
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	public function verifyMountPoint(
 		IUser $user,
-		IShare &$share,
+		IShare & $share,
 		array $allCachedMounts,
 		array $childShares,
 	): string {
@@ -86,7 +86,7 @@ 
 
 		$newAbsoluteMountPoint = $this->generateUniqueTarget(
 			$share,
-			Filesystem::normalizePath($absoluteParent . '/' . $mountPoint),
+			Filesystem::normalizePath($absoluteParent.'/'.$mountPoint),
 			$parentMount,
 			$allCachedMounts,
 		);
@@ -115,7 +115,7 @@ 
 		array $allCachedMounts,
 	): string {
 		$pathInfo = pathinfo($absolutePath);
-		$ext = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
+		$ext = isset($pathInfo['extension']) ? '.'.$pathInfo['extension'] : '';
 		$name = $pathInfo['filename'];
 		$dir = $pathInfo['dirname'];
 
@@ -123,7 +123,7 @@ 
 		$parentCache = $parentMount->getStorage()->getCache();
 		$internalPath = $parentMount->getInternalPath($absolutePath);
 		while ($parentCache->inCache($internalPath) || $this->hasConflictingMount($share, $allCachedMounts, $absolutePath)) {
-			$absolutePath = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+			$absolutePath = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
 			$internalPath = $parentMount->getInternalPath($absolutePath);
 			$i++;
 		}
@@ -135,11 +135,11 @@ 
 	 * @param ICachedMountInfo[] $allCachedMounts
 	 */
 	private function hasConflictingMount(IShare $share, array $allCachedMounts, string $absolutePath): bool {
-		if (!isset($allCachedMounts[$absolutePath . '/'])) {
+		if (!isset($allCachedMounts[$absolutePath.'/'])) {
 			return false;
 		}
 
-		$mount = $allCachedMounts[$absolutePath . '/'];
+		$mount = $allCachedMounts[$absolutePath.'/'];
 		if ($mount->getMountProvider() === MountProvider::class && $mount->getRootId() === $share->getNodeId()) {
 			// "conflicting" mount is a mount for the current share
 			return false;
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param IShare[] $childShares
 	 */
-	private function updateFileTarget(IUser $user, string $newPath, IShare &$share, array $childShares) {
+	private function updateFileTarget(IUser $user, string $newPath, IShare & $share, array $childShares) {
 		$share->setTarget($newPath);
 
 		foreach ($childShares as $tmpShare) {

apps/files_sharing/composer/composer/autoload_static.php

Spacing +104 added lines, -104 removed lines

@@ -6,123 +6,123 @@
 
 class ComposerStaticInitFiles_Sharing
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' =>
-        array (
+        array(
             'OCA\\Files_Sharing\\' => 18,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files_Sharing\\' =>
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Files_Sharing\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Base' => __DIR__ . '/..' . '/../lib/Activity/Providers/Base.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => __DIR__ . '/..' . '/../lib/Activity/Providers/Downloads.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => __DIR__ . '/..' . '/../lib/Activity/Providers/Groups.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Providers/PublicLinks.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => __DIR__ . '/..' . '/../lib/Activity/Providers/RemoteShares.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__ . '/..' . '/../lib/Activity/Providers/Users.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Settings/PublicLinks.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinksUpload' => __DIR__ . '/..' . '/../lib/Activity/Settings/PublicLinksUpload.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__ . '/..' . '/../lib/Activity/Settings/RemoteShare.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\ShareActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/ShareActivitySettings.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__ . '/..' . '/../lib/Activity/Settings/Shared.php',
-        'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
-        'OCA\\Files_Sharing\\Cache' => __DIR__ . '/..' . '/../lib/Cache.php',
-        'OCA\\Files_Sharing\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => __DIR__ . '/..' . '/../lib/Collaboration/ShareRecipientSorter.php',
-        'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => __DIR__ . '/..' . '/../lib/Command/CleanupRemoteStorages.php',
-        'OCA\\Files_Sharing\\Command\\DeleteOrphanShares' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanShares.php',
-        'OCA\\Files_Sharing\\Command\\ExiprationNotification' => __DIR__ . '/..' . '/../lib/Command/ExiprationNotification.php',
-        'OCA\\Files_Sharing\\Command\\FixShareOwners' => __DIR__ . '/..' . '/../lib/Command/FixShareOwners.php',
-        'OCA\\Files_Sharing\\Command\\ListShares' => __DIR__ . '/..' . '/../lib/Command/ListShares.php',
-        'OCA\\Files_Sharing\\Config\\ConfigLexicon' => __DIR__ . '/..' . '/../lib/Config/ConfigLexicon.php',
-        'OCA\\Files_Sharing\\Controller\\AcceptController' => __DIR__ . '/..' . '/../lib/Controller/AcceptController.php',
-        'OCA\\Files_Sharing\\Controller\\DeletedShareAPIController' => __DIR__ . '/..' . '/../lib/Controller/DeletedShareAPIController.php',
-        'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => __DIR__ . '/..' . '/../lib/Controller/ExternalSharesController.php',
-        'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => __DIR__ . '/..' . '/../lib/Controller/PublicPreviewController.php',
-        'OCA\\Files_Sharing\\Controller\\RemoteController' => __DIR__ . '/..' . '/../lib/Controller/RemoteController.php',
-        'OCA\\Files_Sharing\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareAPIController' => __DIR__ . '/..' . '/../lib/Controller/ShareAPIController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareController' => __DIR__ . '/..' . '/../lib/Controller/ShareController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareInfoController' => __DIR__ . '/..' . '/../lib/Controller/ShareInfoController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => __DIR__ . '/..' . '/../lib/Controller/ShareesAPIController.php',
-        'OCA\\Files_Sharing\\DefaultPublicShareTemplateProvider' => __DIR__ . '/..' . '/../lib/DefaultPublicShareTemplateProvider.php',
-        'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => __DIR__ . '/..' . '/../lib/DeleteOrphanedSharesJob.php',
-        'OCA\\Files_Sharing\\Event\\BeforeTemplateRenderedEvent' => __DIR__ . '/..' . '/../lib/Event/BeforeTemplateRenderedEvent.php',
-        'OCA\\Files_Sharing\\Event\\ShareLinkAccessedEvent' => __DIR__ . '/..' . '/../lib/Event/ShareLinkAccessedEvent.php',
-        'OCA\\Files_Sharing\\Event\\ShareMountedEvent' => __DIR__ . '/..' . '/../lib/Event/ShareMountedEvent.php',
-        'OCA\\Files_Sharing\\Event\\UserShareAccessUpdatedEvent' => __DIR__ . '/..' . '/../lib/Event/UserShareAccessUpdatedEvent.php',
-        'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => __DIR__ . '/..' . '/../lib/Exceptions/BrokenPath.php',
-        'OCA\\Files_Sharing\\Exceptions\\S2SException' => __DIR__ . '/..' . '/../lib/Exceptions/S2SException.php',
-        'OCA\\Files_Sharing\\Exceptions\\SharingRightsException' => __DIR__ . '/..' . '/../lib/Exceptions/SharingRightsException.php',
-        'OCA\\Files_Sharing\\ExpireSharesJob' => __DIR__ . '/..' . '/../lib/ExpireSharesJob.php',
-        'OCA\\Files_Sharing\\External\\Cache' => __DIR__ . '/..' . '/../lib/External/Cache.php',
-        'OCA\\Files_Sharing\\External\\ExternalShare' => __DIR__ . '/..' . '/../lib/External/ExternalShare.php',
-        'OCA\\Files_Sharing\\External\\ExternalShareMapper' => __DIR__ . '/..' . '/../lib/External/ExternalShareMapper.php',
-        'OCA\\Files_Sharing\\External\\Manager' => __DIR__ . '/..' . '/../lib/External/Manager.php',
-        'OCA\\Files_Sharing\\External\\Mount' => __DIR__ . '/..' . '/../lib/External/Mount.php',
-        'OCA\\Files_Sharing\\External\\MountProvider' => __DIR__ . '/..' . '/../lib/External/MountProvider.php',
-        'OCA\\Files_Sharing\\External\\Scanner' => __DIR__ . '/..' . '/../lib/External/Scanner.php',
-        'OCA\\Files_Sharing\\External\\Storage' => __DIR__ . '/..' . '/../lib/External/Storage.php',
-        'OCA\\Files_Sharing\\External\\Watcher' => __DIR__ . '/..' . '/../lib/External/Watcher.php',
-        'OCA\\Files_Sharing\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files_Sharing\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
-        'OCA\\Files_Sharing\\ISharedMountPoint' => __DIR__ . '/..' . '/../lib/ISharedMountPoint.php',
-        'OCA\\Files_Sharing\\ISharedStorage' => __DIR__ . '/..' . '/../lib/ISharedStorage.php',
-        'OCA\\Files_Sharing\\Listener\\BeforeDirectFileDownloadListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeDirectFileDownloadListener.php',
-        'OCA\\Files_Sharing\\Listener\\BeforeNodeReadListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeNodeReadListener.php',
-        'OCA\\Files_Sharing\\Listener\\BeforeZipCreatedListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeZipCreatedListener.php',
-        'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php',
-        'OCA\\Files_Sharing\\Listener\\LoadPublicFileRequestAuthListener' => __DIR__ . '/..' . '/../lib/Listener/LoadPublicFileRequestAuthListener.php',
-        'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
-        'OCA\\Files_Sharing\\Listener\\ShareInteractionListener' => __DIR__ . '/..' . '/../lib/Listener/ShareInteractionListener.php',
-        'OCA\\Files_Sharing\\Listener\\SharesUpdatedListener' => __DIR__ . '/..' . '/../lib/Listener/SharesUpdatedListener.php',
-        'OCA\\Files_Sharing\\Listener\\UserAddedToGroupListener' => __DIR__ . '/..' . '/../lib/Listener/UserAddedToGroupListener.php',
-        'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => __DIR__ . '/..' . '/../lib/Listener/UserShareAcceptanceListener.php',
-        'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/OCSShareAPIMiddleware.php',
-        'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ShareInfoMiddleware.php',
-        'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SharingCheckMiddleware.php',
-        'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__ . '/..' . '/../lib/Migration/OwncloudGuestShareType.php',
-        'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => __DIR__ . '/..' . '/../lib/Migration/SetAcceptedStatus.php',
-        'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__ . '/..' . '/../lib/Migration/SetPasswordColumn.php',
-        'OCA\\Files_Sharing\\Migration\\Version11300Date20201120141438' => __DIR__ . '/..' . '/../lib/Migration/Version11300Date20201120141438.php',
-        'OCA\\Files_Sharing\\Migration\\Version21000Date20201223143245' => __DIR__ . '/..' . '/../lib/Migration/Version21000Date20201223143245.php',
-        'OCA\\Files_Sharing\\Migration\\Version22000Date20210216084241' => __DIR__ . '/..' . '/../lib/Migration/Version22000Date20210216084241.php',
-        'OCA\\Files_Sharing\\Migration\\Version24000Date20220208195521' => __DIR__ . '/..' . '/../lib/Migration/Version24000Date20220208195521.php',
-        'OCA\\Files_Sharing\\Migration\\Version24000Date20220404142216' => __DIR__ . '/..' . '/../lib/Migration/Version24000Date20220404142216.php',
-        'OCA\\Files_Sharing\\Migration\\Version31000Date20240821142813' => __DIR__ . '/..' . '/../lib/Migration/Version31000Date20240821142813.php',
-        'OCA\\Files_Sharing\\Migration\\Version32000Date20251017081948' => __DIR__ . '/..' . '/../lib/Migration/Version32000Date20251017081948.php',
-        'OCA\\Files_Sharing\\Migration\\Version33000Date20251030081948' => __DIR__ . '/..' . '/../lib/Migration/Version33000Date20251030081948.php',
-        'OCA\\Files_Sharing\\MountProvider' => __DIR__ . '/..' . '/../lib/MountProvider.php',
-        'OCA\\Files_Sharing\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
-        'OCA\\Files_Sharing\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\Files_Sharing\\OpenMetrics\\SharesCountMetric' => __DIR__ . '/..' . '/../lib/OpenMetrics/SharesCountMetric.php',
-        'OCA\\Files_Sharing\\OrphanHelper' => __DIR__ . '/..' . '/../lib/OrphanHelper.php',
-        'OCA\\Files_Sharing\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
-        'OCA\\Files_Sharing\\Scanner' => __DIR__ . '/..' . '/../lib/Scanner.php',
-        'OCA\\Files_Sharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__ . '/..' . '/../lib/ShareBackend/File.php',
-        'OCA\\Files_Sharing\\ShareBackend\\Folder' => __DIR__ . '/..' . '/../lib/ShareBackend/Folder.php',
-        'OCA\\Files_Sharing\\ShareTargetValidator' => __DIR__ . '/..' . '/../lib/ShareTargetValidator.php',
-        'OCA\\Files_Sharing\\SharedMount' => __DIR__ . '/..' . '/../lib/SharedMount.php',
-        'OCA\\Files_Sharing\\SharedStorage' => __DIR__ . '/..' . '/../lib/SharedStorage.php',
-        'OCA\\Files_Sharing\\SharesReminderJob' => __DIR__ . '/..' . '/../lib/SharesReminderJob.php',
-        'OCA\\Files_Sharing\\Updater' => __DIR__ . '/..' . '/../lib/Updater.php',
-        'OCA\\Files_Sharing\\ViewOnly' => __DIR__ . '/..' . '/../lib/ViewOnly.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Files_Sharing\\Activity\\Filter' => __DIR__.'/..'.'/../lib/Activity/Filter.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Base' => __DIR__.'/..'.'/../lib/Activity/Providers/Base.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => __DIR__.'/..'.'/../lib/Activity/Providers/Downloads.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => __DIR__.'/..'.'/../lib/Activity/Providers/Groups.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => __DIR__.'/..'.'/../lib/Activity/Providers/PublicLinks.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => __DIR__.'/..'.'/../lib/Activity/Providers/RemoteShares.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__.'/..'.'/../lib/Activity/Providers/Users.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__.'/..'.'/../lib/Activity/Settings/PublicLinks.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinksUpload' => __DIR__.'/..'.'/../lib/Activity/Settings/PublicLinksUpload.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__.'/..'.'/../lib/Activity/Settings/RemoteShare.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\ShareActivitySettings' => __DIR__.'/..'.'/../lib/Activity/Settings/ShareActivitySettings.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__.'/..'.'/../lib/Activity/Settings/Shared.php',
+        'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => __DIR__.'/..'.'/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
+        'OCA\\Files_Sharing\\Cache' => __DIR__.'/..'.'/../lib/Cache.php',
+        'OCA\\Files_Sharing\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => __DIR__.'/..'.'/../lib/Collaboration/ShareRecipientSorter.php',
+        'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => __DIR__.'/..'.'/../lib/Command/CleanupRemoteStorages.php',
+        'OCA\\Files_Sharing\\Command\\DeleteOrphanShares' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanShares.php',
+        'OCA\\Files_Sharing\\Command\\ExiprationNotification' => __DIR__.'/..'.'/../lib/Command/ExiprationNotification.php',
+        'OCA\\Files_Sharing\\Command\\FixShareOwners' => __DIR__.'/..'.'/../lib/Command/FixShareOwners.php',
+        'OCA\\Files_Sharing\\Command\\ListShares' => __DIR__.'/..'.'/../lib/Command/ListShares.php',
+        'OCA\\Files_Sharing\\Config\\ConfigLexicon' => __DIR__.'/..'.'/../lib/Config/ConfigLexicon.php',
+        'OCA\\Files_Sharing\\Controller\\AcceptController' => __DIR__.'/..'.'/../lib/Controller/AcceptController.php',
+        'OCA\\Files_Sharing\\Controller\\DeletedShareAPIController' => __DIR__.'/..'.'/../lib/Controller/DeletedShareAPIController.php',
+        'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => __DIR__.'/..'.'/../lib/Controller/ExternalSharesController.php',
+        'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => __DIR__.'/..'.'/../lib/Controller/PublicPreviewController.php',
+        'OCA\\Files_Sharing\\Controller\\RemoteController' => __DIR__.'/..'.'/../lib/Controller/RemoteController.php',
+        'OCA\\Files_Sharing\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareAPIController' => __DIR__.'/..'.'/../lib/Controller/ShareAPIController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareController' => __DIR__.'/..'.'/../lib/Controller/ShareController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareInfoController' => __DIR__.'/..'.'/../lib/Controller/ShareInfoController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => __DIR__.'/..'.'/../lib/Controller/ShareesAPIController.php',
+        'OCA\\Files_Sharing\\DefaultPublicShareTemplateProvider' => __DIR__.'/..'.'/../lib/DefaultPublicShareTemplateProvider.php',
+        'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => __DIR__.'/..'.'/../lib/DeleteOrphanedSharesJob.php',
+        'OCA\\Files_Sharing\\Event\\BeforeTemplateRenderedEvent' => __DIR__.'/..'.'/../lib/Event/BeforeTemplateRenderedEvent.php',
+        'OCA\\Files_Sharing\\Event\\ShareLinkAccessedEvent' => __DIR__.'/..'.'/../lib/Event/ShareLinkAccessedEvent.php',
+        'OCA\\Files_Sharing\\Event\\ShareMountedEvent' => __DIR__.'/..'.'/../lib/Event/ShareMountedEvent.php',
+        'OCA\\Files_Sharing\\Event\\UserShareAccessUpdatedEvent' => __DIR__.'/..'.'/../lib/Event/UserShareAccessUpdatedEvent.php',
+        'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => __DIR__.'/..'.'/../lib/Exceptions/BrokenPath.php',
+        'OCA\\Files_Sharing\\Exceptions\\S2SException' => __DIR__.'/..'.'/../lib/Exceptions/S2SException.php',
+        'OCA\\Files_Sharing\\Exceptions\\SharingRightsException' => __DIR__.'/..'.'/../lib/Exceptions/SharingRightsException.php',
+        'OCA\\Files_Sharing\\ExpireSharesJob' => __DIR__.'/..'.'/../lib/ExpireSharesJob.php',
+        'OCA\\Files_Sharing\\External\\Cache' => __DIR__.'/..'.'/../lib/External/Cache.php',
+        'OCA\\Files_Sharing\\External\\ExternalShare' => __DIR__.'/..'.'/../lib/External/ExternalShare.php',
+        'OCA\\Files_Sharing\\External\\ExternalShareMapper' => __DIR__.'/..'.'/../lib/External/ExternalShareMapper.php',
+        'OCA\\Files_Sharing\\External\\Manager' => __DIR__.'/..'.'/../lib/External/Manager.php',
+        'OCA\\Files_Sharing\\External\\Mount' => __DIR__.'/..'.'/../lib/External/Mount.php',
+        'OCA\\Files_Sharing\\External\\MountProvider' => __DIR__.'/..'.'/../lib/External/MountProvider.php',
+        'OCA\\Files_Sharing\\External\\Scanner' => __DIR__.'/..'.'/../lib/External/Scanner.php',
+        'OCA\\Files_Sharing\\External\\Storage' => __DIR__.'/..'.'/../lib/External/Storage.php',
+        'OCA\\Files_Sharing\\External\\Watcher' => __DIR__.'/..'.'/../lib/External/Watcher.php',
+        'OCA\\Files_Sharing\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files_Sharing\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
+        'OCA\\Files_Sharing\\ISharedMountPoint' => __DIR__.'/..'.'/../lib/ISharedMountPoint.php',
+        'OCA\\Files_Sharing\\ISharedStorage' => __DIR__.'/..'.'/../lib/ISharedStorage.php',
+        'OCA\\Files_Sharing\\Listener\\BeforeDirectFileDownloadListener' => __DIR__.'/..'.'/../lib/Listener/BeforeDirectFileDownloadListener.php',
+        'OCA\\Files_Sharing\\Listener\\BeforeNodeReadListener' => __DIR__.'/..'.'/../lib/Listener/BeforeNodeReadListener.php',
+        'OCA\\Files_Sharing\\Listener\\BeforeZipCreatedListener' => __DIR__.'/..'.'/../lib/Listener/BeforeZipCreatedListener.php',
+        'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => __DIR__.'/..'.'/../lib/Listener/LoadAdditionalListener.php',
+        'OCA\\Files_Sharing\\Listener\\LoadPublicFileRequestAuthListener' => __DIR__.'/..'.'/../lib/Listener/LoadPublicFileRequestAuthListener.php',
+        'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarListener.php',
+        'OCA\\Files_Sharing\\Listener\\ShareInteractionListener' => __DIR__.'/..'.'/../lib/Listener/ShareInteractionListener.php',
+        'OCA\\Files_Sharing\\Listener\\SharesUpdatedListener' => __DIR__.'/..'.'/../lib/Listener/SharesUpdatedListener.php',
+        'OCA\\Files_Sharing\\Listener\\UserAddedToGroupListener' => __DIR__.'/..'.'/../lib/Listener/UserAddedToGroupListener.php',
+        'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => __DIR__.'/..'.'/../lib/Listener/UserShareAcceptanceListener.php',
+        'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => __DIR__.'/..'.'/../lib/Middleware/OCSShareAPIMiddleware.php',
+        'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => __DIR__.'/..'.'/../lib/Middleware/ShareInfoMiddleware.php',
+        'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => __DIR__.'/..'.'/../lib/Middleware/SharingCheckMiddleware.php',
+        'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__.'/..'.'/../lib/Migration/OwncloudGuestShareType.php',
+        'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => __DIR__.'/..'.'/../lib/Migration/SetAcceptedStatus.php',
+        'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__.'/..'.'/../lib/Migration/SetPasswordColumn.php',
+        'OCA\\Files_Sharing\\Migration\\Version11300Date20201120141438' => __DIR__.'/..'.'/../lib/Migration/Version11300Date20201120141438.php',
+        'OCA\\Files_Sharing\\Migration\\Version21000Date20201223143245' => __DIR__.'/..'.'/../lib/Migration/Version21000Date20201223143245.php',
+        'OCA\\Files_Sharing\\Migration\\Version22000Date20210216084241' => __DIR__.'/..'.'/../lib/Migration/Version22000Date20210216084241.php',
+        'OCA\\Files_Sharing\\Migration\\Version24000Date20220208195521' => __DIR__.'/..'.'/../lib/Migration/Version24000Date20220208195521.php',
+        'OCA\\Files_Sharing\\Migration\\Version24000Date20220404142216' => __DIR__.'/..'.'/../lib/Migration/Version24000Date20220404142216.php',
+        'OCA\\Files_Sharing\\Migration\\Version31000Date20240821142813' => __DIR__.'/..'.'/../lib/Migration/Version31000Date20240821142813.php',
+        'OCA\\Files_Sharing\\Migration\\Version32000Date20251017081948' => __DIR__.'/..'.'/../lib/Migration/Version32000Date20251017081948.php',
+        'OCA\\Files_Sharing\\Migration\\Version33000Date20251030081948' => __DIR__.'/..'.'/../lib/Migration/Version33000Date20251030081948.php',
+        'OCA\\Files_Sharing\\MountProvider' => __DIR__.'/..'.'/../lib/MountProvider.php',
+        'OCA\\Files_Sharing\\Notification\\Listener' => __DIR__.'/..'.'/../lib/Notification/Listener.php',
+        'OCA\\Files_Sharing\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\Files_Sharing\\OpenMetrics\\SharesCountMetric' => __DIR__.'/..'.'/../lib/OpenMetrics/SharesCountMetric.php',
+        'OCA\\Files_Sharing\\OrphanHelper' => __DIR__.'/..'.'/../lib/OrphanHelper.php',
+        'OCA\\Files_Sharing\\ResponseDefinitions' => __DIR__.'/..'.'/../lib/ResponseDefinitions.php',
+        'OCA\\Files_Sharing\\Scanner' => __DIR__.'/..'.'/../lib/Scanner.php',
+        'OCA\\Files_Sharing\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__.'/..'.'/../lib/ShareBackend/File.php',
+        'OCA\\Files_Sharing\\ShareBackend\\Folder' => __DIR__.'/..'.'/../lib/ShareBackend/Folder.php',
+        'OCA\\Files_Sharing\\ShareTargetValidator' => __DIR__.'/..'.'/../lib/ShareTargetValidator.php',
+        'OCA\\Files_Sharing\\SharedMount' => __DIR__.'/..'.'/../lib/SharedMount.php',
+        'OCA\\Files_Sharing\\SharedStorage' => __DIR__.'/..'.'/../lib/SharedStorage.php',
+        'OCA\\Files_Sharing\\SharesReminderJob' => __DIR__.'/..'.'/../lib/SharesReminderJob.php',
+        'OCA\\Files_Sharing\\Updater' => __DIR__.'/..'.'/../lib/Updater.php',
+        'OCA\\Files_Sharing\\ViewOnly' => __DIR__.'/..'.'/../lib/ViewOnly.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Sharing::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles_Sharing::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles_Sharing::$classMap;