nextcloud / server

tests/lib/Preview/PreviewServiceTest.php

Indentation +35 added lines, -35 removed lines

@@ -22,39 +22,39 @@
  */
 #[CoversClass(PreviewService::class)]
 class PreviewServiceTest extends TestCase {
-	private PreviewService $previewService;
-	private PreviewMapper $previewMapper;
-
-	protected function setUp(): void {
-		$this->previewService = Server::get(PreviewService::class);
-		$this->previewMapper = Server::get(PreviewMapper::class);
-		$this->previewService->deleteAll();
-	}
-
-	public function tearDown(): void {
-		$this->previewService->deleteAll();
-	}
-
-	public function testGetAvailableFileIds(): void {
-		foreach (range(1, 20) as $i) {
-			$preview = new Preview();
-			$preview->setFileId($i % 10);
-			$preview->setStorageId(1);
-			$preview->setWidth($i);
-			$preview->setHeight($i);
-			$preview->setMax(true);
-			$preview->setSourceMimeType('image/jpeg');
-			$preview->setCropped(true);
-			$preview->setEncrypted(false);
-			$preview->setMimetype('image/jpeg');
-			$preview->setEtag('abc');
-			$preview->setMtime((new \DateTime())->getTimestamp());
-			$preview->setSize(0);
-			$this->previewMapper->insert($preview);
-		}
-
-		$files = iterator_to_array($this->previewService->getAvailableFileIds());
-		$this->assertCount(1, $files);
-		$this->assertCount(10, $files[0]['fileIds']);
-	}
+    private PreviewService $previewService;
+    private PreviewMapper $previewMapper;
+
+    protected function setUp(): void {
+        $this->previewService = Server::get(PreviewService::class);
+        $this->previewMapper = Server::get(PreviewMapper::class);
+        $this->previewService->deleteAll();
+    }
+
+    public function tearDown(): void {
+        $this->previewService->deleteAll();
+    }
+
+    public function testGetAvailableFileIds(): void {
+        foreach (range(1, 20) as $i) {
+            $preview = new Preview();
+            $preview->setFileId($i % 10);
+            $preview->setStorageId(1);
+            $preview->setWidth($i);
+            $preview->setHeight($i);
+            $preview->setMax(true);
+            $preview->setSourceMimeType('image/jpeg');
+            $preview->setCropped(true);
+            $preview->setEncrypted(false);
+            $preview->setMimetype('image/jpeg');
+            $preview->setEtag('abc');
+            $preview->setMtime((new \DateTime())->getTimestamp());
+            $preview->setSize(0);
+            $this->previewMapper->insert($preview);
+        }
+
+        $files = iterator_to_array($this->previewService->getAvailableFileIds());
+        $this->assertCount(1, $files);
+        $this->assertCount(10, $files[0]['fileIds']);
+    }
 }

tests/lib/Preview/MovePreviewJobTest.php

Indentation +188 added lines, -188 removed lines

@@ -33,192 +33,192 @@
  * @group DB
  */
 class MovePreviewJobTest extends TestCase {
-	private IAppData $previewAppData;
-	private PreviewMapper $previewMapper;
-	private IAppConfig&MockObject $appConfig;
-	private IConfig $config;
-	private StorageFactory $storageFactory;
-	private PreviewService $previewService;
-	private IDBConnection $db;
-	private IMimeTypeLoader&MockObject $mimeTypeLoader;
-	private IMimeTypeDetector&MockObject $mimeTypeDetector;
-	private LoggerInterface&MockObject $logger;
-
-	public function setUp(): void {
-		parent::setUp();
-		$this->previewAppData = Server::get(IAppDataFactory::class)->get('preview');
-		$this->previewMapper = Server::get(PreviewMapper::class);
-		$this->config = Server::get(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->appConfig->expects($this->any())
-			->method('getValueBool')
-			->willReturn(false);
-		$this->appConfig->expects($this->any())
-			->method('setValueBool')
-			->willReturn(true);
-		$this->storageFactory = Server::get(StorageFactory::class);
-		$this->previewService = Server::get(PreviewService::class);
-		$this->db = Server::get(IDBConnection::class);
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter(5)))
-			->executeStatement();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->insert('filecache')
-			->values([
-				'fileid' => $qb->createNamedParameter(5),
-				'storage' => $qb->createNamedParameter(1),
-				'path' => $qb->createNamedParameter('test/abc'),
-				'path_hash' => $qb->createNamedParameter(md5('test')),
-				'parent' => $qb->createNamedParameter(0),
-				'name' => $qb->createNamedParameter('abc'),
-				'mimetype' => $qb->createNamedParameter(42),
-				'size' => $qb->createNamedParameter(1000),
-				'mtime' => $qb->createNamedParameter(1000),
-				'storage_mtime' => $qb->createNamedParameter(1000),
-				'encrypted' => $qb->createNamedParameter(0),
-				'unencrypted_size' => $qb->createNamedParameter(0),
-				'etag' => $qb->createNamedParameter('abcdefg'),
-				'permissions' => $qb->createNamedParameter(0),
-				'checksum' => $qb->createNamedParameter('abcdefg'),
-			])->executeStatement();
-
-		$this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
-		$this->mimeTypeDetector->method('detectPath')->willReturn('image/png');
-		$this->mimeTypeLoader = $this->createMock(IMimeTypeLoader::class);
-		$this->mimeTypeLoader->method('getId')->with('image/png')->willReturn(42);
-		$this->mimeTypeLoader->method('getMimetypeById')->with(42)->willReturn('image/png');
-		$this->logger = $this->createMock(LoggerInterface::class);
-	}
-
-	public function tearDown(): void {
-		foreach ($this->previewAppData->getDirectoryListing() as $folder) {
-			$folder->delete();
-		}
-		$this->previewService->deleteAll();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter(5)))
-			->executeStatement();
-	}
-
-	#[TestDox('Test the migration from the legacy flat hierarchy to the new database format')]
-	public function testMigrationLegacyPath(): void {
-		$folder = $this->previewAppData->newFolder('5');
-		$folder->newFile('64-64-crop.jpg', 'abcdefg');
-		$folder->newFile('128-128-crop.png', 'abcdefg');
-		$this->assertEquals(1, count($this->previewAppData->getDirectoryListing()));
-		$this->assertEquals(2, count($folder->getDirectoryListing()));
-		$this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
-
-		$job = new MovePreviewJob(
-			Server::get(ITimeFactory::class),
-			$this->appConfig,
-			$this->config,
-			$this->previewMapper,
-			$this->storageFactory,
-			Server::get(IDBConnection::class),
-			Server::get(IRootFolder::class),
-			$this->mimeTypeDetector,
-			$this->mimeTypeLoader,
-			$this->logger,
-			Server::get(IAppDataFactory::class),
-		);
-		$this->invokePrivate($job, 'run', [[]]);
-		$this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
-		$this->assertEquals(2, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
-	}
-
-	private static function getInternalFolder(string $name): string {
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
-	}
-
-	#[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
-	public function testMigrationPath(): void {
-		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
-		$folder->newFile('64-64-crop.jpg', 'abcdefg');
-		$folder->newFile('128-128-crop.png', 'abcdefg');
-
-		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
-		$this->assertEquals(2, count($folder->getDirectoryListing()));
-		$this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
-
-		$job = new MovePreviewJob(
-			Server::get(ITimeFactory::class),
-			$this->appConfig,
-			$this->config,
-			$this->previewMapper,
-			$this->storageFactory,
-			Server::get(IDBConnection::class),
-			Server::get(IRootFolder::class),
-			$this->mimeTypeDetector,
-			$this->mimeTypeLoader,
-			$this->logger,
-			Server::get(IAppDataFactory::class)
-		);
-		$this->invokePrivate($job, 'run', [[]]);
-		$this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
-		$this->assertEquals(2, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
-	}
-
-	#[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
-	public function testMigrationPathWithVersion(): void {
-		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
-		// No version
-		$folder->newFile('128-128-crop.png', 'abcdefg');
-		$folder->newFile('256-256-max.png', 'abcdefg');
-		$folder->newFile('128-128.png', 'abcdefg');
-
-		// Version 1000
-		$folder->newFile('1000-128-128-crop.png', 'abcdefg');
-		$folder->newFile('1000-256-256-max.png', 'abcdefg');
-		$folder->newFile('1000-128-128.png', 'abcdefg');
-
-		// Version 1001
-		$folder->newFile('1001-128-128-crop.png', 'abcdefg');
-		$folder->newFile('1001-256-256-max.png', 'abcdefg');
-		$folder->newFile('1001-128-128.png', 'abcdefg');
-
-		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
-		$this->assertEquals(9, count($folder->getDirectoryListing()));
-		$this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
-
-		$job = new MovePreviewJob(
-			Server::get(ITimeFactory::class),
-			$this->appConfig,
-			$this->config,
-			$this->previewMapper,
-			$this->storageFactory,
-			Server::get(IDBConnection::class),
-			Server::get(IRootFolder::class),
-			$this->mimeTypeDetector,
-			$this->mimeTypeLoader,
-			$this->logger,
-			Server::get(IAppDataFactory::class)
-		);
-		$this->invokePrivate($job, 'run', [[]]);
-		$previews = iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5));
-		$this->assertEquals(9, count($previews));
-		$this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
-
-		$nameVersionMapping = [];
-		foreach ($previews as $preview) {
-			$nameVersionMapping[$preview->getName($this->mimeTypeLoader)] = $preview->getVersion();
-		}
-
-		$this->assertEquals([
-			'1000-128-128-crop.png' => 1000,
-			'1000-128-128.png' => 1000,
-			'1000-256-256-max.png' => 1000,
-			'1001-128-128-crop.png' => 1001,
-			'1001-128-128.png' => 1001,
-			'1001-256-256-max.png' => 1001,
-			'128-128-crop.png' => null,
-			'128-128.png' => null,
-			'256-256-max.png' => null,
-		], $nameVersionMapping);
-	}
+    private IAppData $previewAppData;
+    private PreviewMapper $previewMapper;
+    private IAppConfig&MockObject $appConfig;
+    private IConfig $config;
+    private StorageFactory $storageFactory;
+    private PreviewService $previewService;
+    private IDBConnection $db;
+    private IMimeTypeLoader&MockObject $mimeTypeLoader;
+    private IMimeTypeDetector&MockObject $mimeTypeDetector;
+    private LoggerInterface&MockObject $logger;
+
+    public function setUp(): void {
+        parent::setUp();
+        $this->previewAppData = Server::get(IAppDataFactory::class)->get('preview');
+        $this->previewMapper = Server::get(PreviewMapper::class);
+        $this->config = Server::get(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->appConfig->expects($this->any())
+            ->method('getValueBool')
+            ->willReturn(false);
+        $this->appConfig->expects($this->any())
+            ->method('setValueBool')
+            ->willReturn(true);
+        $this->storageFactory = Server::get(StorageFactory::class);
+        $this->previewService = Server::get(PreviewService::class);
+        $this->db = Server::get(IDBConnection::class);
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter(5)))
+            ->executeStatement();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->insert('filecache')
+            ->values([
+                'fileid' => $qb->createNamedParameter(5),
+                'storage' => $qb->createNamedParameter(1),
+                'path' => $qb->createNamedParameter('test/abc'),
+                'path_hash' => $qb->createNamedParameter(md5('test')),
+                'parent' => $qb->createNamedParameter(0),
+                'name' => $qb->createNamedParameter('abc'),
+                'mimetype' => $qb->createNamedParameter(42),
+                'size' => $qb->createNamedParameter(1000),
+                'mtime' => $qb->createNamedParameter(1000),
+                'storage_mtime' => $qb->createNamedParameter(1000),
+                'encrypted' => $qb->createNamedParameter(0),
+                'unencrypted_size' => $qb->createNamedParameter(0),
+                'etag' => $qb->createNamedParameter('abcdefg'),
+                'permissions' => $qb->createNamedParameter(0),
+                'checksum' => $qb->createNamedParameter('abcdefg'),
+            ])->executeStatement();
+
+        $this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
+        $this->mimeTypeDetector->method('detectPath')->willReturn('image/png');
+        $this->mimeTypeLoader = $this->createMock(IMimeTypeLoader::class);
+        $this->mimeTypeLoader->method('getId')->with('image/png')->willReturn(42);
+        $this->mimeTypeLoader->method('getMimetypeById')->with(42)->willReturn('image/png');
+        $this->logger = $this->createMock(LoggerInterface::class);
+    }
+
+    public function tearDown(): void {
+        foreach ($this->previewAppData->getDirectoryListing() as $folder) {
+            $folder->delete();
+        }
+        $this->previewService->deleteAll();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter(5)))
+            ->executeStatement();
+    }
+
+    #[TestDox('Test the migration from the legacy flat hierarchy to the new database format')]
+    public function testMigrationLegacyPath(): void {
+        $folder = $this->previewAppData->newFolder('5');
+        $folder->newFile('64-64-crop.jpg', 'abcdefg');
+        $folder->newFile('128-128-crop.png', 'abcdefg');
+        $this->assertEquals(1, count($this->previewAppData->getDirectoryListing()));
+        $this->assertEquals(2, count($folder->getDirectoryListing()));
+        $this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
+
+        $job = new MovePreviewJob(
+            Server::get(ITimeFactory::class),
+            $this->appConfig,
+            $this->config,
+            $this->previewMapper,
+            $this->storageFactory,
+            Server::get(IDBConnection::class),
+            Server::get(IRootFolder::class),
+            $this->mimeTypeDetector,
+            $this->mimeTypeLoader,
+            $this->logger,
+            Server::get(IAppDataFactory::class),
+        );
+        $this->invokePrivate($job, 'run', [[]]);
+        $this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
+        $this->assertEquals(2, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
+    }
+
+    private static function getInternalFolder(string $name): string {
+        return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+    }
+
+    #[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
+    public function testMigrationPath(): void {
+        $folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
+        $folder->newFile('64-64-crop.jpg', 'abcdefg');
+        $folder->newFile('128-128-crop.png', 'abcdefg');
+
+        $folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
+        $this->assertEquals(2, count($folder->getDirectoryListing()));
+        $this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
+
+        $job = new MovePreviewJob(
+            Server::get(ITimeFactory::class),
+            $this->appConfig,
+            $this->config,
+            $this->previewMapper,
+            $this->storageFactory,
+            Server::get(IDBConnection::class),
+            Server::get(IRootFolder::class),
+            $this->mimeTypeDetector,
+            $this->mimeTypeLoader,
+            $this->logger,
+            Server::get(IAppDataFactory::class)
+        );
+        $this->invokePrivate($job, 'run', [[]]);
+        $this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
+        $this->assertEquals(2, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
+    }
+
+    #[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
+    public function testMigrationPathWithVersion(): void {
+        $folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
+        // No version
+        $folder->newFile('128-128-crop.png', 'abcdefg');
+        $folder->newFile('256-256-max.png', 'abcdefg');
+        $folder->newFile('128-128.png', 'abcdefg');
+
+        // Version 1000
+        $folder->newFile('1000-128-128-crop.png', 'abcdefg');
+        $folder->newFile('1000-256-256-max.png', 'abcdefg');
+        $folder->newFile('1000-128-128.png', 'abcdefg');
+
+        // Version 1001
+        $folder->newFile('1001-128-128-crop.png', 'abcdefg');
+        $folder->newFile('1001-256-256-max.png', 'abcdefg');
+        $folder->newFile('1001-128-128.png', 'abcdefg');
+
+        $folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
+        $this->assertEquals(9, count($folder->getDirectoryListing()));
+        $this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
+
+        $job = new MovePreviewJob(
+            Server::get(ITimeFactory::class),
+            $this->appConfig,
+            $this->config,
+            $this->previewMapper,
+            $this->storageFactory,
+            Server::get(IDBConnection::class),
+            Server::get(IRootFolder::class),
+            $this->mimeTypeDetector,
+            $this->mimeTypeLoader,
+            $this->logger,
+            Server::get(IAppDataFactory::class)
+        );
+        $this->invokePrivate($job, 'run', [[]]);
+        $previews = iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5));
+        $this->assertEquals(9, count($previews));
+        $this->assertEquals(0, count($this->previewAppData->getDirectoryListing()));
+
+        $nameVersionMapping = [];
+        foreach ($previews as $preview) {
+            $nameVersionMapping[$preview->getName($this->mimeTypeLoader)] = $preview->getVersion();
+        }
+
+        $this->assertEquals([
+            '1000-128-128-crop.png' => 1000,
+            '1000-128-128.png' => 1000,
+            '1000-256-256-max.png' => 1000,
+            '1001-128-128-crop.png' => 1001,
+            '1001-128-128.png' => 1001,
+            '1001-256-256-max.png' => 1001,
+            '128-128-crop.png' => null,
+            '128-128.png' => null,
+            '256-256-max.png' => null,
+        ], $nameVersionMapping);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -133,16 +133,16 @@ 
 	}
 
 	private static function getInternalFolder(string $name): string {
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+		return implode('/', str_split(substr(md5($name), 0, 7))).'/'.$name;
 	}
 
 	#[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
 	public function testMigrationPath(): void {
-		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
+		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string) 5));
 		$folder->newFile('64-64-crop.jpg', 'abcdefg');
 		$folder->newFile('128-128-crop.png', 'abcdefg');
 
-		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
+		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string) 5));
 		$this->assertEquals(2, count($folder->getDirectoryListing()));
 		$this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
 
@@ -166,7 +166,7 @@ 
 
 	#[TestDox("Test the migration from the 'new' nested hierarchy to the database format")]
 	public function testMigrationPathWithVersion(): void {
-		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string)5));
+		$folder = $this->previewAppData->newFolder(self::getInternalFolder((string) 5));
 		// No version
 		$folder->newFile('128-128-crop.png', 'abcdefg');
 		$folder->newFile('256-256-max.png', 'abcdefg');
@@ -182,7 +182,7 @@ 
 		$folder->newFile('1001-256-256-max.png', 'abcdefg');
 		$folder->newFile('1001-128-128.png', 'abcdefg');
 
-		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string)5));
+		$folder = $this->previewAppData->getFolder(self::getInternalFolder((string) 5));
 		$this->assertEquals(9, count($folder->getDirectoryListing()));
 		$this->assertEquals(0, count(iterator_to_array($this->previewMapper->getAvailablePreviewsForFile(5))));
 

tests/lib/Preview/GeneratorTest.php

Indentation +425 added lines, -425 removed lines

@@ -33,429 +33,429 @@
 }
 
 class GeneratorTest extends TestCase {
-	private IConfig&MockObject $config;
-	private IPreview&MockObject $previewManager;
-	private GeneratorHelper&MockObject $helper;
-	private IEventDispatcher&MockObject $eventDispatcher;
-	private Generator $generator;
-	private LoggerInterface&MockObject $logger;
-	private StorageFactory&MockObject $storageFactory;
-	private PreviewMapper&MockObject $previewMapper;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->previewManager = $this->createMock(IPreview::class);
-		$this->helper = $this->createMock(GeneratorHelper::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->previewMapper = $this->createMock(PreviewMapper::class);
-		$this->storageFactory = $this->createMock(StorageFactory::class);
-
-		$this->generator = new Generator(
-			$this->config,
-			$this->previewManager,
-			$this->helper,
-			$this->eventDispatcher,
-			$this->logger,
-			$this->previewMapper,
-			$this->storageFactory,
-		);
-	}
-
-	private function getFile(int $fileId, string $mimeType, bool $hasVersion = false): File {
-		$mountPoint = $this->createMock(IMountPoint::class);
-		$mountPoint->method('getNumericStorageId')->willReturn(42);
-		if ($hasVersion) {
-			$file = $this->createMock(VersionedPreviewFile::class);
-			$file->method('getPreviewVersion')->willReturn('abc');
-		} else {
-			$file = $this->createMock(File::class);
-		}
-		$file->method('isReadable')
-			->willReturn(true);
-		$file->method('getMimeType')
-			->willReturn($mimeType);
-		$file->method('getId')
-			->willReturn($fileId);
-		$file->method('getMountPoint')
-			->willReturn($mountPoint);
-		return $file;
-	}
-
-	#[TestWith([true])]
-	#[TestWith([false])]
-	public function testGetCachedPreview(bool $hasPreview): void {
-		$file = $this->getFile(42, 'myMimeType', $hasPreview);
-
-		$this->previewManager->method('isMimeSupported')
-			->with($this->equalTo('myMimeType'))
-			->willReturn(true);
-
-		$maxPreview = new Preview();
-		$maxPreview->setWidth(1000);
-		$maxPreview->setHeight(1000);
-		$maxPreview->setMax(true);
-		$maxPreview->setSize(1000);
-		$maxPreview->setCropped(false);
-		$maxPreview->setStorageId(1);
-		$maxPreview->setVersion($hasPreview ? 'abc' : null);
-		$maxPreview->setMimeType('image/png');
-
-		$previewFile = new Preview();
-		$previewFile->setWidth(256);
-		$previewFile->setHeight(256);
-		$previewFile->setMax(false);
-		$previewFile->setSize(1000);
-		$previewFile->setVersion($hasPreview ? 'abc' : null);
-		$previewFile->setCropped(false);
-		$previewFile->setStorageId(1);
-		$previewFile->setMimeType('image/png');
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => [
-				$maxPreview,
-				$previewFile,
-			]]);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
-
-		$result = $this->generator->getPreview($file, 100, 100);
-		$this->assertSame($hasPreview ? 'abc-256-256.png' : '256-256.png', $result->getName());
-		$this->assertSame(1000, $result->getSize());
-	}
-
-	#[TestWith([true])]
-	#[TestWith([false])]
-	public function testGetNewPreview(bool $hasVersion): void {
-		$file = $this->getFile(42, 'myMimeType', $hasVersion);
-
-		$this->previewManager->method('isMimeSupported')
-			->with($this->equalTo('myMimeType'))
-			->willReturn(true);
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => []]);
-
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				return $default;
-			});
-
-		$this->config->method('getSystemValueInt')
-			->willReturnCallback(function ($key, $default) {
-				return $default;
-			});
-
-		$invalidProvider = $this->createMock(IProviderV2::class);
-		$invalidProvider->method('isAvailable')
-			->willReturn(true);
-		$unavailableProvider = $this->createMock(IProviderV2::class);
-		$unavailableProvider->method('isAvailable')
-			->willReturn(false);
-		$validProvider = $this->createMock(IProviderV2::class);
-		$validProvider->method('isAvailable')
-			->with($file)
-			->willReturn(true);
-
-		$this->previewManager->method('getProviders')
-			->willReturn([
-				'/image\/png/' => ['wrongProvider'],
-				'/myMimeType/' => ['brokenProvider', 'invalidProvider', 'unavailableProvider', 'validProvider'],
-			]);
-
-		$this->helper->method('getProvider')
-			->willReturnCallback(function ($provider) use ($invalidProvider, $validProvider, $unavailableProvider) {
-				if ($provider === 'wrongProvider') {
-					$this->fail('Wrongprovider should not be constructed!');
-				} elseif ($provider === 'brokenProvider') {
-					return false;
-				} elseif ($provider === 'invalidProvider') {
-					return $invalidProvider;
-				} elseif ($provider === 'validProvider') {
-					return $validProvider;
-				} elseif ($provider === 'unavailableProvider') {
-					return $unavailableProvider;
-				}
-				$this->fail('Unexpected provider requested');
-			});
-
-		$image = $this->createMock(IImage::class);
-		$image->method('width')->willReturn(2048);
-		$image->method('height')->willReturn(2048);
-		$image->method('valid')->willReturn(true);
-		$image->method('dataMimeType')->willReturn('image/png');
-
-		$this->helper->method('getThumbnail')
-			->willReturnCallback(function ($provider, $file, $x, $y) use ($invalidProvider, $validProvider, $image): false|IImage {
-				if ($provider === $validProvider) {
-					return $image;
-				} else {
-					return false;
-				}
-			});
-
-		$image->method('data')
-			->willReturn('my data');
-
-		$this->previewMapper->method('insert')
-			->willReturnCallback(fn (Preview $preview): Preview => $preview);
-
-		$this->previewMapper->method('update')
-			->willReturnCallback(fn (Preview $preview): Preview => $preview);
-
-		$this->storageFactory->method('writePreview')
-			->willReturnCallback(function (Preview $preview, mixed $data) use ($hasVersion): int {
-				$data = stream_get_contents($data);
-				if ($hasVersion) {
-					switch ($preview->getName()) {
-						case 'abc-2048-2048-max.png':
-							$this->assertSame('my data', $data);
-							return 1000;
-						case 'abc-256-256.png':
-							$this->assertSame('my resized data', $data);
-							return 1000;
-					}
-				} else {
-					switch ($preview->getName()) {
-						case '2048-2048-max.png':
-							$this->assertSame('my data', $data);
-							return 1000;
-						case '256-256.png':
-							$this->assertSame('my resized data', $data);
-							return 1000;
-					}
-				}
-				$this->fail('file name is wrong:' . $preview->getName());
-			});
-
-		$image = $this->getMockImage(2048, 2048, 'my resized data');
-		$this->helper->method('getImage')
-			->willReturn($image);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
-
-		$result = $this->generator->getPreview($file, 100, 100);
-		$this->assertSame($hasVersion ? 'abc-256-256.png' : '256-256.png', $result->getName());
-		$this->assertSame(1000, $result->getSize());
-	}
-
-	public function testInvalidMimeType(): void {
-		$this->expectException(NotFoundException::class);
-
-		$file = $this->getFile(42, 'invalidType');
-
-		$this->previewManager->method('isMimeSupported')
-			->with('invalidType')
-			->willReturn(false);
-
-		$maxPreview = new Preview();
-		$maxPreview->setWidth(2048);
-		$maxPreview->setHeight(2048);
-		$maxPreview->setMax(true);
-		$maxPreview->setSize(1000);
-		$maxPreview->setVersion(null);
-		$maxPreview->setMimetype('image/png');
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => [
-				$maxPreview,
-			]]);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));
-
-		$this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
-	}
-
-	public function testReturnCachedPreviewsWithoutCheckingSupportedMimetype(): void {
-		$file = $this->getFile(42, 'myMimeType');
-
-		$maxPreview = new Preview();
-		$maxPreview->setWidth(2048);
-		$maxPreview->setHeight(2048);
-		$maxPreview->setMax(true);
-		$maxPreview->setSize(1000);
-		$maxPreview->setVersion(null);
-		$maxPreview->setMimeType('image/png');
-
-		$previewFile = new Preview();
-		$previewFile->setWidth(1024);
-		$previewFile->setHeight(512);
-		$previewFile->setMax(false);
-		$previewFile->setSize(1000);
-		$previewFile->setCropped(true);
-		$previewFile->setVersion(null);
-		$previewFile->setMimeType('image/png');
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => [
-				$maxPreview,
-				$previewFile,
-			]]);
-
-		$this->previewManager->expects($this->never())
-			->method('isMimeSupported');
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));
-
-		$result = $this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
-		$this->assertSame('1024-512-crop.png', $result->getName());
-	}
-
-	public function testNoProvider(): void {
-		$file = $this->getFile(42, 'myMimeType');
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => []]);
-
-		$this->previewManager->method('getProviders')
-			->willReturn([]);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
-
-		$this->expectException(NotFoundException::class);
-		$this->generator->getPreview($file, 100, 100);
-	}
-
-	private function getMockImage(int $width, int $height, string $data = '') {
-		$image = $this->createMock(IImage::class);
-		$image->method('height')->willReturn($width);
-		$image->method('width')->willReturn($height);
-		$image->method('valid')->willReturn(true);
-		$image->method('dataMimeType')->willReturn('image/png');
-		$image->method('data')->willReturn($data);
-
-		$image->method('resizeCopy')->willReturnCallback(function ($size) use ($data) {
-			return $this->getMockImage($size, $size, $data);
-		});
-		$image->method('preciseResizeCopy')->willReturnCallback(function ($width, $height) use ($data) {
-			return $this->getMockImage($width, $height, $data);
-		});
-		$image->method('cropCopy')->willReturnCallback(function ($x, $y, $width, $height) use ($data) {
-			return $this->getMockImage($width, $height, $data);
-		});
-
-		return $image;
-	}
-
-	public static function dataSize(): array {
-		return [
-			[1024, 2048, 512, 512, false, IPreview::MODE_FILL, 256, 512],
-			[1024, 2048, 512, 512, false, IPreview::MODE_COVER, 512, 1024],
-			[1024, 2048, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
-			[1024, 2048, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
-
-			[1024, 2048, -1, 512, false, IPreview::MODE_COVER, 256, 512],
-			[1024, 2048, 512, -1, false, IPreview::MODE_FILL, 512, 1024],
-
-			[1024, 2048, 250, 1100, true, IPreview::MODE_COVER, 256, 1126],
-			[1024, 1100, 250, 1100, true, IPreview::MODE_COVER, 250, 1100],
-
-			[1024, 2048, 4096, 2048, false, IPreview::MODE_FILL, 1024, 2048],
-			[1024, 2048, 4096, 2048, false, IPreview::MODE_COVER, 1024, 2048],
-
-
-			[2048, 1024, 512, 512, false, IPreview::MODE_FILL, 512, 256],
-			[2048, 1024, 512, 512, false, IPreview::MODE_COVER, 1024, 512],
-			[2048, 1024, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
-			[2048, 1024, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
-
-			[2048, 1024, -1, 512, false, IPreview::MODE_FILL, 1024, 512],
-			[2048, 1024, 512, -1, false, IPreview::MODE_COVER, 512, 256],
-
-			[2048, 1024, 4096, 1024, true, IPreview::MODE_FILL, 2048, 512],
-			[2048, 1024, 4096, 1024, true, IPreview::MODE_COVER, 2048, 512],
-
-			//Test minimum size
-			[2048, 1024, 32, 32, false, IPreview::MODE_FILL, 64, 32],
-			[2048, 1024, 32, 32, false, IPreview::MODE_COVER, 64, 32],
-			[2048, 1024, 32, 32, true, IPreview::MODE_FILL, 64, 64],
-			[2048, 1024, 32, 32, true, IPreview::MODE_COVER, 64, 64],
-		];
-	}
-
-	#[DataProvider('dataSize')]
-	public function testCorrectSize(int $maxX, int $maxY, int $reqX, int $reqY, bool $crop, string $mode, int $expectedX, int $expectedY): void {
-		$file = $this->getFile(42, 'myMimeType');
-
-		$this->previewManager->method('isMimeSupported')
-			->with($this->equalTo('myMimeType'))
-			->willReturn(true);
-
-		$maxPreview = new Preview();
-		$maxPreview->setWidth($maxX);
-		$maxPreview->setHeight($maxY);
-		$maxPreview->setMax(true);
-		$maxPreview->setSize(1000);
-		$maxPreview->setVersion(null);
-		$maxPreview->setMimeType('image/png');
-
-		$this->assertSame($maxPreview->getName(), $maxX . '-' . $maxY . '-max.png');
-		$this->assertSame($maxPreview->getMimeType(), 'image/png');
-
-		$this->previewMapper->method('getAvailablePreviews')
-			->with($this->equalTo([42]))
-			->willReturn([42 => [
-				$maxPreview,
-			]]);
-
-		$filename = $expectedX . '-' . $expectedY;
-		if ($crop) {
-			$filename .= '-crop';
-		}
-		$filename .= '.png';
-
-		$image = $this->getMockImage($maxX, $maxY);
-		$this->helper->method('getImage')
-			->willReturn($image);
-
-		$this->previewMapper->method('insert')
-			->willReturnCallback(function (Preview $preview) use ($filename): Preview {
-				$this->assertSame($preview->getName(), $filename);
-				return $preview;
-			});
-
-		$this->previewMapper->method('update')
-			->willReturnCallback(fn (Preview $preview): Preview => $preview);
-
-		$this->storageFactory->method('writePreview')
-			->willReturn(1000);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new BeforePreviewFetchedEvent($file, $reqX, $reqY, $crop, $mode, null));
-
-		$result = $this->generator->getPreview($file, $reqX, $reqY, $crop, $mode);
-		if ($expectedX === $maxX && $expectedY === $maxY) {
-			$this->assertSame($maxPreview->getName(), $result->getName());
-		} else {
-			$this->assertSame($filename, $result->getName());
-		}
-	}
-
-	public function testUnreadbleFile(): void {
-		$file = $this->createMock(File::class);
-		$file->method('isReadable')
-			->willReturn(false);
-
-		$this->expectException(NotFoundException::class);
-
-		$this->generator->getPreview($file, 100, 100, false);
-	}
+    private IConfig&MockObject $config;
+    private IPreview&MockObject $previewManager;
+    private GeneratorHelper&MockObject $helper;
+    private IEventDispatcher&MockObject $eventDispatcher;
+    private Generator $generator;
+    private LoggerInterface&MockObject $logger;
+    private StorageFactory&MockObject $storageFactory;
+    private PreviewMapper&MockObject $previewMapper;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->previewManager = $this->createMock(IPreview::class);
+        $this->helper = $this->createMock(GeneratorHelper::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->previewMapper = $this->createMock(PreviewMapper::class);
+        $this->storageFactory = $this->createMock(StorageFactory::class);
+
+        $this->generator = new Generator(
+            $this->config,
+            $this->previewManager,
+            $this->helper,
+            $this->eventDispatcher,
+            $this->logger,
+            $this->previewMapper,
+            $this->storageFactory,
+        );
+    }
+
+    private function getFile(int $fileId, string $mimeType, bool $hasVersion = false): File {
+        $mountPoint = $this->createMock(IMountPoint::class);
+        $mountPoint->method('getNumericStorageId')->willReturn(42);
+        if ($hasVersion) {
+            $file = $this->createMock(VersionedPreviewFile::class);
+            $file->method('getPreviewVersion')->willReturn('abc');
+        } else {
+            $file = $this->createMock(File::class);
+        }
+        $file->method('isReadable')
+            ->willReturn(true);
+        $file->method('getMimeType')
+            ->willReturn($mimeType);
+        $file->method('getId')
+            ->willReturn($fileId);
+        $file->method('getMountPoint')
+            ->willReturn($mountPoint);
+        return $file;
+    }
+
+    #[TestWith([true])]
+    #[TestWith([false])]
+    public function testGetCachedPreview(bool $hasPreview): void {
+        $file = $this->getFile(42, 'myMimeType', $hasPreview);
+
+        $this->previewManager->method('isMimeSupported')
+            ->with($this->equalTo('myMimeType'))
+            ->willReturn(true);
+
+        $maxPreview = new Preview();
+        $maxPreview->setWidth(1000);
+        $maxPreview->setHeight(1000);
+        $maxPreview->setMax(true);
+        $maxPreview->setSize(1000);
+        $maxPreview->setCropped(false);
+        $maxPreview->setStorageId(1);
+        $maxPreview->setVersion($hasPreview ? 'abc' : null);
+        $maxPreview->setMimeType('image/png');
+
+        $previewFile = new Preview();
+        $previewFile->setWidth(256);
+        $previewFile->setHeight(256);
+        $previewFile->setMax(false);
+        $previewFile->setSize(1000);
+        $previewFile->setVersion($hasPreview ? 'abc' : null);
+        $previewFile->setCropped(false);
+        $previewFile->setStorageId(1);
+        $previewFile->setMimeType('image/png');
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => [
+                $maxPreview,
+                $previewFile,
+            ]]);
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
+
+        $result = $this->generator->getPreview($file, 100, 100);
+        $this->assertSame($hasPreview ? 'abc-256-256.png' : '256-256.png', $result->getName());
+        $this->assertSame(1000, $result->getSize());
+    }
+
+    #[TestWith([true])]
+    #[TestWith([false])]
+    public function testGetNewPreview(bool $hasVersion): void {
+        $file = $this->getFile(42, 'myMimeType', $hasVersion);
+
+        $this->previewManager->method('isMimeSupported')
+            ->with($this->equalTo('myMimeType'))
+            ->willReturn(true);
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => []]);
+
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                return $default;
+            });
+
+        $this->config->method('getSystemValueInt')
+            ->willReturnCallback(function ($key, $default) {
+                return $default;
+            });
+
+        $invalidProvider = $this->createMock(IProviderV2::class);
+        $invalidProvider->method('isAvailable')
+            ->willReturn(true);
+        $unavailableProvider = $this->createMock(IProviderV2::class);
+        $unavailableProvider->method('isAvailable')
+            ->willReturn(false);
+        $validProvider = $this->createMock(IProviderV2::class);
+        $validProvider->method('isAvailable')
+            ->with($file)
+            ->willReturn(true);
+
+        $this->previewManager->method('getProviders')
+            ->willReturn([
+                '/image\/png/' => ['wrongProvider'],
+                '/myMimeType/' => ['brokenProvider', 'invalidProvider', 'unavailableProvider', 'validProvider'],
+            ]);
+
+        $this->helper->method('getProvider')
+            ->willReturnCallback(function ($provider) use ($invalidProvider, $validProvider, $unavailableProvider) {
+                if ($provider === 'wrongProvider') {
+                    $this->fail('Wrongprovider should not be constructed!');
+                } elseif ($provider === 'brokenProvider') {
+                    return false;
+                } elseif ($provider === 'invalidProvider') {
+                    return $invalidProvider;
+                } elseif ($provider === 'validProvider') {
+                    return $validProvider;
+                } elseif ($provider === 'unavailableProvider') {
+                    return $unavailableProvider;
+                }
+                $this->fail('Unexpected provider requested');
+            });
+
+        $image = $this->createMock(IImage::class);
+        $image->method('width')->willReturn(2048);
+        $image->method('height')->willReturn(2048);
+        $image->method('valid')->willReturn(true);
+        $image->method('dataMimeType')->willReturn('image/png');
+
+        $this->helper->method('getThumbnail')
+            ->willReturnCallback(function ($provider, $file, $x, $y) use ($invalidProvider, $validProvider, $image): false|IImage {
+                if ($provider === $validProvider) {
+                    return $image;
+                } else {
+                    return false;
+                }
+            });
+
+        $image->method('data')
+            ->willReturn('my data');
+
+        $this->previewMapper->method('insert')
+            ->willReturnCallback(fn (Preview $preview): Preview => $preview);
+
+        $this->previewMapper->method('update')
+            ->willReturnCallback(fn (Preview $preview): Preview => $preview);
+
+        $this->storageFactory->method('writePreview')
+            ->willReturnCallback(function (Preview $preview, mixed $data) use ($hasVersion): int {
+                $data = stream_get_contents($data);
+                if ($hasVersion) {
+                    switch ($preview->getName()) {
+                        case 'abc-2048-2048-max.png':
+                            $this->assertSame('my data', $data);
+                            return 1000;
+                        case 'abc-256-256.png':
+                            $this->assertSame('my resized data', $data);
+                            return 1000;
+                    }
+                } else {
+                    switch ($preview->getName()) {
+                        case '2048-2048-max.png':
+                            $this->assertSame('my data', $data);
+                            return 1000;
+                        case '256-256.png':
+                            $this->assertSame('my resized data', $data);
+                            return 1000;
+                    }
+                }
+                $this->fail('file name is wrong:' . $preview->getName());
+            });
+
+        $image = $this->getMockImage(2048, 2048, 'my resized data');
+        $this->helper->method('getImage')
+            ->willReturn($image);
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
+
+        $result = $this->generator->getPreview($file, 100, 100);
+        $this->assertSame($hasVersion ? 'abc-256-256.png' : '256-256.png', $result->getName());
+        $this->assertSame(1000, $result->getSize());
+    }
+
+    public function testInvalidMimeType(): void {
+        $this->expectException(NotFoundException::class);
+
+        $file = $this->getFile(42, 'invalidType');
+
+        $this->previewManager->method('isMimeSupported')
+            ->with('invalidType')
+            ->willReturn(false);
+
+        $maxPreview = new Preview();
+        $maxPreview->setWidth(2048);
+        $maxPreview->setHeight(2048);
+        $maxPreview->setMax(true);
+        $maxPreview->setSize(1000);
+        $maxPreview->setVersion(null);
+        $maxPreview->setMimetype('image/png');
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => [
+                $maxPreview,
+            ]]);
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));
+
+        $this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
+    }
+
+    public function testReturnCachedPreviewsWithoutCheckingSupportedMimetype(): void {
+        $file = $this->getFile(42, 'myMimeType');
+
+        $maxPreview = new Preview();
+        $maxPreview->setWidth(2048);
+        $maxPreview->setHeight(2048);
+        $maxPreview->setMax(true);
+        $maxPreview->setSize(1000);
+        $maxPreview->setVersion(null);
+        $maxPreview->setMimeType('image/png');
+
+        $previewFile = new Preview();
+        $previewFile->setWidth(1024);
+        $previewFile->setHeight(512);
+        $previewFile->setMax(false);
+        $previewFile->setSize(1000);
+        $previewFile->setCropped(true);
+        $previewFile->setVersion(null);
+        $previewFile->setMimeType('image/png');
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => [
+                $maxPreview,
+                $previewFile,
+            ]]);
+
+        $this->previewManager->expects($this->never())
+            ->method('isMimeSupported');
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType'));
+
+        $result = $this->generator->getPreview($file, 1024, 512, true, IPreview::MODE_COVER, 'invalidType');
+        $this->assertSame('1024-512-crop.png', $result->getName());
+    }
+
+    public function testNoProvider(): void {
+        $file = $this->getFile(42, 'myMimeType');
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => []]);
+
+        $this->previewManager->method('getProviders')
+            ->willReturn([]);
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, 100, 100, false, IPreview::MODE_FILL, null));
+
+        $this->expectException(NotFoundException::class);
+        $this->generator->getPreview($file, 100, 100);
+    }
+
+    private function getMockImage(int $width, int $height, string $data = '') {
+        $image = $this->createMock(IImage::class);
+        $image->method('height')->willReturn($width);
+        $image->method('width')->willReturn($height);
+        $image->method('valid')->willReturn(true);
+        $image->method('dataMimeType')->willReturn('image/png');
+        $image->method('data')->willReturn($data);
+
+        $image->method('resizeCopy')->willReturnCallback(function ($size) use ($data) {
+            return $this->getMockImage($size, $size, $data);
+        });
+        $image->method('preciseResizeCopy')->willReturnCallback(function ($width, $height) use ($data) {
+            return $this->getMockImage($width, $height, $data);
+        });
+        $image->method('cropCopy')->willReturnCallback(function ($x, $y, $width, $height) use ($data) {
+            return $this->getMockImage($width, $height, $data);
+        });
+
+        return $image;
+    }
+
+    public static function dataSize(): array {
+        return [
+            [1024, 2048, 512, 512, false, IPreview::MODE_FILL, 256, 512],
+            [1024, 2048, 512, 512, false, IPreview::MODE_COVER, 512, 1024],
+            [1024, 2048, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
+            [1024, 2048, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
+
+            [1024, 2048, -1, 512, false, IPreview::MODE_COVER, 256, 512],
+            [1024, 2048, 512, -1, false, IPreview::MODE_FILL, 512, 1024],
+
+            [1024, 2048, 250, 1100, true, IPreview::MODE_COVER, 256, 1126],
+            [1024, 1100, 250, 1100, true, IPreview::MODE_COVER, 250, 1100],
+
+            [1024, 2048, 4096, 2048, false, IPreview::MODE_FILL, 1024, 2048],
+            [1024, 2048, 4096, 2048, false, IPreview::MODE_COVER, 1024, 2048],
+
+
+            [2048, 1024, 512, 512, false, IPreview::MODE_FILL, 512, 256],
+            [2048, 1024, 512, 512, false, IPreview::MODE_COVER, 1024, 512],
+            [2048, 1024, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
+            [2048, 1024, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
+
+            [2048, 1024, -1, 512, false, IPreview::MODE_FILL, 1024, 512],
+            [2048, 1024, 512, -1, false, IPreview::MODE_COVER, 512, 256],
+
+            [2048, 1024, 4096, 1024, true, IPreview::MODE_FILL, 2048, 512],
+            [2048, 1024, 4096, 1024, true, IPreview::MODE_COVER, 2048, 512],
+
+            //Test minimum size
+            [2048, 1024, 32, 32, false, IPreview::MODE_FILL, 64, 32],
+            [2048, 1024, 32, 32, false, IPreview::MODE_COVER, 64, 32],
+            [2048, 1024, 32, 32, true, IPreview::MODE_FILL, 64, 64],
+            [2048, 1024, 32, 32, true, IPreview::MODE_COVER, 64, 64],
+        ];
+    }
+
+    #[DataProvider('dataSize')]
+    public function testCorrectSize(int $maxX, int $maxY, int $reqX, int $reqY, bool $crop, string $mode, int $expectedX, int $expectedY): void {
+        $file = $this->getFile(42, 'myMimeType');
+
+        $this->previewManager->method('isMimeSupported')
+            ->with($this->equalTo('myMimeType'))
+            ->willReturn(true);
+
+        $maxPreview = new Preview();
+        $maxPreview->setWidth($maxX);
+        $maxPreview->setHeight($maxY);
+        $maxPreview->setMax(true);
+        $maxPreview->setSize(1000);
+        $maxPreview->setVersion(null);
+        $maxPreview->setMimeType('image/png');
+
+        $this->assertSame($maxPreview->getName(), $maxX . '-' . $maxY . '-max.png');
+        $this->assertSame($maxPreview->getMimeType(), 'image/png');
+
+        $this->previewMapper->method('getAvailablePreviews')
+            ->with($this->equalTo([42]))
+            ->willReturn([42 => [
+                $maxPreview,
+            ]]);
+
+        $filename = $expectedX . '-' . $expectedY;
+        if ($crop) {
+            $filename .= '-crop';
+        }
+        $filename .= '.png';
+
+        $image = $this->getMockImage($maxX, $maxY);
+        $this->helper->method('getImage')
+            ->willReturn($image);
+
+        $this->previewMapper->method('insert')
+            ->willReturnCallback(function (Preview $preview) use ($filename): Preview {
+                $this->assertSame($preview->getName(), $filename);
+                return $preview;
+            });
+
+        $this->previewMapper->method('update')
+            ->willReturnCallback(fn (Preview $preview): Preview => $preview);
+
+        $this->storageFactory->method('writePreview')
+            ->willReturn(1000);
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new BeforePreviewFetchedEvent($file, $reqX, $reqY, $crop, $mode, null));
+
+        $result = $this->generator->getPreview($file, $reqX, $reqY, $crop, $mode);
+        if ($expectedX === $maxX && $expectedY === $maxY) {
+            $this->assertSame($maxPreview->getName(), $result->getName());
+        } else {
+            $this->assertSame($filename, $result->getName());
+        }
+    }
+
+    public function testUnreadbleFile(): void {
+        $file = $this->createMock(File::class);
+        $file->method('isReadable')
+            ->willReturn(false);
+
+        $this->expectException(NotFoundException::class);
+
+        $this->generator->getPreview($file, 100, 100, false);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -143,12 +143,12 @@ 
 			->willReturn([42 => []]);
 
 		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
+			->willReturnCallback(function($key, $default) {
 				return $default;
 			});
 
 		$this->config->method('getSystemValueInt')
-			->willReturnCallback(function ($key, $default) {
+			->willReturnCallback(function($key, $default) {
 				return $default;
 			});
 
@@ -170,7 +170,7 @@ 
 			]);
 
 		$this->helper->method('getProvider')
-			->willReturnCallback(function ($provider) use ($invalidProvider, $validProvider, $unavailableProvider) {
+			->willReturnCallback(function($provider) use ($invalidProvider, $validProvider, $unavailableProvider) {
 				if ($provider === 'wrongProvider') {
 					$this->fail('Wrongprovider should not be constructed!');
 				} elseif ($provider === 'brokenProvider') {
@@ -192,7 +192,7 @@ 
 		$image->method('dataMimeType')->willReturn('image/png');
 
 		$this->helper->method('getThumbnail')
-			->willReturnCallback(function ($provider, $file, $x, $y) use ($invalidProvider, $validProvider, $image): false|IImage {
+			->willReturnCallback(function($provider, $file, $x, $y) use ($invalidProvider, $validProvider, $image): false | IImage {
 				if ($provider === $validProvider) {
 					return $image;
 				} else {
@@ -210,7 +210,7 @@ 
 			->willReturnCallback(fn (Preview $preview): Preview => $preview);
 
 		$this->storageFactory->method('writePreview')
-			->willReturnCallback(function (Preview $preview, mixed $data) use ($hasVersion): int {
+			->willReturnCallback(function(Preview $preview, mixed $data) use ($hasVersion): int {
 				$data = stream_get_contents($data);
 				if ($hasVersion) {
 					switch ($preview->getName()) {
@@ -231,7 +231,7 @@ 
 							return 1000;
 					}
 				}
-				$this->fail('file name is wrong:' . $preview->getName());
+				$this->fail('file name is wrong:'.$preview->getName());
 			});
 
 		$image = $this->getMockImage(2048, 2048, 'my resized data');
@@ -341,13 +341,13 @@ 
 		$image->method('dataMimeType')->willReturn('image/png');
 		$image->method('data')->willReturn($data);
 
-		$image->method('resizeCopy')->willReturnCallback(function ($size) use ($data) {
+		$image->method('resizeCopy')->willReturnCallback(function($size) use ($data) {
 			return $this->getMockImage($size, $size, $data);
 		});
-		$image->method('preciseResizeCopy')->willReturnCallback(function ($width, $height) use ($data) {
+		$image->method('preciseResizeCopy')->willReturnCallback(function($width, $height) use ($data) {
 			return $this->getMockImage($width, $height, $data);
 		});
-		$image->method('cropCopy')->willReturnCallback(function ($x, $y, $width, $height) use ($data) {
+		$image->method('cropCopy')->willReturnCallback(function($x, $y, $width, $height) use ($data) {
 			return $this->getMockImage($width, $height, $data);
 		});
 
@@ -406,7 +406,7 @@ 
 		$maxPreview->setVersion(null);
 		$maxPreview->setMimeType('image/png');
 
-		$this->assertSame($maxPreview->getName(), $maxX . '-' . $maxY . '-max.png');
+		$this->assertSame($maxPreview->getName(), $maxX.'-'.$maxY.'-max.png');
 		$this->assertSame($maxPreview->getMimeType(), 'image/png');
 
 		$this->previewMapper->method('getAvailablePreviews')
@@ -415,7 +415,7 @@ 
 				$maxPreview,
 			]]);
 
-		$filename = $expectedX . '-' . $expectedY;
+		$filename = $expectedX.'-'.$expectedY;
 		if ($crop) {
 			$filename .= '-crop';
 		}
@@ -426,7 +426,7 @@ 
 			->willReturn($image);
 
 		$this->previewMapper->method('insert')
-			->willReturnCallback(function (Preview $preview) use ($filename): Preview {
+			->willReturnCallback(function(Preview $preview) use ($filename): Preview {
 				$this->assertSame($preview->getName(), $filename);
 				return $preview;
 			});

tests/lib/Preview/PreviewMapperTest.php

Indentation +52 added lines, -52 removed lines

@@ -20,63 +20,63 @@
  * @group DB
  */
 class PreviewMapperTest extends TestCase {
-	private PreviewMapper $previewMapper;
-	private IDBConnection $connection;
+    private PreviewMapper $previewMapper;
+    private IDBConnection $connection;
 
-	public function setUp(): void {
-		$this->previewMapper = Server::get(PreviewMapper::class);
-		$this->connection = Server::get(IDBConnection::class);
-	}
+    public function setUp(): void {
+        $this->previewMapper = Server::get(PreviewMapper::class);
+        $this->connection = Server::get(IDBConnection::class);
+    }
 
-	public function testGetAvailablePreviews(): void {
-		// Empty
-		$this->assertEquals([], $this->previewMapper->getAvailablePreviews([]));
+    public function testGetAvailablePreviews(): void {
+        // Empty
+        $this->assertEquals([], $this->previewMapper->getAvailablePreviews([]));
 
-		// No preview available
-		$this->assertEquals([42 => []], $this->previewMapper->getAvailablePreviews([42]));
+        // No preview available
+        $this->assertEquals([42 => []], $this->previewMapper->getAvailablePreviews([42]));
 
-		$this->createPreviewForFileId(42);
-		$previews = $this->previewMapper->getAvailablePreviews([42]);
-		$this->assertNotEmpty($previews[42]);
-		$this->assertNull($previews[42][0]->getLocationId());
-		$this->assertNull($previews[42][0]->getBucketName());
-		$this->assertNull($previews[42][0]->getObjectStoreName());
+        $this->createPreviewForFileId(42);
+        $previews = $this->previewMapper->getAvailablePreviews([42]);
+        $this->assertNotEmpty($previews[42]);
+        $this->assertNull($previews[42][0]->getLocationId());
+        $this->assertNull($previews[42][0]->getBucketName());
+        $this->assertNull($previews[42][0]->getObjectStoreName());
 
-		$this->createPreviewForFileId(43, 2);
-		$previews = $this->previewMapper->getAvailablePreviews([43]);
-		$this->assertNotEmpty($previews[43]);
-		$this->assertEquals('preview-2', $previews[43][0]->getBucketName());
-		$this->assertEquals('default', $previews[43][0]->getObjectStoreName());
-	}
+        $this->createPreviewForFileId(43, 2);
+        $previews = $this->previewMapper->getAvailablePreviews([43]);
+        $this->assertNotEmpty($previews[43]);
+        $this->assertEquals('preview-2', $previews[43][0]->getBucketName());
+        $this->assertEquals('default', $previews[43][0]->getObjectStoreName());
+    }
 
-	private function createPreviewForFileId(int $fileId, ?int $bucket = null): void {
-		$locationId = null;
-		if ($bucket) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->insert('preview_locations')
-				->values([
-					'bucket_name' => $qb->createNamedParameter('preview-' . $bucket),
-					'object_store_name' => $qb->createNamedParameter('default'),
-				]);
-			$qb->executeStatement();
-			$locationId = $qb->getLastInsertId();
-		}
-		$preview = new Preview();
-		$preview->setFileId($fileId);
-		$preview->setStorageId(1);
-		$preview->setCropped(true);
-		$preview->setMax(true);
-		$preview->setWidth(100);
-		$preview->setSourceMimeType('image/jpeg');
-		$preview->setHeight(100);
-		$preview->setSize(100);
-		$preview->setMtime(time());
-		$preview->setMimetype('image/jpeg');
-		$preview->setEtag('abcdefg');
+    private function createPreviewForFileId(int $fileId, ?int $bucket = null): void {
+        $locationId = null;
+        if ($bucket) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->insert('preview_locations')
+                ->values([
+                    'bucket_name' => $qb->createNamedParameter('preview-' . $bucket),
+                    'object_store_name' => $qb->createNamedParameter('default'),
+                ]);
+            $qb->executeStatement();
+            $locationId = $qb->getLastInsertId();
+        }
+        $preview = new Preview();
+        $preview->setFileId($fileId);
+        $preview->setStorageId(1);
+        $preview->setCropped(true);
+        $preview->setMax(true);
+        $preview->setWidth(100);
+        $preview->setSourceMimeType('image/jpeg');
+        $preview->setHeight(100);
+        $preview->setSize(100);
+        $preview->setMtime(time());
+        $preview->setMimetype('image/jpeg');
+        $preview->setEtag('abcdefg');
 
-		if ($locationId !== null) {
-			$preview->setLocationId($locationId);
-		}
-		$this->previewMapper->insert($preview);
-	}
+        if ($locationId !== null) {
+            $preview->setLocationId($locationId);
+        }
+        $this->previewMapper->insert($preview);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 			$qb = $this->connection->getQueryBuilder();
 			$qb->insert('preview_locations')
 				->values([
-					'bucket_name' => $qb->createNamedParameter('preview-' . $bucket),
+					'bucket_name' => $qb->createNamedParameter('preview-'.$bucket),
 					'object_store_name' => $qb->createNamedParameter('default'),
 				]);
 			$qb->executeStatement();

tests/lib/Preview/BackgroundCleanupJobTest.php

Indentation +110 added lines, -110 removed lines

@@ -30,115 +30,115 @@
  * @package Test\Preview
  */
 class BackgroundCleanupJobTest extends \Test\TestCase {
-	use MountProviderTrait;
-	use UserTrait;
-	private string $userId;
-	private bool $trashEnabled;
-	private IDBConnection $connection;
-	private PreviewManager $previewManager;
-	private IRootFolder $rootFolder;
-	private IMimeTypeLoader $mimeTypeLoader;
-	private ITimeFactory $timeFactory;
-	private PreviewService $previewService;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userId = $this->getUniqueID();
-		$user = $this->createUser($this->userId, $this->userId);
-
-		$storage = new Temporary([]);
-		$this->registerMount($this->userId, $storage, '');
-
-		$this->loginAsUser($this->userId);
-		$this->logout();
-		$this->loginAsUser($this->userId);
-
-		$appManager = Server::get(IAppManager::class);
-		$this->trashEnabled = $appManager->isEnabledForUser('files_trashbin', $user);
-		$appManager->disableApp('files_trashbin');
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->previewManager = Server::get(IPreview::class);
-		$this->rootFolder = Server::get(IRootFolder::class);
-		$this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
-		$this->timeFactory = Server::get(ITimeFactory::class);
-		$this->previewService = Server::get(PreviewService::class);
-	}
-
-	protected function tearDown(): void {
-		if ($this->trashEnabled) {
-			$appManager = Server::get(IAppManager::class);
-			$appManager->enableApp('files_trashbin');
-		}
-
-		$this->logout();
-
-		foreach ($this->previewService->getAvailablePreviewsForFile(5) as $preview) {
-			$this->previewService->deletePreview($preview);
-		}
-
-		parent::tearDown();
-	}
-
-	private function setup11Previews(): array {
-		$userFolder = $this->rootFolder->getUserFolder($this->userId);
-
-		$files = [];
-		foreach (range(0, 10) as $i) {
-			$file = $userFolder->newFile($i . '.txt');
-			$file->putContent('hello world!');
-			$this->previewManager->getPreview($file);
-			$files[] = $file;
-		}
-
-		return $files;
-	}
-
-	private function countPreviews(PreviewService $previewService, array $fileIds): int {
-		$previews = $previewService->getAvailablePreviews($fileIds);
-		return array_reduce($previews, fn (int $result, array $previews) => $result + count($previews), 0);
-	}
-
-	public function testCleanupSystemCron(): void {
-		$files = $this->setup11Previews();
-		$fileIds = array_map(fn (File $f): int => $f->getId(), $files);
-
-		$this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
-		$job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->previewService, true);
-		$job->run([]);
-
-		foreach ($files as $file) {
-			$file->delete();
-		}
-
-		$this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
-		$job->run([]);
-
-		$this->assertSame(0, $this->countPreviews($this->previewService, $fileIds));
-	}
-
-	public function testCleanupAjax(): void {
-		if ($this->connection->getShardDefinition('filecache')) {
-			$this->markTestSkipped('ajax cron is not supported for sharded setups');
-		}
-		$files = $this->setup11Previews();
-		$fileIds = array_map(fn (File $f): int => $f->getId(), $files);
-
-		$this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
-		$job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->previewService, false);
-		$job->run([]);
-
-		foreach ($files as $file) {
-			$file->delete();
-		}
-
-		$this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
-		$job->run([]);
-
-		$this->assertSame(1, $this->countPreviews($this->previewService, $fileIds));
-		$job->run([]);
+    use MountProviderTrait;
+    use UserTrait;
+    private string $userId;
+    private bool $trashEnabled;
+    private IDBConnection $connection;
+    private PreviewManager $previewManager;
+    private IRootFolder $rootFolder;
+    private IMimeTypeLoader $mimeTypeLoader;
+    private ITimeFactory $timeFactory;
+    private PreviewService $previewService;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userId = $this->getUniqueID();
+        $user = $this->createUser($this->userId, $this->userId);
+
+        $storage = new Temporary([]);
+        $this->registerMount($this->userId, $storage, '');
+
+        $this->loginAsUser($this->userId);
+        $this->logout();
+        $this->loginAsUser($this->userId);
+
+        $appManager = Server::get(IAppManager::class);
+        $this->trashEnabled = $appManager->isEnabledForUser('files_trashbin', $user);
+        $appManager->disableApp('files_trashbin');
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->previewManager = Server::get(IPreview::class);
+        $this->rootFolder = Server::get(IRootFolder::class);
+        $this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
+        $this->timeFactory = Server::get(ITimeFactory::class);
+        $this->previewService = Server::get(PreviewService::class);
+    }
+
+    protected function tearDown(): void {
+        if ($this->trashEnabled) {
+            $appManager = Server::get(IAppManager::class);
+            $appManager->enableApp('files_trashbin');
+        }
+
+        $this->logout();
+
+        foreach ($this->previewService->getAvailablePreviewsForFile(5) as $preview) {
+            $this->previewService->deletePreview($preview);
+        }
+
+        parent::tearDown();
+    }
+
+    private function setup11Previews(): array {
+        $userFolder = $this->rootFolder->getUserFolder($this->userId);
+
+        $files = [];
+        foreach (range(0, 10) as $i) {
+            $file = $userFolder->newFile($i . '.txt');
+            $file->putContent('hello world!');
+            $this->previewManager->getPreview($file);
+            $files[] = $file;
+        }
+
+        return $files;
+    }
+
+    private function countPreviews(PreviewService $previewService, array $fileIds): int {
+        $previews = $previewService->getAvailablePreviews($fileIds);
+        return array_reduce($previews, fn (int $result, array $previews) => $result + count($previews), 0);
+    }
+
+    public function testCleanupSystemCron(): void {
+        $files = $this->setup11Previews();
+        $fileIds = array_map(fn (File $f): int => $f->getId(), $files);
+
+        $this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
+        $job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->previewService, true);
+        $job->run([]);
+
+        foreach ($files as $file) {
+            $file->delete();
+        }
+
+        $this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
+        $job->run([]);
+
+        $this->assertSame(0, $this->countPreviews($this->previewService, $fileIds));
+    }
+
+    public function testCleanupAjax(): void {
+        if ($this->connection->getShardDefinition('filecache')) {
+            $this->markTestSkipped('ajax cron is not supported for sharded setups');
+        }
+        $files = $this->setup11Previews();
+        $fileIds = array_map(fn (File $f): int => $f->getId(), $files);
+
+        $this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
+        $job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->previewService, false);
+        $job->run([]);
+
+        foreach ($files as $file) {
+            $file->delete();
+        }
+
+        $this->assertSame(11, $this->countPreviews($this->previewService, $fileIds));
+        $job->run([]);
+
+        $this->assertSame(1, $this->countPreviews($this->previewService, $fileIds));
+        $job->run([]);
 
-		$this->assertSame(0, $this->countPreviews($this->previewService, $fileIds));
-	}
+        $this->assertSame(0, $this->countPreviews($this->previewService, $fileIds));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
 		$files = [];
 		foreach (range(0, 10) as $i) {
-			$file = $userFolder->newFile($i . '.txt');
+			$file = $userFolder->newFile($i.'.txt');
 			$file->putContent('hello world!');
 			$this->previewManager->getPreview($file);
 			$files[] = $file;

tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php

Indentation +275 added lines, -275 removed lines

@@ -17,279 +17,279 @@
 use Test\TestCase;
 
 class PrimaryObjectStoreConfigTest extends TestCase {
-	private array $systemConfig = [];
-	private array $userConfig = [];
-	private IConfig&MockObject $config;
-	private IAppManager&MockObject $appManager;
-	private PrimaryObjectStoreConfig $objectStoreConfig;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->systemConfig = [];
-		$this->config = $this->createMock(IConfig::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default = '') {
-				if (isset($this->systemConfig[$key])) {
-					return $this->systemConfig[$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $default = '') {
-				if (isset($this->userConfig[$userId][$appName][$key])) {
-					return $this->userConfig[$userId][$appName][$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('setUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $value): void {
-				$this->userConfig[$userId][$appName][$key] = $value;
-			});
-
-		$this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
-	}
-
-	private function getUser(string $uid): IUser {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn($uid);
-		return $user;
-	}
-
-	private function setConfig(string $key, $value) {
-		$this->systemConfig[$key] = $value;
-	}
-
-	public function testNewUserGetsDefault() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-	}
-
-	public function testExistingUserKeepsStorage() {
-		// setup user with `server1` as storage
-		$this->testNewUserGetsDefault();
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
-
-	public function testNestedAliases() {
-		$this->setConfig('objectstore', [
-			'default' => 'a1',
-			'a1' => 'a2',
-			'a2' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-		]);
-		$this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
-	}
-
-	public function testMultibucketChangedConfig() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket1-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket1-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-40', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket1-'
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'multibucket' => true,
-					'num_buckets' => 16,
-					'bucket' => 'bucket2-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-		$this->assertEquals('bucket2-4', $result['arguments']['bucket']);
-	}
-
-	public function testMultibucketOldConfig() {
-		$this->setConfig('objectstore_multibucket', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-				'multibucket' => true,
-				'num_buckets' => 8,
-				'bucket' => 'bucket-'
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'preview' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket-'
-				],
-			],
-		], $configs);
-	}
-
-	public function testSingleObjectStore() {
-		$this->setConfig('objectstore', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'preview' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => false,
-				],
-			],
-		], $configs);
-	}
-
-	public function testRoot() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'root' => 'server2',
-			'preview' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
+    private array $systemConfig = [];
+    private array $userConfig = [];
+    private IConfig&MockObject $config;
+    private IAppManager&MockObject $appManager;
+    private PrimaryObjectStoreConfig $objectStoreConfig;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->systemConfig = [];
+        $this->config = $this->createMock(IConfig::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default = '') {
+                if (isset($this->systemConfig[$key])) {
+                    return $this->systemConfig[$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $default = '') {
+                if (isset($this->userConfig[$userId][$appName][$key])) {
+                    return $this->userConfig[$userId][$appName][$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('setUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $value): void {
+                $this->userConfig[$userId][$appName][$key] = $value;
+            });
+
+        $this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
+    }
+
+    private function getUser(string $uid): IUser {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn($uid);
+        return $user;
+    }
+
+    private function setConfig(string $key, $value) {
+        $this->systemConfig[$key] = $value;
+    }
+
+    public function testNewUserGetsDefault() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+    }
+
+    public function testExistingUserKeepsStorage() {
+        // setup user with `server1` as storage
+        $this->testNewUserGetsDefault();
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
+
+    public function testNestedAliases() {
+        $this->setConfig('objectstore', [
+            'default' => 'a1',
+            'a1' => 'a2',
+            'a2' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+        ]);
+        $this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
+    }
+
+    public function testMultibucketChangedConfig() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-40', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'multibucket' => true,
+                    'num_buckets' => 16,
+                    'bucket' => 'bucket2-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+        $this->assertEquals('bucket2-4', $result['arguments']['bucket']);
+    }
+
+    public function testMultibucketOldConfig() {
+        $this->setConfig('objectstore_multibucket', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+                'multibucket' => true,
+                'num_buckets' => 8,
+                'bucket' => 'bucket-'
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'preview' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testSingleObjectStore() {
+        $this->setConfig('objectstore', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'preview' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => false,
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testRoot() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'root' => 'server2',
+            'preview' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
 }

tests/lib/Files/Storage/Storage.php

Indentation +633 added lines, -633 removed lines

@@ -14,641 +14,641 @@
 use OCP\Files\Storage\IWriteStreamStorage;
 
 abstract class Storage extends \Test\TestCase {
-	/**
-	 * @var \OC\Files\Storage\Storage instance
-	 */
-	protected $instance;
-	protected $waitDelay = 0;
-
-	/**
-	 * Sleep for the number of seconds specified in the
-	 * $waitDelay attribute
-	 */
-	protected function wait() {
-		if ($this->waitDelay > 0) {
-			sleep($this->waitDelay);
-		}
-	}
-
-	/**
-	 * the root folder of the storage should always exist, be readable and be recognized as a directory
-	 */
-	public function testRoot(): void {
-		$this->assertTrue($this->instance->file_exists('/'), 'Root folder does not exist');
-		$this->assertTrue($this->instance->isReadable('/'), 'Root folder is not readable');
-		$this->assertTrue($this->instance->is_dir('/'), 'Root folder is not a directory');
-		$this->assertFalse($this->instance->is_file('/'), 'Root folder is a file');
-		$this->assertEquals('dir', $this->instance->filetype('/'));
-
-		//without this, any further testing would be useless, not an actual requirement for filestorage though
-		$this->assertTrue($this->instance->isUpdatable('/'), 'Root folder is not writable');
-	}
-
-	/**
-	 * Check that the test() function works
-	 */
-	public function testTestFunction(): void {
-		$this->assertTrue($this->instance->test());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('directoryProvider')]
-	public function testDirectories($directory): void {
-		$this->assertFalse($this->instance->file_exists('/' . $directory));
-
-		$this->assertTrue($this->instance->mkdir('/' . $directory));
-
-		$this->assertTrue($this->instance->file_exists('/' . $directory));
-		$this->assertTrue($this->instance->is_dir('/' . $directory));
-		$this->assertFalse($this->instance->is_file('/' . $directory));
-		$this->assertEquals('dir', $this->instance->filetype('/' . $directory));
-		$this->assertEquals(0, $this->instance->filesize('/' . $directory));
-		$this->assertTrue($this->instance->isReadable('/' . $directory));
-		$this->assertTrue($this->instance->isUpdatable('/' . $directory));
-
-		$dh = $this->instance->opendir('/');
-		$content = [];
-		while (($file = readdir($dh)) !== false) {
-			if ($file !== '.' && $file !== '..') {
-				$content[] = $file;
-			}
-		}
-		$this->assertEquals([$directory], $content);
-
-		$content = iterator_to_array($this->instance->getDirectoryContent('/'));
-
-		$this->assertCount(1, $content);
-		$dirEntry = $content[0];
-		unset($dirEntry['scan_permissions']);
-		unset($dirEntry['etag']);
-		$this->assertLessThanOrEqual(1, abs($dirEntry['mtime'] - $this->instance->filemtime($directory)));
-		unset($dirEntry['mtime']);
-		unset($dirEntry['storage_mtime']);
-		$this->assertEquals([
-			'name' => $directory,
-			'mimetype' => $this->instance->getMimeType($directory),
-			'size' => -1,
-			'permissions' => $this->instance->getPermissions($directory),
-		], $dirEntry);
-
-		$this->assertFalse($this->instance->mkdir('/' . $directory)); //can't create existing folders
-		$this->assertTrue($this->instance->rmdir('/' . $directory));
-
-		$this->wait();
-		$this->assertFalse($this->instance->file_exists('/' . $directory));
-
-		$this->assertFalse($this->instance->rmdir('/' . $directory)); //can't remove non existing folders
-
-		$dh = $this->instance->opendir('/');
-		$content = [];
-		while (($file = readdir($dh)) !== false) {
-			if ($file != '.' && $file != '..') {
-				$content[] = $file;
-			}
-		}
-		$this->assertEquals([], $content);
-	}
-
-	public static function fileNameProvider(): array {
-		return [
-			['file.txt'],
-			[' file.txt'],
-			['folder .txt'],
-			['file with space.txt'],
-			['spéciäl fäile'],
-			['test single\'quote.txt'],
-		];
-	}
-
-	public static function directoryProvider(): array {
-		return [
-			['folder'],
-			[' folder'],
-			['folder '],
-			['folder with space'],
-			['spéciäl földer'],
-			['test single\'quote'],
-		];
-	}
-
-	public static function loremFileProvider(): array {
-		$root = \OC::$SERVERROOT . '/tests/data/';
-		return [
-			// small file
-			[$root . 'lorem.txt'],
-			// bigger file (> 8 KB which is the standard PHP block size)
-			[$root . 'lorem-big.txt']
-		];
-	}
-
-	/**
-	 * test the various uses of file_get_contents and file_put_contents
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('loremFileProvider')]
-	public function testGetPutContents($sourceFile): void {
-		$sourceText = file_get_contents($sourceFile);
-
-		//fill a file with string data
-		$this->instance->file_put_contents('/lorem.txt', $sourceText);
-		$this->assertFalse($this->instance->is_dir('/lorem.txt'));
-		$this->assertEquals($sourceText, $this->instance->file_get_contents('/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
-
-		//empty the file
-		$this->instance->file_put_contents('/lorem.txt', '');
-		$this->assertEquals('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
-	}
-
-	/**
-	 * test various known mimetypes
-	 */
-	public function testMimeType(): void {
-		$this->assertEquals('httpd/unix-directory', $this->instance->getMimeType('/'));
-		$this->assertEquals(false, $this->instance->getMimeType('/non/existing/file'));
-
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
-		$this->assertEquals('text/plain', $this->instance->getMimeType('/lorem.txt'));
-
-		$pngFile = \OC::$SERVERROOT . '/tests/data/desktopapp.png';
-		$this->instance->file_put_contents('/desktopapp.png', file_get_contents($pngFile, 'r'));
-		$this->assertEquals('image/png', $this->instance->getMimeType('/desktopapp.png'));
-
-		$svgFile = \OC::$SERVERROOT . '/tests/data/desktopapp.svg';
-		$this->instance->file_put_contents('/desktopapp.svg', file_get_contents($svgFile, 'r'));
-		$this->assertEquals('image/svg+xml', $this->instance->getMimeType('/desktopapp.svg'));
-	}
-
-
-	public static function copyAndMoveProvider(): array {
-		return [
-			['/source.txt', '/target.txt'],
-			['/source.txt', '/target with space.txt'],
-			['/source with space.txt', '/target.txt'],
-			['/source with space.txt', '/target with space.txt'],
-			['/source.txt', '/tärgét.txt'],
-			['/sòurcē.txt', '/target.txt'],
-			['/sòurcē.txt', '/tärgét.txt'],
-			['/single \' quote.txt', '/tar\'get.txt'],
-		];
-	}
-
-	public function initSourceAndTarget($source, $target = null) {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents($source, file_get_contents($textFile));
-		if ($target) {
-			$testContents = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-			$this->instance->file_put_contents($target, $testContents);
-		}
-	}
-
-	public function assertSameAsLorem($file) {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->assertEquals(
-			file_get_contents($textFile),
-			$this->instance->file_get_contents($file),
-			'Expected ' . $file . ' to be a copy of ' . $textFile
-		);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
-	public function testCopy($source, $target): void {
-		$this->initSourceAndTarget($source);
-
-		$this->instance->copy($source, $target);
-
-		$this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
-		$this->assertSameAsLorem($target);
-		$this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
-	public function testMove($source, $target): void {
-		$this->initSourceAndTarget($source);
-
-		$this->instance->rename($source, $target);
-
-		$this->wait();
-		$this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
-		$this->assertFalse($this->instance->file_exists($source), $source . ' still exists');
-		$this->assertSameAsLorem($target);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
-	public function testCopyOverwrite($source, $target): void {
-		$this->initSourceAndTarget($source, $target);
-
-		$this->instance->copy($source, $target);
-
-		$this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
-		$this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
-		$this->assertSameAsLorem($target);
-		$this->assertSameAsLorem($source);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
-	public function testMoveOverwrite($source, $target): void {
-		$this->initSourceAndTarget($source, $target);
-
-		$this->instance->rename($source, $target);
-
-		$this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
-		$this->assertFalse($this->instance->file_exists($source), $source . ' still exists');
-		$this->assertSameAsLorem($target);
-	}
-
-	public function testLocal(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-		$localFile = $this->instance->getLocalFile('/lorem.txt');
-		$this->assertTrue(file_exists($localFile));
-		$this->assertEquals(file_get_contents($textFile), file_get_contents($localFile));
-
-		$this->instance->mkdir('/folder');
-		$this->instance->file_put_contents('/folder/lorem.txt', file_get_contents($textFile));
-		$this->instance->file_put_contents('/folder/bar.txt', 'asd');
-		$this->instance->mkdir('/folder/recursive');
-		$this->instance->file_put_contents('/folder/recursive/file.txt', 'foo');
-
-		// test below require to use instance->getLocalFile because the physical storage might be different
-		$localFile = $this->instance->getLocalFile('/folder/lorem.txt');
-		$this->assertTrue(file_exists($localFile));
-		$this->assertEquals(file_get_contents($localFile), file_get_contents($textFile));
-
-		$localFile = $this->instance->getLocalFile('/folder/bar.txt');
-		$this->assertTrue(file_exists($localFile));
-		$this->assertEquals(file_get_contents($localFile), 'asd');
-
-		$localFile = $this->instance->getLocalFile('/folder/recursive/file.txt');
-		$this->assertTrue(file_exists($localFile));
-		$this->assertEquals(file_get_contents($localFile), 'foo');
-	}
-
-	public function testStat(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$ctimeStart = time();
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-		$this->assertTrue($this->instance->isReadable('/lorem.txt'));
-		$ctimeEnd = time();
-		$mTime = $this->instance->filemtime('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
-		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 5));
-
-		// check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
-		$this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
-		$this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
-		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
-
-		$stat = $this->instance->stat('/lorem.txt');
-		//only size and mtime are required in the result
-		$this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
-		$this->assertEquals($stat['mtime'], $mTime);
-
-		if ($this->instance->touch('/lorem.txt', 100) !== false) {
-			$mTime = $this->instance->filemtime('/lorem.txt');
-			$this->assertEquals($mTime, 100);
-		}
-
-		$mtimeStart = time();
-
-		$this->instance->unlink('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 5));
-	}
-
-	/**
-	 * Test whether checkUpdate properly returns false when there was
-	 * no change.
-	 */
-	public function testCheckUpdate(): void {
-		if ($this->instance instanceof Wrapper) {
-			$this->markTestSkipped('Cannot test update check on wrappers');
-		}
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$watcher = $this->instance->getWatcher();
-		$watcher->setPolicy(Watcher::CHECK_ALWAYS);
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-		$this->assertTrue($watcher->checkUpdate('/lorem.txt'), 'Update detected');
-		$this->assertFalse($watcher->checkUpdate('/lorem.txt'), 'No update');
-	}
-
-	public function testUnlink(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-
-		$this->assertTrue($this->instance->file_exists('/lorem.txt'));
-
-		$this->assertTrue($this->instance->unlink('/lorem.txt'));
-		$this->wait();
-
-		$this->assertFalse($this->instance->file_exists('/lorem.txt'));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('fileNameProvider')]
-	public function testFOpen($fileName): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-
-		$fh = @$this->instance->fopen($fileName, 'r');
-		if ($fh) {
-			fclose($fh);
-		}
-		$this->assertFalse($fh);
-		$this->assertFalse($this->instance->file_exists($fileName));
-
-		$fh = $this->instance->fopen($fileName, 'w');
-		fwrite($fh, file_get_contents($textFile));
-		fclose($fh);
-		$this->assertTrue($this->instance->file_exists($fileName));
-
-		$fh = $this->instance->fopen($fileName, 'r');
-		$this->assertTrue(is_resource($fh));
-		$content = stream_get_contents($fh);
-		$this->assertEquals(file_get_contents($textFile), $content);
-	}
-
-	public function testTouchCreateFile(): void {
-		$this->assertFalse($this->instance->file_exists('touch'));
-		// returns true on success
-		$this->assertTrue($this->instance->touch('touch'));
-		$this->assertTrue($this->instance->file_exists('touch'));
-	}
-
-	public function testRecursiveRmdir(): void {
-		$this->instance->mkdir('folder');
-		$this->instance->mkdir('folder/bar');
-		$this->wait();
-		$this->instance->file_put_contents('folder/asd.txt', 'foobar');
-		$this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
-		$this->assertTrue($this->instance->rmdir('folder'));
-		$this->wait();
-		$this->assertFalse($this->instance->file_exists('folder/asd.txt'));
-		$this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
-		$this->assertFalse($this->instance->file_exists('folder/bar'));
-		$this->assertFalse($this->instance->file_exists('folder'));
-	}
-
-	public function testRmdirEmptyFolder(): void {
-		$this->assertTrue($this->instance->mkdir('empty'));
-		$this->wait();
-		$this->assertTrue($this->instance->rmdir('empty'));
-		$this->assertFalse($this->instance->file_exists('empty'));
-	}
-
-	public function testRecursiveUnlink(): void {
-		$this->instance->mkdir('folder');
-		$this->instance->mkdir('folder/bar');
-		$this->instance->file_put_contents('folder/asd.txt', 'foobar');
-		$this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
-		$this->assertTrue($this->instance->unlink('folder'));
-		$this->wait();
-		$this->assertFalse($this->instance->file_exists('folder/asd.txt'));
-		$this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
-		$this->assertFalse($this->instance->file_exists('folder/bar'));
-		$this->assertFalse($this->instance->file_exists('folder'));
-	}
-
-	public static function hashProvider(): array {
-		return [
-			['Foobar', 'md5'],
-			['Foobar', 'sha1'],
-			['Foobar', 'sha256'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('hashProvider')]
-	public function testHash($data, $type): void {
-		$this->instance->file_put_contents('hash.txt', $data);
-		$this->assertEquals(hash($type, $data), $this->instance->hash($type, 'hash.txt'));
-		$this->assertEquals(hash($type, $data, true), $this->instance->hash($type, 'hash.txt', true));
-	}
-
-	public function testHashInFileName(): void {
-		$this->instance->file_put_contents('#test.txt', 'data');
-		$this->assertEquals('data', $this->instance->file_get_contents('#test.txt'));
-
-		$this->instance->mkdir('#foo');
-		$this->instance->file_put_contents('#foo/test.txt', 'data');
-		$this->assertEquals('data', $this->instance->file_get_contents('#foo/test.txt'));
-
-		$dh = $this->instance->opendir('#foo');
-		$content = [];
-		while ($file = readdir($dh)) {
-			if ($file != '.' && $file != '..') {
-				$content[] = $file;
-			}
-		}
-
-		$this->assertEquals(['test.txt'], $content);
-	}
-
-	public function testCopyOverWriteFile(): void {
-		$this->instance->file_put_contents('target.txt', 'foo');
-		$this->instance->file_put_contents('source.txt', 'bar');
-		$this->instance->copy('source.txt', 'target.txt');
-		$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
-	}
-
-	public function testRenameOverWriteFile(): void {
-		$this->instance->file_put_contents('target.txt', 'foo');
-		$this->instance->file_put_contents('source.txt', 'bar');
-		$this->instance->rename('source.txt', 'target.txt');
-		$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
-		$this->assertFalse($this->instance->file_exists('source.txt'));
-	}
-
-	public function testRenameDirectory(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-		$this->instance->file_put_contents('source/test2.txt', 'qwerty');
-		$this->instance->mkdir('source/subfolder');
-		$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
-		$this->instance->rename('source', 'target');
-
-		$this->assertFalse($this->instance->file_exists('source'));
-		$this->assertFalse($this->instance->file_exists('source/test1.txt'));
-		$this->assertFalse($this->instance->file_exists('source/test2.txt'));
-		$this->assertFalse($this->instance->file_exists('source/subfolder'));
-		$this->assertFalse($this->instance->file_exists('source/subfolder/test.txt'));
-
-		$this->assertTrue($this->instance->file_exists('target'));
-		$this->assertTrue($this->instance->file_exists('target/test1.txt'));
-		$this->assertTrue($this->instance->file_exists('target/test2.txt'));
-		$this->assertTrue($this->instance->file_exists('target/subfolder'));
-		$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
-
-		$contents = iterator_to_array($this->instance->getDirectoryContent(''));
-		$this->assertCount(1, $contents);
-
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
-		$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
-		$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
-	}
-
-	public function testRenameOverWriteDirectory(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-
-		$this->instance->mkdir('target');
-		$this->instance->file_put_contents('target/test1.txt', 'bar');
-		$this->instance->file_put_contents('target/test2.txt', 'bar');
-
-		$this->assertTrue($this->instance->rename('source', 'target'), 'rename must return true on success');
-
-		$this->assertFalse($this->instance->file_exists('source'), 'source has not been removed');
-		$this->assertFalse($this->instance->file_exists('source/test1.txt'), 'source/test1.txt has not been removed');
-		$this->assertFalse($this->instance->file_exists('target/test2.txt'), 'target/test2.txt has not been removed');
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'), 'target/test1.txt has not been overwritten');
-	}
-
-	public function testRenameOverWriteDirectoryOverFile(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-
-		$this->instance->file_put_contents('target', 'bar');
-
-		$this->assertTrue($this->instance->rename('source', 'target'), 'rename must return true on success');
-
-		$this->assertFalse($this->instance->file_exists('source'));
-		$this->assertFalse($this->instance->file_exists('source/test1.txt'));
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
-	}
-
-	public function testCopyDirectory(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-		$this->instance->file_put_contents('source/test2.txt', 'qwerty');
-		$this->instance->mkdir('source/subfolder');
-		$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
-		$this->instance->copy('source', 'target');
-
-		$this->assertTrue($this->instance->file_exists('source'));
-		$this->assertTrue($this->instance->file_exists('source/test1.txt'));
-		$this->assertTrue($this->instance->file_exists('source/test2.txt'));
-		$this->assertTrue($this->instance->file_exists('source/subfolder'));
-		$this->assertTrue($this->instance->file_exists('source/subfolder/test.txt'));
-
-		$this->assertTrue($this->instance->file_exists('target'));
-		$this->assertTrue($this->instance->file_exists('target/test1.txt'));
-		$this->assertTrue($this->instance->file_exists('target/test2.txt'));
-		$this->assertTrue($this->instance->file_exists('target/subfolder'));
-		$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
-
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
-		$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
-		$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
-	}
-
-	public function testCopyOverWriteDirectory(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-
-		$this->instance->mkdir('target');
-		$this->instance->file_put_contents('target/test1.txt', 'bar');
-		$this->instance->file_put_contents('target/test2.txt', 'bar');
-
-		$this->instance->copy('source', 'target');
-
-		$this->assertFalse($this->instance->file_exists('target/test2.txt'), 'File target/test2.txt should no longer exist, but does');
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
-	}
-
-	public function testCopyOverWriteDirectoryOverFile(): void {
-		$this->instance->mkdir('source');
-		$this->instance->file_put_contents('source/test1.txt', 'foo');
-
-		$this->instance->file_put_contents('target', 'bar');
-
-		$this->instance->copy('source', 'target');
-
-		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
-	}
-
-	public function testInstanceOfStorage(): void {
-		$this->assertTrue($this->instance->instanceOfStorage(IStorage::class));
-		$this->assertTrue($this->instance->instanceOfStorage(get_class($this->instance)));
-		$this->assertFalse($this->instance->instanceOfStorage('\OC'));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
-	public function testCopyFromSameStorage($source, $target): void {
-		$this->initSourceAndTarget($source);
-
-		$this->instance->copyFromStorage($this->instance, $source, $target);
-
-		$this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
-		$this->assertSameAsLorem($target);
-		$this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
-	}
-
-	public function testIsCreatable(): void {
-		$this->instance->mkdir('source');
-		$this->assertTrue($this->instance->isCreatable('source'));
-	}
-
-	public function testIsReadable(): void {
-		$this->instance->mkdir('source');
-		$this->assertTrue($this->instance->isReadable('source'));
-	}
-
-	public function testIsUpdatable(): void {
-		$this->instance->mkdir('source');
-		$this->assertTrue($this->instance->isUpdatable('source'));
-	}
-
-	public function testIsDeletable(): void {
-		$this->instance->mkdir('source');
-		$this->assertTrue($this->instance->isDeletable('source'));
-	}
-
-	public function testIsShareable(): void {
-		$this->instance->mkdir('source');
-		$this->assertTrue($this->instance->isSharable('source'));
-	}
-
-	public function testStatAfterWrite(): void {
-		$this->instance->file_put_contents('foo.txt', 'bar');
-		$stat = $this->instance->stat('foo.txt');
-		$this->assertEquals(3, $stat['size']);
-
-		$fh = $this->instance->fopen('foo.txt', 'w');
-		fwrite($fh, 'qwerty');
-		fclose($fh);
-
-		$stat = $this->instance->stat('foo.txt');
-		$this->assertEquals(6, $stat['size']);
-	}
-
-	public function testPartFile(): void {
-		$this->instance->file_put_contents('bar.txt.part', 'bar');
-		$this->instance->rename('bar.txt.part', 'bar.txt');
-		$this->assertEquals('bar', $this->instance->file_get_contents('bar.txt'));
-	}
-
-	public function testWriteStream(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-
-		if (!$this->instance->instanceOfStorage(IWriteStreamStorage::class)) {
-			$this->markTestSkipped('Not a WriteSteamStorage');
-		}
-		/** @var IWriteStreamStorage $storage */
-		$storage = $this->instance;
+    /**
+     * @var \OC\Files\Storage\Storage instance
+     */
+    protected $instance;
+    protected $waitDelay = 0;
+
+    /**
+     * Sleep for the number of seconds specified in the
+     * $waitDelay attribute
+     */
+    protected function wait() {
+        if ($this->waitDelay > 0) {
+            sleep($this->waitDelay);
+        }
+    }
+
+    /**
+     * the root folder of the storage should always exist, be readable and be recognized as a directory
+     */
+    public function testRoot(): void {
+        $this->assertTrue($this->instance->file_exists('/'), 'Root folder does not exist');
+        $this->assertTrue($this->instance->isReadable('/'), 'Root folder is not readable');
+        $this->assertTrue($this->instance->is_dir('/'), 'Root folder is not a directory');
+        $this->assertFalse($this->instance->is_file('/'), 'Root folder is a file');
+        $this->assertEquals('dir', $this->instance->filetype('/'));
+
+        //without this, any further testing would be useless, not an actual requirement for filestorage though
+        $this->assertTrue($this->instance->isUpdatable('/'), 'Root folder is not writable');
+    }
+
+    /**
+     * Check that the test() function works
+     */
+    public function testTestFunction(): void {
+        $this->assertTrue($this->instance->test());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('directoryProvider')]
+    public function testDirectories($directory): void {
+        $this->assertFalse($this->instance->file_exists('/' . $directory));
+
+        $this->assertTrue($this->instance->mkdir('/' . $directory));
+
+        $this->assertTrue($this->instance->file_exists('/' . $directory));
+        $this->assertTrue($this->instance->is_dir('/' . $directory));
+        $this->assertFalse($this->instance->is_file('/' . $directory));
+        $this->assertEquals('dir', $this->instance->filetype('/' . $directory));
+        $this->assertEquals(0, $this->instance->filesize('/' . $directory));
+        $this->assertTrue($this->instance->isReadable('/' . $directory));
+        $this->assertTrue($this->instance->isUpdatable('/' . $directory));
+
+        $dh = $this->instance->opendir('/');
+        $content = [];
+        while (($file = readdir($dh)) !== false) {
+            if ($file !== '.' && $file !== '..') {
+                $content[] = $file;
+            }
+        }
+        $this->assertEquals([$directory], $content);
+
+        $content = iterator_to_array($this->instance->getDirectoryContent('/'));
+
+        $this->assertCount(1, $content);
+        $dirEntry = $content[0];
+        unset($dirEntry['scan_permissions']);
+        unset($dirEntry['etag']);
+        $this->assertLessThanOrEqual(1, abs($dirEntry['mtime'] - $this->instance->filemtime($directory)));
+        unset($dirEntry['mtime']);
+        unset($dirEntry['storage_mtime']);
+        $this->assertEquals([
+            'name' => $directory,
+            'mimetype' => $this->instance->getMimeType($directory),
+            'size' => -1,
+            'permissions' => $this->instance->getPermissions($directory),
+        ], $dirEntry);
+
+        $this->assertFalse($this->instance->mkdir('/' . $directory)); //can't create existing folders
+        $this->assertTrue($this->instance->rmdir('/' . $directory));
+
+        $this->wait();
+        $this->assertFalse($this->instance->file_exists('/' . $directory));
+
+        $this->assertFalse($this->instance->rmdir('/' . $directory)); //can't remove non existing folders
+
+        $dh = $this->instance->opendir('/');
+        $content = [];
+        while (($file = readdir($dh)) !== false) {
+            if ($file != '.' && $file != '..') {
+                $content[] = $file;
+            }
+        }
+        $this->assertEquals([], $content);
+    }
+
+    public static function fileNameProvider(): array {
+        return [
+            ['file.txt'],
+            [' file.txt'],
+            ['folder .txt'],
+            ['file with space.txt'],
+            ['spéciäl fäile'],
+            ['test single\'quote.txt'],
+        ];
+    }
+
+    public static function directoryProvider(): array {
+        return [
+            ['folder'],
+            [' folder'],
+            ['folder '],
+            ['folder with space'],
+            ['spéciäl földer'],
+            ['test single\'quote'],
+        ];
+    }
+
+    public static function loremFileProvider(): array {
+        $root = \OC::$SERVERROOT . '/tests/data/';
+        return [
+            // small file
+            [$root . 'lorem.txt'],
+            // bigger file (> 8 KB which is the standard PHP block size)
+            [$root . 'lorem-big.txt']
+        ];
+    }
+
+    /**
+     * test the various uses of file_get_contents and file_put_contents
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('loremFileProvider')]
+    public function testGetPutContents($sourceFile): void {
+        $sourceText = file_get_contents($sourceFile);
+
+        //fill a file with string data
+        $this->instance->file_put_contents('/lorem.txt', $sourceText);
+        $this->assertFalse($this->instance->is_dir('/lorem.txt'));
+        $this->assertEquals($sourceText, $this->instance->file_get_contents('/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
+
+        //empty the file
+        $this->instance->file_put_contents('/lorem.txt', '');
+        $this->assertEquals('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
+    }
+
+    /**
+     * test various known mimetypes
+     */
+    public function testMimeType(): void {
+        $this->assertEquals('httpd/unix-directory', $this->instance->getMimeType('/'));
+        $this->assertEquals(false, $this->instance->getMimeType('/non/existing/file'));
+
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
+        $this->assertEquals('text/plain', $this->instance->getMimeType('/lorem.txt'));
+
+        $pngFile = \OC::$SERVERROOT . '/tests/data/desktopapp.png';
+        $this->instance->file_put_contents('/desktopapp.png', file_get_contents($pngFile, 'r'));
+        $this->assertEquals('image/png', $this->instance->getMimeType('/desktopapp.png'));
+
+        $svgFile = \OC::$SERVERROOT . '/tests/data/desktopapp.svg';
+        $this->instance->file_put_contents('/desktopapp.svg', file_get_contents($svgFile, 'r'));
+        $this->assertEquals('image/svg+xml', $this->instance->getMimeType('/desktopapp.svg'));
+    }
+
+
+    public static function copyAndMoveProvider(): array {
+        return [
+            ['/source.txt', '/target.txt'],
+            ['/source.txt', '/target with space.txt'],
+            ['/source with space.txt', '/target.txt'],
+            ['/source with space.txt', '/target with space.txt'],
+            ['/source.txt', '/tärgét.txt'],
+            ['/sòurcē.txt', '/target.txt'],
+            ['/sòurcē.txt', '/tärgét.txt'],
+            ['/single \' quote.txt', '/tar\'get.txt'],
+        ];
+    }
+
+    public function initSourceAndTarget($source, $target = null) {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->instance->file_put_contents($source, file_get_contents($textFile));
+        if ($target) {
+            $testContents = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+            $this->instance->file_put_contents($target, $testContents);
+        }
+    }
+
+    public function assertSameAsLorem($file) {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->assertEquals(
+            file_get_contents($textFile),
+            $this->instance->file_get_contents($file),
+            'Expected ' . $file . ' to be a copy of ' . $textFile
+        );
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
+    public function testCopy($source, $target): void {
+        $this->initSourceAndTarget($source);
+
+        $this->instance->copy($source, $target);
+
+        $this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
+        $this->assertSameAsLorem($target);
+        $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
+    public function testMove($source, $target): void {
+        $this->initSourceAndTarget($source);
+
+        $this->instance->rename($source, $target);
+
+        $this->wait();
+        $this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
+        $this->assertFalse($this->instance->file_exists($source), $source . ' still exists');
+        $this->assertSameAsLorem($target);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
+    public function testCopyOverwrite($source, $target): void {
+        $this->initSourceAndTarget($source, $target);
+
+        $this->instance->copy($source, $target);
+
+        $this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
+        $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
+        $this->assertSameAsLorem($target);
+        $this->assertSameAsLorem($source);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
+    public function testMoveOverwrite($source, $target): void {
+        $this->initSourceAndTarget($source, $target);
+
+        $this->instance->rename($source, $target);
+
+        $this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
+        $this->assertFalse($this->instance->file_exists($source), $source . ' still exists');
+        $this->assertSameAsLorem($target);
+    }
+
+    public function testLocal(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+        $localFile = $this->instance->getLocalFile('/lorem.txt');
+        $this->assertTrue(file_exists($localFile));
+        $this->assertEquals(file_get_contents($textFile), file_get_contents($localFile));
+
+        $this->instance->mkdir('/folder');
+        $this->instance->file_put_contents('/folder/lorem.txt', file_get_contents($textFile));
+        $this->instance->file_put_contents('/folder/bar.txt', 'asd');
+        $this->instance->mkdir('/folder/recursive');
+        $this->instance->file_put_contents('/folder/recursive/file.txt', 'foo');
+
+        // test below require to use instance->getLocalFile because the physical storage might be different
+        $localFile = $this->instance->getLocalFile('/folder/lorem.txt');
+        $this->assertTrue(file_exists($localFile));
+        $this->assertEquals(file_get_contents($localFile), file_get_contents($textFile));
+
+        $localFile = $this->instance->getLocalFile('/folder/bar.txt');
+        $this->assertTrue(file_exists($localFile));
+        $this->assertEquals(file_get_contents($localFile), 'asd');
+
+        $localFile = $this->instance->getLocalFile('/folder/recursive/file.txt');
+        $this->assertTrue(file_exists($localFile));
+        $this->assertEquals(file_get_contents($localFile), 'foo');
+    }
+
+    public function testStat(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $ctimeStart = time();
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+        $this->assertTrue($this->instance->isReadable('/lorem.txt'));
+        $ctimeEnd = time();
+        $mTime = $this->instance->filemtime('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
+        $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 5));
+
+        // check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
+        $this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
+        $this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
+        $this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
+
+        $stat = $this->instance->stat('/lorem.txt');
+        //only size and mtime are required in the result
+        $this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
+        $this->assertEquals($stat['mtime'], $mTime);
+
+        if ($this->instance->touch('/lorem.txt', 100) !== false) {
+            $mTime = $this->instance->filemtime('/lorem.txt');
+            $this->assertEquals($mTime, 100);
+        }
+
+        $mtimeStart = time();
+
+        $this->instance->unlink('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 5));
+    }
+
+    /**
+     * Test whether checkUpdate properly returns false when there was
+     * no change.
+     */
+    public function testCheckUpdate(): void {
+        if ($this->instance instanceof Wrapper) {
+            $this->markTestSkipped('Cannot test update check on wrappers');
+        }
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $watcher = $this->instance->getWatcher();
+        $watcher->setPolicy(Watcher::CHECK_ALWAYS);
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+        $this->assertTrue($watcher->checkUpdate('/lorem.txt'), 'Update detected');
+        $this->assertFalse($watcher->checkUpdate('/lorem.txt'), 'No update');
+    }
+
+    public function testUnlink(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+
+        $this->assertTrue($this->instance->file_exists('/lorem.txt'));
+
+        $this->assertTrue($this->instance->unlink('/lorem.txt'));
+        $this->wait();
+
+        $this->assertFalse($this->instance->file_exists('/lorem.txt'));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('fileNameProvider')]
+    public function testFOpen($fileName): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+
+        $fh = @$this->instance->fopen($fileName, 'r');
+        if ($fh) {
+            fclose($fh);
+        }
+        $this->assertFalse($fh);
+        $this->assertFalse($this->instance->file_exists($fileName));
+
+        $fh = $this->instance->fopen($fileName, 'w');
+        fwrite($fh, file_get_contents($textFile));
+        fclose($fh);
+        $this->assertTrue($this->instance->file_exists($fileName));
+
+        $fh = $this->instance->fopen($fileName, 'r');
+        $this->assertTrue(is_resource($fh));
+        $content = stream_get_contents($fh);
+        $this->assertEquals(file_get_contents($textFile), $content);
+    }
+
+    public function testTouchCreateFile(): void {
+        $this->assertFalse($this->instance->file_exists('touch'));
+        // returns true on success
+        $this->assertTrue($this->instance->touch('touch'));
+        $this->assertTrue($this->instance->file_exists('touch'));
+    }
+
+    public function testRecursiveRmdir(): void {
+        $this->instance->mkdir('folder');
+        $this->instance->mkdir('folder/bar');
+        $this->wait();
+        $this->instance->file_put_contents('folder/asd.txt', 'foobar');
+        $this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
+        $this->assertTrue($this->instance->rmdir('folder'));
+        $this->wait();
+        $this->assertFalse($this->instance->file_exists('folder/asd.txt'));
+        $this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
+        $this->assertFalse($this->instance->file_exists('folder/bar'));
+        $this->assertFalse($this->instance->file_exists('folder'));
+    }
+
+    public function testRmdirEmptyFolder(): void {
+        $this->assertTrue($this->instance->mkdir('empty'));
+        $this->wait();
+        $this->assertTrue($this->instance->rmdir('empty'));
+        $this->assertFalse($this->instance->file_exists('empty'));
+    }
+
+    public function testRecursiveUnlink(): void {
+        $this->instance->mkdir('folder');
+        $this->instance->mkdir('folder/bar');
+        $this->instance->file_put_contents('folder/asd.txt', 'foobar');
+        $this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
+        $this->assertTrue($this->instance->unlink('folder'));
+        $this->wait();
+        $this->assertFalse($this->instance->file_exists('folder/asd.txt'));
+        $this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
+        $this->assertFalse($this->instance->file_exists('folder/bar'));
+        $this->assertFalse($this->instance->file_exists('folder'));
+    }
+
+    public static function hashProvider(): array {
+        return [
+            ['Foobar', 'md5'],
+            ['Foobar', 'sha1'],
+            ['Foobar', 'sha256'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('hashProvider')]
+    public function testHash($data, $type): void {
+        $this->instance->file_put_contents('hash.txt', $data);
+        $this->assertEquals(hash($type, $data), $this->instance->hash($type, 'hash.txt'));
+        $this->assertEquals(hash($type, $data, true), $this->instance->hash($type, 'hash.txt', true));
+    }
+
+    public function testHashInFileName(): void {
+        $this->instance->file_put_contents('#test.txt', 'data');
+        $this->assertEquals('data', $this->instance->file_get_contents('#test.txt'));
+
+        $this->instance->mkdir('#foo');
+        $this->instance->file_put_contents('#foo/test.txt', 'data');
+        $this->assertEquals('data', $this->instance->file_get_contents('#foo/test.txt'));
+
+        $dh = $this->instance->opendir('#foo');
+        $content = [];
+        while ($file = readdir($dh)) {
+            if ($file != '.' && $file != '..') {
+                $content[] = $file;
+            }
+        }
+
+        $this->assertEquals(['test.txt'], $content);
+    }
+
+    public function testCopyOverWriteFile(): void {
+        $this->instance->file_put_contents('target.txt', 'foo');
+        $this->instance->file_put_contents('source.txt', 'bar');
+        $this->instance->copy('source.txt', 'target.txt');
+        $this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
+    }
+
+    public function testRenameOverWriteFile(): void {
+        $this->instance->file_put_contents('target.txt', 'foo');
+        $this->instance->file_put_contents('source.txt', 'bar');
+        $this->instance->rename('source.txt', 'target.txt');
+        $this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
+        $this->assertFalse($this->instance->file_exists('source.txt'));
+    }
+
+    public function testRenameDirectory(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+        $this->instance->file_put_contents('source/test2.txt', 'qwerty');
+        $this->instance->mkdir('source/subfolder');
+        $this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
+        $this->instance->rename('source', 'target');
+
+        $this->assertFalse($this->instance->file_exists('source'));
+        $this->assertFalse($this->instance->file_exists('source/test1.txt'));
+        $this->assertFalse($this->instance->file_exists('source/test2.txt'));
+        $this->assertFalse($this->instance->file_exists('source/subfolder'));
+        $this->assertFalse($this->instance->file_exists('source/subfolder/test.txt'));
+
+        $this->assertTrue($this->instance->file_exists('target'));
+        $this->assertTrue($this->instance->file_exists('target/test1.txt'));
+        $this->assertTrue($this->instance->file_exists('target/test2.txt'));
+        $this->assertTrue($this->instance->file_exists('target/subfolder'));
+        $this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
+
+        $contents = iterator_to_array($this->instance->getDirectoryContent(''));
+        $this->assertCount(1, $contents);
+
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+        $this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
+        $this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
+    }
+
+    public function testRenameOverWriteDirectory(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+
+        $this->instance->mkdir('target');
+        $this->instance->file_put_contents('target/test1.txt', 'bar');
+        $this->instance->file_put_contents('target/test2.txt', 'bar');
+
+        $this->assertTrue($this->instance->rename('source', 'target'), 'rename must return true on success');
+
+        $this->assertFalse($this->instance->file_exists('source'), 'source has not been removed');
+        $this->assertFalse($this->instance->file_exists('source/test1.txt'), 'source/test1.txt has not been removed');
+        $this->assertFalse($this->instance->file_exists('target/test2.txt'), 'target/test2.txt has not been removed');
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'), 'target/test1.txt has not been overwritten');
+    }
+
+    public function testRenameOverWriteDirectoryOverFile(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+
+        $this->instance->file_put_contents('target', 'bar');
+
+        $this->assertTrue($this->instance->rename('source', 'target'), 'rename must return true on success');
+
+        $this->assertFalse($this->instance->file_exists('source'));
+        $this->assertFalse($this->instance->file_exists('source/test1.txt'));
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+    }
+
+    public function testCopyDirectory(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+        $this->instance->file_put_contents('source/test2.txt', 'qwerty');
+        $this->instance->mkdir('source/subfolder');
+        $this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
+        $this->instance->copy('source', 'target');
+
+        $this->assertTrue($this->instance->file_exists('source'));
+        $this->assertTrue($this->instance->file_exists('source/test1.txt'));
+        $this->assertTrue($this->instance->file_exists('source/test2.txt'));
+        $this->assertTrue($this->instance->file_exists('source/subfolder'));
+        $this->assertTrue($this->instance->file_exists('source/subfolder/test.txt'));
+
+        $this->assertTrue($this->instance->file_exists('target'));
+        $this->assertTrue($this->instance->file_exists('target/test1.txt'));
+        $this->assertTrue($this->instance->file_exists('target/test2.txt'));
+        $this->assertTrue($this->instance->file_exists('target/subfolder'));
+        $this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
+
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+        $this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
+        $this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
+    }
+
+    public function testCopyOverWriteDirectory(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+
+        $this->instance->mkdir('target');
+        $this->instance->file_put_contents('target/test1.txt', 'bar');
+        $this->instance->file_put_contents('target/test2.txt', 'bar');
+
+        $this->instance->copy('source', 'target');
+
+        $this->assertFalse($this->instance->file_exists('target/test2.txt'), 'File target/test2.txt should no longer exist, but does');
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+    }
+
+    public function testCopyOverWriteDirectoryOverFile(): void {
+        $this->instance->mkdir('source');
+        $this->instance->file_put_contents('source/test1.txt', 'foo');
+
+        $this->instance->file_put_contents('target', 'bar');
+
+        $this->instance->copy('source', 'target');
+
+        $this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+    }
+
+    public function testInstanceOfStorage(): void {
+        $this->assertTrue($this->instance->instanceOfStorage(IStorage::class));
+        $this->assertTrue($this->instance->instanceOfStorage(get_class($this->instance)));
+        $this->assertFalse($this->instance->instanceOfStorage('\OC'));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('copyAndMoveProvider')]
+    public function testCopyFromSameStorage($source, $target): void {
+        $this->initSourceAndTarget($source);
+
+        $this->instance->copyFromStorage($this->instance, $source, $target);
+
+        $this->assertTrue($this->instance->file_exists($target), $target . ' was not created');
+        $this->assertSameAsLorem($target);
+        $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
+    }
+
+    public function testIsCreatable(): void {
+        $this->instance->mkdir('source');
+        $this->assertTrue($this->instance->isCreatable('source'));
+    }
+
+    public function testIsReadable(): void {
+        $this->instance->mkdir('source');
+        $this->assertTrue($this->instance->isReadable('source'));
+    }
+
+    public function testIsUpdatable(): void {
+        $this->instance->mkdir('source');
+        $this->assertTrue($this->instance->isUpdatable('source'));
+    }
+
+    public function testIsDeletable(): void {
+        $this->instance->mkdir('source');
+        $this->assertTrue($this->instance->isDeletable('source'));
+    }
+
+    public function testIsShareable(): void {
+        $this->instance->mkdir('source');
+        $this->assertTrue($this->instance->isSharable('source'));
+    }
+
+    public function testStatAfterWrite(): void {
+        $this->instance->file_put_contents('foo.txt', 'bar');
+        $stat = $this->instance->stat('foo.txt');
+        $this->assertEquals(3, $stat['size']);
+
+        $fh = $this->instance->fopen('foo.txt', 'w');
+        fwrite($fh, 'qwerty');
+        fclose($fh);
+
+        $stat = $this->instance->stat('foo.txt');
+        $this->assertEquals(6, $stat['size']);
+    }
+
+    public function testPartFile(): void {
+        $this->instance->file_put_contents('bar.txt.part', 'bar');
+        $this->instance->rename('bar.txt.part', 'bar.txt');
+        $this->assertEquals('bar', $this->instance->file_get_contents('bar.txt'));
+    }
+
+    public function testWriteStream(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+
+        if (!$this->instance->instanceOfStorage(IWriteStreamStorage::class)) {
+            $this->markTestSkipped('Not a WriteSteamStorage');
+        }
+        /** @var IWriteStreamStorage $storage */
+        $storage = $this->instance;
 
-		$source = fopen($textFile, 'r');
-
-		$storage->writeStream('test.txt', $source);
-		$this->assertTrue($storage->file_exists('test.txt'));
-		$this->assertStringEqualsFile($textFile, $storage->file_get_contents('test.txt'));
-		$this->assertEquals('resource (closed)', gettype($source));
-	}
+        $source = fopen($textFile, 'r');
+
+        $storage->writeStream('test.txt', $source);
+        $this->assertTrue($storage->file_exists('test.txt'));
+        $this->assertStringEqualsFile($textFile, $storage->file_get_contents('test.txt'));
+        $this->assertEquals('resource (closed)', gettype($source));
+    }
 
-	public function testFseekSize(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('bar.txt', file_get_contents($textFile));
+    public function testFseekSize(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $this->instance->file_put_contents('bar.txt', file_get_contents($textFile));
 
-		$size = $this->instance->filesize('bar.txt');
-		$this->assertEquals(filesize($textFile), $size);
-		$fh = $this->instance->fopen('bar.txt', 'r');
-
-		fseek($fh, 0, SEEK_END);
-		$pos = ftell($fh);
+        $size = $this->instance->filesize('bar.txt');
+        $this->assertEquals(filesize($textFile), $size);
+        $fh = $this->instance->fopen('bar.txt', 'r');
+
+        fseek($fh, 0, SEEK_END);
+        $pos = ftell($fh);
 
-		$this->assertEquals($size, $pos);
-	}
+        $this->assertEquals($size, $pos);
+    }
 }

apps/files/lib/Command/ScanAppData.php

Indentation +230 added lines, -230 removed lines

@@ -28,234 +28,234 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ScanAppData extends Base {
-	protected float $execTime = 0;
-
-	protected int $foldersCounter = 0;
-
-	protected int $filesCounter = 0;
-	protected int $previewsCounter = -1;
-
-	public function __construct(
-		protected IRootFolder $rootFolder,
-		protected IConfig $config,
-		private StorageFactory $previewStorage,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		parent::configure();
-
-		$this
-			->setName('files:scan-app-data')
-			->setDescription('rescan the AppData folder');
-
-		$this->addArgument('folder', InputArgument::OPTIONAL, 'The appdata subfolder to scan', '');
-	}
-
-	protected function scanFiles(OutputInterface $output, string $folder): int {
-		if ($folder === 'preview' || $folder === '') {
-			$this->previewsCounter = $this->previewStorage->scan();
-
-			if ($folder === 'preview') {
-				return self::SUCCESS;
-			}
-		}
-
-		try {
-			/** @var Folder $appData */
-			$appData = $this->getAppDataFolder();
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>NoAppData folder found</error>');
-			return self::FAILURE;
-		}
-
-		if ($folder !== '') {
-			try {
-				$appData = $appData->get($folder);
-			} catch (NotFoundException $e) {
-				$output->writeln('<error>Could not find folder: ' . $folder . '</error>');
-				return self::FAILURE;
-			}
-		}
-
-		$connection = $this->reconnectToDatabase($output);
-		$scanner = new Scanner(
-			null,
-			new ConnectionAdapter($connection),
-			Server::get(IEventDispatcher::class),
-			Server::get(LoggerInterface::class)
-		);
-
-		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output): void {
-			$output->writeln("\tFile   <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
-			++$this->filesCounter;
-			$this->abortIfInterrupted();
-		});
-
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output): void {
-			$output->writeln("\tFolder <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
-			++$this->foldersCounter;
-			$this->abortIfInterrupted();
-		});
-
-		$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output): void {
-			$output->writeln('Error while scanning, storage not available (' . $e->getMessage() . ')', OutputInterface::VERBOSITY_VERBOSE);
-		});
-
-		$scanner->listen('\OC\Files\Utils\Scanner', 'normalizedNameMismatch', function ($fullPath) use ($output): void {
-			$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
-		});
-
-		try {
-			$scanner->scan($appData->getPath());
-		} catch (ForbiddenException $e) {
-			$output->writeln('<error>Storage not writable</error>');
-			$output->writeln('<info>Make sure you\'re running the scan command only as the user the web server runs as</info>');
-			return self::FAILURE;
-		} catch (InterruptedException $e) {
-			# exit the function if ctrl-c has been pressed
-			$output->writeln('<info>Interrupted by user</info>');
-			return self::FAILURE;
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Path not found: ' . $e->getMessage() . '</error>');
-			return self::FAILURE;
-		} catch (\Exception $e) {
-			$output->writeln('<error>Exception during scan: ' . $e->getMessage() . '</error>');
-			$output->writeln('<error>' . $e->getTraceAsString() . '</error>');
-			return self::FAILURE;
-		}
-
-		return self::SUCCESS;
-	}
-
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		# restrict the verbosity level to VERBOSITY_VERBOSE
-		if ($output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
-		}
-
-		$output->writeln('Scanning AppData for files');
-		$output->writeln('');
-
-		$folder = $input->getArgument('folder');
-
-		$this->initTools();
-
-		$exitCode = $this->scanFiles($output, $folder);
-		if ($exitCode === self::SUCCESS) {
-			$this->presentStats($output);
-		}
-		return $exitCode;
-	}
-
-	/**
-	 * Initialises some useful tools for the Command
-	 */
-	protected function initTools(): void {
-		// Start the timer
-		$this->execTime = -microtime(true);
-		// Convert PHP errors to exceptions
-		set_error_handler([$this, 'exceptionErrorHandler'], E_ALL);
-	}
-
-	/**
-	 * Processes PHP errors as exceptions in order to be able to keep track of problems
-	 *
-	 * @see https://www.php.net/manual/en/function.set-error-handler.php
-	 *
-	 * @param int $severity the level of the error raised
-	 * @param string $message
-	 * @param string $file the filename that the error was raised in
-	 * @param int $line the line number the error was raised
-	 *
-	 * @throws \ErrorException
-	 */
-	public function exceptionErrorHandler(int $severity, string $message, string $file, int $line): void {
-		if (!(error_reporting() & $severity)) {
-			// This error code is not included in error_reporting
-			return;
-		}
-		throw new \ErrorException($message, 0, $severity, $file, $line);
-	}
-
-	protected function presentStats(OutputInterface $output): void {
-		// Stop the timer
-		$this->execTime += microtime(true);
-		if ($this->previewsCounter !== -1) {
-			$headers[] = 'Previews';
-		}
-		$headers[] = 'Folders';
-		$headers[] = 'Files';
-		$headers[] = 'Elapsed time';
-
-		$this->showSummary($headers, null, $output);
-	}
-
-	/**
-	 * Shows a summary of operations
-	 *
-	 * @param string[] $headers
-	 * @param string[] $rows
-	 */
-	protected function showSummary(array $headers, ?array $rows, OutputInterface $output): void {
-		$niceDate = $this->formatExecTime();
-		if (!$rows) {
-			if ($this->previewsCounter !== -1) {
-				$rows[] = $this->previewsCounter;
-			}
-			$rows[] = $this->foldersCounter;
-			$rows[] = $this->filesCounter;
-			$rows[] = $niceDate;
-		}
-		$table = new Table($output);
-		$table
-			->setHeaders($headers)
-			->setRows([$rows]);
-		$table->render();
-	}
-
-
-	/**
-	 * Formats microtime into a human-readable format
-	 */
-	protected function formatExecTime(): string {
-		$secs = round($this->execTime);
-		# convert seconds into HH:MM:SS form
-		return sprintf('%02d:%02d:%02d', (int)($secs / 3600), ((int)($secs / 60) % 60), (int)$secs % 60);
-	}
-
-	protected function reconnectToDatabase(OutputInterface $output): Connection {
-		/** @var Connection $connection */
-		$connection = Server::get(Connection::class);
-		try {
-			$connection->close();
-		} catch (\Exception $ex) {
-			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
-		}
-		while (!$connection->isConnected()) {
-			try {
-				$connection->connect();
-			} catch (\Exception $ex) {
-				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
-				sleep(60);
-			}
-		}
-		return $connection;
-	}
-
-	/**
-	 * @throws NotFoundException
-	 */
-	private function getAppDataFolder(): Node {
-		$instanceId = $this->config->getSystemValue('instanceid', null);
-
-		if ($instanceId === null) {
-			throw new NotFoundException();
-		}
-
-		return $this->rootFolder->get('appdata_' . $instanceId);
-	}
+    protected float $execTime = 0;
+
+    protected int $foldersCounter = 0;
+
+    protected int $filesCounter = 0;
+    protected int $previewsCounter = -1;
+
+    public function __construct(
+        protected IRootFolder $rootFolder,
+        protected IConfig $config,
+        private StorageFactory $previewStorage,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        parent::configure();
+
+        $this
+            ->setName('files:scan-app-data')
+            ->setDescription('rescan the AppData folder');
+
+        $this->addArgument('folder', InputArgument::OPTIONAL, 'The appdata subfolder to scan', '');
+    }
+
+    protected function scanFiles(OutputInterface $output, string $folder): int {
+        if ($folder === 'preview' || $folder === '') {
+            $this->previewsCounter = $this->previewStorage->scan();
+
+            if ($folder === 'preview') {
+                return self::SUCCESS;
+            }
+        }
+
+        try {
+            /** @var Folder $appData */
+            $appData = $this->getAppDataFolder();
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>NoAppData folder found</error>');
+            return self::FAILURE;
+        }
+
+        if ($folder !== '') {
+            try {
+                $appData = $appData->get($folder);
+            } catch (NotFoundException $e) {
+                $output->writeln('<error>Could not find folder: ' . $folder . '</error>');
+                return self::FAILURE;
+            }
+        }
+
+        $connection = $this->reconnectToDatabase($output);
+        $scanner = new Scanner(
+            null,
+            new ConnectionAdapter($connection),
+            Server::get(IEventDispatcher::class),
+            Server::get(LoggerInterface::class)
+        );
+
+        # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
+        $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output): void {
+            $output->writeln("\tFile   <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
+            ++$this->filesCounter;
+            $this->abortIfInterrupted();
+        });
+
+        $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output): void {
+            $output->writeln("\tFolder <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
+            ++$this->foldersCounter;
+            $this->abortIfInterrupted();
+        });
+
+        $scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output): void {
+            $output->writeln('Error while scanning, storage not available (' . $e->getMessage() . ')', OutputInterface::VERBOSITY_VERBOSE);
+        });
+
+        $scanner->listen('\OC\Files\Utils\Scanner', 'normalizedNameMismatch', function ($fullPath) use ($output): void {
+            $output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
+        });
+
+        try {
+            $scanner->scan($appData->getPath());
+        } catch (ForbiddenException $e) {
+            $output->writeln('<error>Storage not writable</error>');
+            $output->writeln('<info>Make sure you\'re running the scan command only as the user the web server runs as</info>');
+            return self::FAILURE;
+        } catch (InterruptedException $e) {
+            # exit the function if ctrl-c has been pressed
+            $output->writeln('<info>Interrupted by user</info>');
+            return self::FAILURE;
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Path not found: ' . $e->getMessage() . '</error>');
+            return self::FAILURE;
+        } catch (\Exception $e) {
+            $output->writeln('<error>Exception during scan: ' . $e->getMessage() . '</error>');
+            $output->writeln('<error>' . $e->getTraceAsString() . '</error>');
+            return self::FAILURE;
+        }
+
+        return self::SUCCESS;
+    }
+
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        # restrict the verbosity level to VERBOSITY_VERBOSE
+        if ($output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+        }
+
+        $output->writeln('Scanning AppData for files');
+        $output->writeln('');
+
+        $folder = $input->getArgument('folder');
+
+        $this->initTools();
+
+        $exitCode = $this->scanFiles($output, $folder);
+        if ($exitCode === self::SUCCESS) {
+            $this->presentStats($output);
+        }
+        return $exitCode;
+    }
+
+    /**
+     * Initialises some useful tools for the Command
+     */
+    protected function initTools(): void {
+        // Start the timer
+        $this->execTime = -microtime(true);
+        // Convert PHP errors to exceptions
+        set_error_handler([$this, 'exceptionErrorHandler'], E_ALL);
+    }
+
+    /**
+     * Processes PHP errors as exceptions in order to be able to keep track of problems
+     *
+     * @see https://www.php.net/manual/en/function.set-error-handler.php
+     *
+     * @param int $severity the level of the error raised
+     * @param string $message
+     * @param string $file the filename that the error was raised in
+     * @param int $line the line number the error was raised
+     *
+     * @throws \ErrorException
+     */
+    public function exceptionErrorHandler(int $severity, string $message, string $file, int $line): void {
+        if (!(error_reporting() & $severity)) {
+            // This error code is not included in error_reporting
+            return;
+        }
+        throw new \ErrorException($message, 0, $severity, $file, $line);
+    }
+
+    protected function presentStats(OutputInterface $output): void {
+        // Stop the timer
+        $this->execTime += microtime(true);
+        if ($this->previewsCounter !== -1) {
+            $headers[] = 'Previews';
+        }
+        $headers[] = 'Folders';
+        $headers[] = 'Files';
+        $headers[] = 'Elapsed time';
+
+        $this->showSummary($headers, null, $output);
+    }
+
+    /**
+     * Shows a summary of operations
+     *
+     * @param string[] $headers
+     * @param string[] $rows
+     */
+    protected function showSummary(array $headers, ?array $rows, OutputInterface $output): void {
+        $niceDate = $this->formatExecTime();
+        if (!$rows) {
+            if ($this->previewsCounter !== -1) {
+                $rows[] = $this->previewsCounter;
+            }
+            $rows[] = $this->foldersCounter;
+            $rows[] = $this->filesCounter;
+            $rows[] = $niceDate;
+        }
+        $table = new Table($output);
+        $table
+            ->setHeaders($headers)
+            ->setRows([$rows]);
+        $table->render();
+    }
+
+
+    /**
+     * Formats microtime into a human-readable format
+     */
+    protected function formatExecTime(): string {
+        $secs = round($this->execTime);
+        # convert seconds into HH:MM:SS form
+        return sprintf('%02d:%02d:%02d', (int)($secs / 3600), ((int)($secs / 60) % 60), (int)$secs % 60);
+    }
+
+    protected function reconnectToDatabase(OutputInterface $output): Connection {
+        /** @var Connection $connection */
+        $connection = Server::get(Connection::class);
+        try {
+            $connection->close();
+        } catch (\Exception $ex) {
+            $output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+        }
+        while (!$connection->isConnected()) {
+            try {
+                $connection->connect();
+            } catch (\Exception $ex) {
+                $output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+                sleep(60);
+            }
+        }
+        return $connection;
+    }
+
+    /**
+     * @throws NotFoundException
+     */
+    private function getAppDataFolder(): Node {
+        $instanceId = $this->config->getSystemValue('instanceid', null);
+
+        if ($instanceId === null) {
+            throw new NotFoundException();
+        }
+
+        return $this->rootFolder->get('appdata_' . $instanceId);
+    }
 }

lib/private/Server.php

Indentation +1367 added lines, -1367 removed lines

@@ -249,1412 +249,1412 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
-			return new Watcher(
-				$c->get(\OC\Preview\Storage\StorageFactory::class),
-				$c->get(PreviewMapper::class),
-				$c->get(IDBConnection::class),
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IAppConfig::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$logger = $c->get(LoggerInterface::class);
-			$serverVersion = $c->get(ServerVersion::class);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				return new \OC\Memcache\Factory(
-					$logger,
-					$profiler,
-					$serverVersion,
-					ArrayCache::class,
-					ArrayCache::class,
-					ArrayCache::class
-				);
-			}
-
-			return new \OC\Memcache\Factory(
-				$logger,
-				$profiler,
-				$serverVersion,
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.local', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.distributed', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.locking', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('redis_log_file')
-			);
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n,
-				$c->get(ITimeFactory::class),
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
+            return new Watcher(
+                $c->get(\OC\Preview\Storage\StorageFactory::class),
+                $c->get(PreviewMapper::class),
+                $c->get(IDBConnection::class),
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IAppConfig::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerAlias(ICache::class, Cache\File::class);
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $logger = $c->get(LoggerInterface::class);
+            $serverVersion = $c->get(ServerVersion::class);
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                return new \OC\Memcache\Factory(
+                    $logger,
+                    $profiler,
+                    $serverVersion,
+                    ArrayCache::class,
+                    ArrayCache::class,
+                    ArrayCache::class
+                );
+            }
+
+            return new \OC\Memcache\Factory(
+                $logger,
+                $profiler,
+                $serverVersion,
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.local', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.distributed', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.locking', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('redis_log_file')
+            );
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n,
+                $c->get(ITimeFactory::class),
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->connectDispatcher();
-	}
+        $this->connectDispatcher();
+    }
 
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

Spacing +86 added lines, -86 removed lines

@@ -264,7 +264,7 @@ 
 		$this->registerParameter('isCLI', \OC::$CLI);
 		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
 		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
@@ -285,11 +285,11 @@ 
 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
-		$this->registerService(View::class, function (Server $c) {
+		$this->registerService(View::class, function(Server $c) {
 			return new View();
 		}, false);
 
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
+		$this->registerService(IPreview::class, function(ContainerInterface $c) {
 			return new PreviewManager(
 				$c->get(\OCP\IConfig::class),
 				$c->get(IRootFolder::class),
@@ -304,7 +304,7 @@ 
 		});
 		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
 
-		$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
+		$this->registerService(Watcher::class, function(ContainerInterface $c): Watcher {
 			return new Watcher(
 				$c->get(\OC\Preview\Storage\StorageFactory::class),
 				$c->get(PreviewMapper::class),
@@ -312,11 +312,11 @@ 
 			);
 		});
 
-		$this->registerService(IProfiler::class, function (Server $c) {
+		$this->registerService(IProfiler::class, function(Server $c) {
 			return new Profiler($c->get(SystemConfig::class));
 		});
 
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+		$this->registerService(Encryption\Manager::class, function(Server $c): Encryption\Manager {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -335,7 +335,7 @@ 
 		});
 		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
 
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
+		$this->registerService(IFile::class, function(ContainerInterface $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->get(IUserManager::class),
@@ -349,7 +349,7 @@ 
 			);
 		});
 
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
+		$this->registerService(IStorage::class, function(ContainerInterface $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -368,23 +368,23 @@ 
 
 		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+		$this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) {
 			/** @var \OCP\IConfig $config */
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagManager::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getManager();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
 
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getObjectMapper();
 		});
 		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
+		$this->registerService('RootFolder', function(ContainerInterface $c) {
 			$manager = \OC\Files\Filesystem::getMountManager();
 			$view = new View();
 			/** @var IUserSession $userSession */
@@ -410,7 +410,7 @@ 
 
 			return $root;
 		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
+		$this->registerService(HookConnector::class, function(ContainerInterface $c) {
 			return new HookConnector(
 				$c->get(IRootFolder::class),
 				new View(),
@@ -419,19 +419,19 @@ 
 			);
 		});
 
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(IRootFolder::class, function(ContainerInterface $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->get('RootFolder');
 			});
 		});
 
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+		$this->registerService(DisplayNameCache::class, function(ContainerInterface $c) {
 			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
 		});
 
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) {
 			$groupManager = new \OC\Group\Manager(
 				$this->get(IUserManager::class),
 				$this->get(IEventDispatcher::class),
@@ -442,7 +442,7 @@ 
 			return $groupManager;
 		});
 
-		$this->registerService(Store::class, function (ContainerInterface $c) {
+		$this->registerService(Store::class, function(ContainerInterface $c) {
 			$session = $c->get(ISession::class);
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
 				$tokenProvider = $c->get(IProvider::class);
@@ -457,7 +457,7 @@ 
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->get(IUserManager::class);
 			$session = new \OC\Session\Memory();
 			$timeFactory = new TimeFactory();
@@ -481,40 +481,40 @@ 
 				$c->get(IEventDispatcher::class),
 			);
 			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
 			});
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
 
@@ -522,12 +522,12 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+			$userSession->listen('\OC\User', 'preRememberedLogin', function($uid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
 
@@ -535,19 +535,19 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
+			$userSession->listen('\OC\User', 'logout', function($user) {
 				\OC_Hook::emit('OC_User', 'logout', []);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
+			$userSession->listen('\OC\User', 'postLogout', function($user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
 			});
@@ -561,7 +561,7 @@ 
 
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+		$this->registerService(\OC\SystemConfig::class, function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 
@@ -569,7 +569,7 @@ 
 		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
 		$this->registerAlias(IAppManager::class, AppManager::class);
 
-		$this->registerService(IFactory::class, function (Server $c) {
+		$this->registerService(IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->get(\OCP\IConfig::class),
 				$c->getRequest(),
@@ -583,7 +583,7 @@ 
 		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
 
 		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$profiler = $c->get(IProfiler::class);
 			$logger = $c->get(LoggerInterface::class);
 			$serverVersion = $c->get(ServerVersion::class);
@@ -616,12 +616,12 @@ 
 		});
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			$l10n = $this->get(IFactory::class)->get('lib');
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
@@ -634,14 +634,14 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(AvatarManager::class, function (Server $c) {
+		$this->registerService(AvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->get(IUserSession::class),
 				$c->get(\OC\User\Manager::class),
@@ -661,7 +661,7 @@ 
 		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
 
 		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->get(SystemConfig::class));
 			$logger = $factory->get($logType);
@@ -672,13 +672,13 @@ 
 		// PSR-3 logger
 		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->get(SystemConfig::class));
 		});
 
 		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
 
-		$this->registerService(Router::class, function (Server $c) {
+		$this->registerService(Router::class, function(Server $c) {
 			$cacheFactory = $c->get(ICacheFactory::class);
 			if ($cacheFactory->isLocalCacheAvailable()) {
 				$router = $c->resolve(CachingRouter::class);
@@ -689,7 +689,7 @@ 
 		});
 		$this->registerAlias(IRouter::class, Router::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			$config = $c->get(\OCP\IConfig::class);
 			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
 				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
@@ -719,7 +719,7 @@ 
 		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
 
 		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
+		$this->registerService(Connection::class, function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -732,17 +732,17 @@ 
 
 		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
 		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+		$this->registerService(NegativeDnsCache::class, function(ContainerInterface $c) {
 			return new NegativeDnsCache(
 				$c->get(ICacheFactory::class),
 			);
 		});
 		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IEventLogger::class, function(ContainerInterface $c) {
 			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
 		});
 
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IQueryLogger::class, function(ContainerInterface $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -754,7 +754,7 @@ 
 		$this->registerAlias(ITempManager::class, TempManager::class);
 		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
 
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -763,14 +763,14 @@ 
 			);
 		});
 
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+		$this->registerService(IUserMountCache::class, function(ContainerInterface $c) {
 			$mountCache = $c->get(UserMountCache::class);
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->get(IUserManager::class));
 			return $mountCache;
 		});
 
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+		$this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) {
 			$loader = $c->get(IStorageFactory::class);
 			$mountCache = $c->get(IUserMountCache::class);
 			$eventLogger = $c->get(IEventLogger::class);
@@ -789,7 +789,7 @@ 
 			return $manager;
 		});
 
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
+		$this->registerService(IBus::class, function(ContainerInterface $c) {
 			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -808,7 +808,7 @@ 
 		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
 		$this->registerAlias(IThrottler::class, Throttler::class);
 
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function($c) {
 			$config = $c->get(\OCP\IConfig::class);
 			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
 				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
@@ -821,7 +821,7 @@ 
 		});
 
 		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
+		$this->registerService(Checker::class, function(ContainerInterface $c) {
 			// IConfig requires a working database. This code
 			// might however be called when Nextcloud is not yet setup.
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
@@ -843,7 +843,7 @@ 
 				$c->get(IMimeTypeDetector::class)
 			);
 		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
+		$this->registerService(Request::class, function(ContainerInterface $c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -879,7 +879,7 @@ 
 		});
 		$this->registerAlias(\OCP\IRequest::class, Request::class);
 
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+		$this->registerService(IRequestId::class, function(ContainerInterface $c): IRequestId {
 			return new RequestId(
 				$_SERVER['UNIQUE_ID'] ?? '',
 				$this->get(ISecureRandom::class)
@@ -889,7 +889,7 @@ 
 		/** @since 32.0.0 */
 		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
 
-		$this->registerService(IMailer::class, function (Server $c) {
+		$this->registerService(IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->get(\OCP\IConfig::class),
 				$c->get(LoggerInterface::class),
@@ -905,7 +905,7 @@ 
 		/** @since 30.0.0 */
 		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
 
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass) || !class_exists($factoryClass)) {
@@ -914,11 +914,11 @@ 
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			return new $factoryClass($this);
 		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProvider::class, function(ContainerInterface $c) {
 			$factory = $c->get(ILDAPProviderFactory::class);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILockingProvider::class, function(ContainerInterface $c) {
 			$ini = $c->get(IniGetWrapper::class);
 			$config = $c->get(\OCP\IConfig::class);
 			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -940,51 +940,51 @@ 
 			return new NoopLockingProvider();
 		});
 
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
+		$this->registerService(ILockManager::class, function(Server $c): LockManager {
 			return new LockManager();
 		});
 
 		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
+		$this->registerService(SetupManager::class, function($c) {
 			// create the setupmanager through the mount manager to resolve the cyclic dependency
 			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
 		});
 		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
 
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+		$this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) {
 			return new \OC\Files\Type\Detection(
 				$c->get(IURLGenerator::class),
 				$c->get(LoggerInterface::class),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 
 		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
 		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
 
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+		$this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) {
 			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
 		});
 
-		$this->registerService(ICommentsManager::class, function (Server $c) {
+		$this->registerService(ICommentsManager::class, function(Server $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			$manager = $factory->getManager();
 
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->get(IUserManager::class);
 				$userDisplayName = $manager->getDisplayName($id);
 				if ($userDisplayName === null) {
@@ -998,7 +998,7 @@ 
 		});
 
 		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			try {
 				$classExists = class_exists('OCA\Theming\ThemingDefaults');
 			} catch (\OCP\AutoloadNotAllowedException $e) {
@@ -1039,7 +1039,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->get(IURLGenerator::class),
@@ -1050,7 +1050,7 @@ 
 		});
 		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
 
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+		$this->registerService('CryptoWrapper', function(ContainerInterface $c) {
 			// FIXME: Instantiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1074,12 +1074,12 @@ 
 				$request
 			);
 		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+		$this->registerService(SessionStorage::class, function(ContainerInterface $c) {
 			return new SessionStorage($c->get(ISession::class));
 		});
 		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
 
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1088,7 +1088,7 @@ 
 
 		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
 
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
 			$instance = new Collaboration\Collaborators\Search($c);
 
 			// register default plugins
@@ -1112,20 +1112,20 @@ 
 
 		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
 		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->get(IRootFolder::class),
 				$c->get(SystemConfig::class)
 			);
 		});
 
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(ContainerInterface $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->get(ISession::class);
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) {
 			return new DiscoveryService(
 				$c->get(ICacheFactory::class),
 				$c->get(IClientService::class)
@@ -1133,7 +1133,7 @@ 
 		});
 		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
 
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudIdManager::class, function(ContainerInterface $c) {
 			return new CloudIdManager(
 				$c->get(ICacheFactory::class),
 				$c->get(IEventDispatcher::class),
@@ -1145,7 +1145,7 @@ 
 
 		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
 		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1154,27 +1154,27 @@ 
 		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
 		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->get('ThemingDefaults')
 			);
 		});
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\ISession::class, function(ContainerInterface $c) {
 			return $c->get(\OCP\IUserSession::class)->getSession();
 		}, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+		$this->registerService(IShareHelper::class, function(ContainerInterface $c) {
 			return new ShareHelper(
 				$c->get(\OCP\Share\IManager::class)
 			);
 		});
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IApiFactory::class, function(ContainerInterface $c) {
 			return new ApiFactory($c->get(IClientService::class));
 		});
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IInstanceFactory::class, function(ContainerInterface $c) {
 			$memcacheFactory = $c->get(ICacheFactory::class);
 			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
 		});