nextcloud / server

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);
+    }
 }

tests/lib/Preview/MovePreviewJobTest.php

Indentation +188 added lines, -188 removed lines

@@ -31,192 +31,192 @@
 
 #[\PHPUnit\Framework\Attributes\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);
+    }
 }

lib/public/AppFramework/Db/Entity.php

Indentation +287 added lines, -287 removed lines

@@ -19,291 +19,291 @@
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	public int|string|null $id = null;
-	private array $_updatedFields = [];
-	/** @psalm-param $_fieldTypes array<string, Types::*> */
-	private array $_fieldTypes = ['id' => 'integer'];
-
-	/**
-	 * Simple alternative constructor for building entities from a request
-	 * @param array $params the array which was obtained via $this->params('key')
-	 *                      in the controller
-	 * @since 7.0.0
-	 */
-	public static function fromParams(array $params): static {
-		$instance = new static();
-
-		foreach ($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
-			$instance->$method($value);
-		}
-
-		return $instance;
-	}
-
-	/**
-	 * Maps the keys of the row array to the attributes
-	 * @param array $row the row to map onto the entity
-	 * @since 7.0.0
-	 */
-	public static function fromRow(array $row): static {
-		$instance = new static();
-
-		foreach ($row as $key => $value) {
-			$prop = $instance->columnToProperty($key);
-			$instance->setter($prop, [$value]);
-		}
-
-		$instance->resetUpdatedFields();
-
-		return $instance;
-	}
-
-
-	/**
-	 * @return array<string, Types::*> with attribute and type
-	 * @since 7.0.0
-	 */
-	public function getFieldTypes(): array {
-		return $this->_fieldTypes;
-	}
-
-
-	/**
-	 * Marks the entity as clean needed for setting the id after the insertion
-	 * @since 7.0.0
-	 */
-	public function resetUpdatedFields(): void {
-		$this->_updatedFields = [];
-	}
-
-	/**
-	 * Generic setter for properties
-	 *
-	 * @throws \InvalidArgumentException
-	 * @since 7.0.0
-	 *
-	 */
-	protected function setter(string $name, array $args): void {
-		// setters should only work for existing attributes
-		if (!property_exists($this, $name)) {
-			throw new \BadFunctionCallException($name . ' is not a valid attribute');
-		}
-
-		if ($args[0] === $this->$name) {
-			return;
-		}
-		$this->markFieldUpdated($name);
-
-		// if type definition exists, cast to correct type
-		if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
-			$type = $this->_fieldTypes[$name];
-			if ($type === Types::BLOB) {
-				// (B)LOB is treated as string when we read from the DB
-				if (is_resource($args[0])) {
-					$args[0] = stream_get_contents($args[0]);
-				}
-				$type = Types::STRING;
-			}
-
-			switch ($type) {
-				case Types::BIGINT:
-				case Types::SMALLINT:
-					settype($args[0], Types::INTEGER);
-					break;
-				case Types::BINARY:
-				case Types::DECIMAL:
-				case Types::TEXT:
-					settype($args[0], Types::STRING);
-					break;
-				case Types::TIME:
-				case Types::DATE:
-				case Types::DATETIME:
-				case Types::DATETIME_TZ:
-					if (!$args[0] instanceof \DateTime) {
-						$args[0] = new \DateTime($args[0]);
-					}
-					break;
-				case Types::TIME_IMMUTABLE:
-				case Types::DATE_IMMUTABLE:
-				case Types::DATETIME_IMMUTABLE:
-				case Types::DATETIME_TZ_IMMUTABLE:
-					if (!$args[0] instanceof \DateTimeImmutable) {
-						$args[0] = new \DateTimeImmutable($args[0]);
-					}
-					break;
-				case Types::JSON:
-					if (!is_array($args[0])) {
-						$args[0] = json_decode($args[0], true);
-					}
-					break;
-				default:
-					settype($args[0], $type);
-			}
-		}
-		$this->$name = $args[0];
-
-	}
-
-	/**
-	 * Generic getter for properties
-	 * @since 7.0.0
-	 */
-	protected function getter(string $name): mixed {
-		// getters should only work for existing attributes
-		if (property_exists($this, $name)) {
-			return $this->$name;
-		} else {
-			throw new \BadFunctionCallException($name
-				. ' is not a valid attribute');
-		}
-	}
-
-
-	/**
-	 * Each time a setter is called, push the part after set
-	 * into an array: for instance setId will save Id in the
-	 * updated fields array so it can be easily used to create the
-	 * getter method
-	 * @since 7.0.0
-	 */
-	public function __call(string $methodName, array $args) {
-		if (str_starts_with($methodName, 'set')) {
-			$this->setter(lcfirst(substr($methodName, 3)), $args);
-		} elseif (str_starts_with($methodName, 'get')) {
-			return $this->getter(lcfirst(substr($methodName, 3)));
-		} elseif ($this->isGetterForBoolProperty($methodName)) {
-			return $this->getter(lcfirst(substr($methodName, 2)));
-		} else {
-			throw new \BadFunctionCallException($methodName
-				. ' does not exist');
-		}
-	}
-
-	/**
-	 * @param string $methodName
-	 * @return bool
-	 * @since 18.0.0
-	 */
-	protected function isGetterForBoolProperty(string $methodName): bool {
-		if (str_starts_with($methodName, 'is')) {
-			$fieldName = lcfirst(substr($methodName, 2));
-			return isset($this->_fieldTypes[$fieldName]) && str_starts_with($this->_fieldTypes[$fieldName], 'bool');
-		}
-		return false;
-	}
-
-	/**
-	 * Mark am attribute as updated
-	 * @param string $attribute the name of the attribute
-	 * @since 7.0.0
-	 */
-	protected function markFieldUpdated(string $attribute): void {
-		$this->_updatedFields[$attribute] = true;
-	}
-
-
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @since 7.0.0
-	 */
-	public function columnToProperty(string $columnName) {
-		$parts = explode('_', $columnName);
-		$property = '';
-
-		foreach ($parts as $part) {
-			if ($property === '') {
-				$property = $part;
-			} else {
-				$property .= ucfirst($part);
-			}
-		}
-
-		return $property;
-	}
-
-
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 * @since 7.0.0
-	 */
-	public function propertyToColumn(string $property): string {
-		$parts = preg_split('/(?=[A-Z])/', $property);
-
-		$column = '';
-		foreach ($parts as $part) {
-			if ($column === '') {
-				$column = $part;
-			} else {
-				$column .= '_' . lcfirst($part);
-			}
-		}
-
-		return $column;
-	}
-
-
-	/**
-	 * @return array array of updated fields for update query
-	 * @since 7.0.0
-	 */
-	public function getUpdatedFields(): array {
-		return $this->_updatedFields;
-	}
-
-
-	/**
-	 * Adds type information for a field so that it's automatically cast to
-	 * that value once its being returned from the database
-	 *
-	 * @param string $fieldName the name of the attribute
-	 * @param Types::* $type the type which will be used to match a cast
-	 * @since 31.0.0 Parameter $type is now restricted to {@see Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
-	 * @since 7.0.0
-	 */
-	protected function addType(string $fieldName, string $type): void {
-		/** @psalm-suppress TypeDoesNotContainType */
-		if (in_array($type, ['bool', 'double', 'int', 'array', 'object'], true)) {
-			// Mapping legacy strings to the actual types
-			$type = match ($type) {
-				'int' => Types::INTEGER,
-				'bool' => Types::BOOLEAN,
-				'double' => Types::FLOAT,
-				'array',
-				'object' => Types::STRING,
-			};
-		}
-
-		$this->_fieldTypes[$fieldName] = $type;
-	}
-
-
-	/**
-	 * Slugify the value of a given attribute
-	 * Warning: This doesn't result in a unique value
-	 *
-	 * @param string $attributeName the name of the attribute, which value should be slugified
-	 * @return string slugified value
-	 * @since 7.0.0
-	 * @deprecated 24.0.0
-	 */
-	public function slugify(string $attributeName): string {
-		// toSlug should only work for existing attributes
-		if (property_exists($this, $attributeName)) {
-			$value = $this->$attributeName;
-			// replace everything except alphanumeric with a single '-'
-			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
-			$value = strtolower($value);
-			// trim '-'
-			return trim($value, '-');
-		}
-
-		throw new \BadFunctionCallException($attributeName . ' is not a valid attribute');
-	}
+    public int|string|null $id = null;
+    private array $_updatedFields = [];
+    /** @psalm-param $_fieldTypes array<string, Types::*> */
+    private array $_fieldTypes = ['id' => 'integer'];
+
+    /**
+     * Simple alternative constructor for building entities from a request
+     * @param array $params the array which was obtained via $this->params('key')
+     *                      in the controller
+     * @since 7.0.0
+     */
+    public static function fromParams(array $params): static {
+        $instance = new static();
+
+        foreach ($params as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            $instance->$method($value);
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Maps the keys of the row array to the attributes
+     * @param array $row the row to map onto the entity
+     * @since 7.0.0
+     */
+    public static function fromRow(array $row): static {
+        $instance = new static();
+
+        foreach ($row as $key => $value) {
+            $prop = $instance->columnToProperty($key);
+            $instance->setter($prop, [$value]);
+        }
+
+        $instance->resetUpdatedFields();
+
+        return $instance;
+    }
+
+
+    /**
+     * @return array<string, Types::*> with attribute and type
+     * @since 7.0.0
+     */
+    public function getFieldTypes(): array {
+        return $this->_fieldTypes;
+    }
+
+
+    /**
+     * Marks the entity as clean needed for setting the id after the insertion
+     * @since 7.0.0
+     */
+    public function resetUpdatedFields(): void {
+        $this->_updatedFields = [];
+    }
+
+    /**
+     * Generic setter for properties
+     *
+     * @throws \InvalidArgumentException
+     * @since 7.0.0
+     *
+     */
+    protected function setter(string $name, array $args): void {
+        // setters should only work for existing attributes
+        if (!property_exists($this, $name)) {
+            throw new \BadFunctionCallException($name . ' is not a valid attribute');
+        }
+
+        if ($args[0] === $this->$name) {
+            return;
+        }
+        $this->markFieldUpdated($name);
+
+        // if type definition exists, cast to correct type
+        if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+            $type = $this->_fieldTypes[$name];
+            if ($type === Types::BLOB) {
+                // (B)LOB is treated as string when we read from the DB
+                if (is_resource($args[0])) {
+                    $args[0] = stream_get_contents($args[0]);
+                }
+                $type = Types::STRING;
+            }
+
+            switch ($type) {
+                case Types::BIGINT:
+                case Types::SMALLINT:
+                    settype($args[0], Types::INTEGER);
+                    break;
+                case Types::BINARY:
+                case Types::DECIMAL:
+                case Types::TEXT:
+                    settype($args[0], Types::STRING);
+                    break;
+                case Types::TIME:
+                case Types::DATE:
+                case Types::DATETIME:
+                case Types::DATETIME_TZ:
+                    if (!$args[0] instanceof \DateTime) {
+                        $args[0] = new \DateTime($args[0]);
+                    }
+                    break;
+                case Types::TIME_IMMUTABLE:
+                case Types::DATE_IMMUTABLE:
+                case Types::DATETIME_IMMUTABLE:
+                case Types::DATETIME_TZ_IMMUTABLE:
+                    if (!$args[0] instanceof \DateTimeImmutable) {
+                        $args[0] = new \DateTimeImmutable($args[0]);
+                    }
+                    break;
+                case Types::JSON:
+                    if (!is_array($args[0])) {
+                        $args[0] = json_decode($args[0], true);
+                    }
+                    break;
+                default:
+                    settype($args[0], $type);
+            }
+        }
+        $this->$name = $args[0];
+
+    }
+
+    /**
+     * Generic getter for properties
+     * @since 7.0.0
+     */
+    protected function getter(string $name): mixed {
+        // getters should only work for existing attributes
+        if (property_exists($this, $name)) {
+            return $this->$name;
+        } else {
+            throw new \BadFunctionCallException($name
+                . ' is not a valid attribute');
+        }
+    }
+
+
+    /**
+     * Each time a setter is called, push the part after set
+     * into an array: for instance setId will save Id in the
+     * updated fields array so it can be easily used to create the
+     * getter method
+     * @since 7.0.0
+     */
+    public function __call(string $methodName, array $args) {
+        if (str_starts_with($methodName, 'set')) {
+            $this->setter(lcfirst(substr($methodName, 3)), $args);
+        } elseif (str_starts_with($methodName, 'get')) {
+            return $this->getter(lcfirst(substr($methodName, 3)));
+        } elseif ($this->isGetterForBoolProperty($methodName)) {
+            return $this->getter(lcfirst(substr($methodName, 2)));
+        } else {
+            throw new \BadFunctionCallException($methodName
+                . ' does not exist');
+        }
+    }
+
+    /**
+     * @param string $methodName
+     * @return bool
+     * @since 18.0.0
+     */
+    protected function isGetterForBoolProperty(string $methodName): bool {
+        if (str_starts_with($methodName, 'is')) {
+            $fieldName = lcfirst(substr($methodName, 2));
+            return isset($this->_fieldTypes[$fieldName]) && str_starts_with($this->_fieldTypes[$fieldName], 'bool');
+        }
+        return false;
+    }
+
+    /**
+     * Mark am attribute as updated
+     * @param string $attribute the name of the attribute
+     * @since 7.0.0
+     */
+    protected function markFieldUpdated(string $attribute): void {
+        $this->_updatedFields[$attribute] = true;
+    }
+
+
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @since 7.0.0
+     */
+    public function columnToProperty(string $columnName) {
+        $parts = explode('_', $columnName);
+        $property = '';
+
+        foreach ($parts as $part) {
+            if ($property === '') {
+                $property = $part;
+            } else {
+                $property .= ucfirst($part);
+            }
+        }
+
+        return $property;
+    }
+
+
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     * @since 7.0.0
+     */
+    public function propertyToColumn(string $property): string {
+        $parts = preg_split('/(?=[A-Z])/', $property);
+
+        $column = '';
+        foreach ($parts as $part) {
+            if ($column === '') {
+                $column = $part;
+            } else {
+                $column .= '_' . lcfirst($part);
+            }
+        }
+
+        return $column;
+    }
+
+
+    /**
+     * @return array array of updated fields for update query
+     * @since 7.0.0
+     */
+    public function getUpdatedFields(): array {
+        return $this->_updatedFields;
+    }
+
+
+    /**
+     * Adds type information for a field so that it's automatically cast to
+     * that value once its being returned from the database
+     *
+     * @param string $fieldName the name of the attribute
+     * @param Types::* $type the type which will be used to match a cast
+     * @since 31.0.0 Parameter $type is now restricted to {@see Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
+     * @since 7.0.0
+     */
+    protected function addType(string $fieldName, string $type): void {
+        /** @psalm-suppress TypeDoesNotContainType */
+        if (in_array($type, ['bool', 'double', 'int', 'array', 'object'], true)) {
+            // Mapping legacy strings to the actual types
+            $type = match ($type) {
+                'int' => Types::INTEGER,
+                'bool' => Types::BOOLEAN,
+                'double' => Types::FLOAT,
+                'array',
+                'object' => Types::STRING,
+            };
+        }
+
+        $this->_fieldTypes[$fieldName] = $type;
+    }
+
+
+    /**
+     * Slugify the value of a given attribute
+     * Warning: This doesn't result in a unique value
+     *
+     * @param string $attributeName the name of the attribute, which value should be slugified
+     * @return string slugified value
+     * @since 7.0.0
+     * @deprecated 24.0.0
+     */
+    public function slugify(string $attributeName): string {
+        // toSlug should only work for existing attributes
+        if (property_exists($this, $attributeName)) {
+            $value = $this->$attributeName;
+            // replace everything except alphanumeric with a single '-'
+            $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+            $value = strtolower($value);
+            // trim '-'
+            return trim($value, '-');
+        }
+
+        throw new \BadFunctionCallException($attributeName . ' is not a valid attribute');
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	public int|string|null $id = null;
+	public int | string | null $id = null;
 	private array $_updatedFields = [];
 	/** @psalm-param $_fieldTypes array<string, Types::*> */
 	private array $_fieldTypes = ['id' => 'integer'];
@@ -34,7 +34,7 @@ 
 		$instance = new static();
 
 		foreach ($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
+			$method = 'set'.ucfirst($key);
 			$instance->$method($value);
 		}
 
@@ -87,7 +87,7 @@ 
 	protected function setter(string $name, array $args): void {
 		// setters should only work for existing attributes
 		if (!property_exists($this, $name)) {
-			throw new \BadFunctionCallException($name . ' is not a valid attribute');
+			throw new \BadFunctionCallException($name.' is not a valid attribute');
 		}
 
 		if ($args[0] === $this->$name) {
@@ -241,7 +241,7 @@ 
 			if ($column === '') {
 				$column = $part;
 			} else {
-				$column .= '_' . lcfirst($part);
+				$column .= '_'.lcfirst($part);
 			}
 		}
 
@@ -304,6 +304,6 @@ 
 			return trim($value, '-');
 		}
 
-		throw new \BadFunctionCallException($attributeName . ' is not a valid attribute');
+		throw new \BadFunctionCallException($attributeName.' is not a valid attribute');
 	}
 }

lib/public/AppFramework/Db/SnowflakeAwareEntity.php

Indentation +34 added lines, -34 removed lines

@@ -21,38 +21,38 @@
  */
 #[Consumable(since: '33.0.0')]
 abstract class SnowflakeAwareEntity extends Entity {
-	protected ?Snowflake $snowflake = null;
-
-	/** @psalm-param $_fieldTypes array<string, Types::*> */
-	private array $_fieldTypes = ['id' => Types::STRING];
-
-	public function setId($id): void {
-		throw new \LogicException('Use generated id to set a new id to the Snowflake aware entity.');
-	}
-
-	/**
-	 * Automatically creates a snowflake ID
-	 */
-	public function generateId(): void {
-		if ($this->id === null) {
-			$this->id = Server::get(ISnowflakeGenerator::class)->nextId();
-			$this->markFieldUpdated('id');
-		}
-	}
-
-	public function getCreatedAt(): ?\DateTimeImmutable {
-		return $this->getSnowflake()?->getCreatedAt();
-	}
-
-	public function getSnowflake(): ?Snowflake {
-		if ($this->id === null) {
-			return null;
-		}
-
-		if ($this->snowflake === null) {
-			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->id);
-		}
-
-		return $this->snowflake;
-	}
+    protected ?Snowflake $snowflake = null;
+
+    /** @psalm-param $_fieldTypes array<string, Types::*> */
+    private array $_fieldTypes = ['id' => Types::STRING];
+
+    public function setId($id): void {
+        throw new \LogicException('Use generated id to set a new id to the Snowflake aware entity.');
+    }
+
+    /**
+     * Automatically creates a snowflake ID
+     */
+    public function generateId(): void {
+        if ($this->id === null) {
+            $this->id = Server::get(ISnowflakeGenerator::class)->nextId();
+            $this->markFieldUpdated('id');
+        }
+    }
+
+    public function getCreatedAt(): ?\DateTimeImmutable {
+        return $this->getSnowflake()?->getCreatedAt();
+    }
+
+    public function getSnowflake(): ?Snowflake {
+        if ($this->id === null) {
+            return null;
+        }
+
+        if ($this->snowflake === null) {
+            $this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->id);
+        }
+
+        return $this->snowflake;
+    }
 }

lib/public/AppFramework/Db/QBMapper.php

Indentation +358 added lines, -358 removed lines

@@ -22,362 +22,362 @@
  * @template T of Entity
  */
 abstract class QBMapper {
-	/** @var string */
-	protected $tableName;
-
-	/** @var string|class-string<T> */
-	protected $entityClass;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db Instance of the Db abstraction layer
-	 * @param string $tableName the name of the table. set this to allow entity
-	 * @param class-string<T>|null $entityClass the name of the entity that the sql should be
-	 *                                          mapped to queries without using sql
-	 * @since 14.0.0
-	 */
-	public function __construct(IDBConnection $db, string $tableName, ?string $entityClass = null) {
-		$this->db = $db;
-		$this->tableName = $tableName;
-
-		// if not given set the entity name to the class without the mapper part
-		// cache it here for later use since reflection is slow
-		if ($entityClass === null) {
-			$this->entityClass = str_replace('Mapper', '', \get_class($this));
-		} else {
-			$this->entityClass = $entityClass;
-		}
-	}
-
-
-	/**
-	 * @return string the table name
-	 * @since 14.0.0
-	 */
-	public function getTableName(): string {
-		return $this->tableName;
-	}
-
-
-	/**
-	 * Deletes an entity from the table
-	 *
-	 * @param Entity $entity the entity that should be deleted
-	 * @psalm-param T $entity the entity that should be deleted
-	 * @return Entity the deleted entity
-	 * @psalm-return T the deleted entity
-	 * @throws Exception
-	 * @since 14.0.0
-	 */
-	public function delete(Entity $entity): Entity {
-		$qb = $this->db->getQueryBuilder();
-
-		$idType = $this->getParameterTypeForProperty($entity, 'id');
-
-		$qb->delete($this->tableName)
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($entity->getId(), $idType))
-			);
-		$qb->executeStatement();
-		return $entity;
-	}
-
-	/**
-	 * Creates a new entry in the db from an entity
-	 *
-	 * @param Entity $entity the entity that should be created
-	 * @psalm-param T $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @psalm-return T the saved entity with the set id
-	 * @throws Exception
-	 * @since 14.0.0
-	 */
-	public function insert(Entity $entity): Entity {
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		$properties = $entity->getUpdatedFields();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->insert($this->tableName);
-
-		// build the fields
-		foreach ($properties as $property => $updated) {
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-			$value = $entity->$getter();
-
-			if ($property === 'id' && $entity->id === null) {
-				continue;
-			}
-			$type = $this->getParameterTypeForProperty($entity, $property);
-			$qb->setValue($column, $qb->createNamedParameter($value, $type));
-		}
-
-		if ($entity instanceof SnowflakeAwareEntity) {
-			/** @psalm-suppress DocblockTypeContradiction */
-			$entity->generateId();
-			$qb->executeStatement();
-		} elseif ($entity->id === null) {
-			$qb->executeStatement();
-			// When autoincrement is used id is always an int
-			$entity->setId($qb->getLastInsertId());
-		} else {
-			$qb->executeStatement();
-		}
-		return $entity;
-	}
-
-	/**
-	 * Tries to creates a new entry in the db from an entity and
-	 * updates an existing entry if duplicate keys are detected
-	 * by the database
-	 *
-	 * @param Entity $entity the entity that should be created/updated
-	 * @psalm-param T $entity the entity that should be created/updated
-	 * @return Entity the saved entity with the (new) id
-	 * @psalm-return T the saved entity with the (new) id
-	 * @throws Exception
-	 * @throws \InvalidArgumentException if entity has no id
-	 * @since 15.0.0
-	 */
-	public function insertOrUpdate(Entity $entity): Entity {
-		try {
-			return $this->insert($entity);
-		} catch (Exception $ex) {
-			if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				return $this->update($entity);
-			}
-			throw $ex;
-		}
-	}
-
-	/**
-	 * Updates an entry in the db from an entity
-	 *
-	 * @param Entity $entity the entity that should be created
-	 * @psalm-param T $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @psalm-return T the saved entity with the set id
-	 * @throws Exception
-	 * @throws \InvalidArgumentException if entity has no id
-	 * @since 14.0.0
-	 */
-	public function update(Entity $entity): Entity {
-		// if entity wasn't changed it makes no sense to run a db query
-		$properties = $entity->getUpdatedFields();
-		if (\count($properties) === 0) {
-			return $entity;
-		}
-
-		// entity needs an id
-		$id = $entity->getId();
-		if ($id === null) {
-			throw new \InvalidArgumentException(
-				'Entity which should be updated has no id');
-		}
-
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		// do not update the id field
-		unset($properties['id']);
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName);
-
-		// build the fields
-		foreach ($properties as $property => $updated) {
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-			$value = $entity->$getter();
-
-			$type = $this->getParameterTypeForProperty($entity, $property);
-			$qb->set($column, $qb->createNamedParameter($value, $type));
-		}
-
-		$idType = $this->getParameterTypeForProperty($entity, 'id');
-
-		$qb->where(
-			$qb->expr()->eq('id', $qb->createNamedParameter($id, $idType))
-		);
-		$qb->executeStatement();
-
-		return $entity;
-	}
-
-	/**
-	 * Returns the type parameter for the QueryBuilder for a specific property
-	 * of the $entity
-	 *
-	 * @param Entity $entity The entity to get the types from
-	 * @psalm-param T $entity
-	 * @param string $property The property of $entity to get the type for
-	 * @return int|string
-	 * @since 16.0.0
-	 */
-	protected function getParameterTypeForProperty(Entity $entity, string $property) {
-		$types = $entity->getFieldTypes();
-
-		if (!isset($types[ $property ])) {
-			return IQueryBuilder::PARAM_STR;
-		}
-
-		switch ($types[ $property ]) {
-			case 'int':
-			case Types::INTEGER:
-			case Types::SMALLINT:
-				return IQueryBuilder::PARAM_INT;
-			case Types::STRING:
-				return IQueryBuilder::PARAM_STR;
-			case 'bool':
-			case Types::BOOLEAN:
-				return IQueryBuilder::PARAM_BOOL;
-			case Types::BLOB:
-				return IQueryBuilder::PARAM_LOB;
-			case Types::DATE:
-				return IQueryBuilder::PARAM_DATETIME_MUTABLE;
-			case Types::DATETIME:
-				return IQueryBuilder::PARAM_DATETIME_MUTABLE;
-			case Types::DATETIME_TZ:
-				return IQueryBuilder::PARAM_DATETIME_TZ_MUTABLE;
-			case Types::DATE_IMMUTABLE:
-				return IQueryBuilder::PARAM_DATE_IMMUTABLE;
-			case Types::DATETIME_IMMUTABLE:
-				return IQueryBuilder::PARAM_DATETIME_IMMUTABLE;
-			case Types::DATETIME_TZ_IMMUTABLE:
-				return IQueryBuilder::PARAM_DATETIME_TZ_IMMUTABLE;
-			case Types::TIME:
-				return IQueryBuilder::PARAM_TIME_MUTABLE;
-			case Types::TIME_IMMUTABLE:
-				return IQueryBuilder::PARAM_TIME_IMMUTABLE;
-			case Types::JSON:
-				return IQueryBuilder::PARAM_JSON;
-		}
-
-		return IQueryBuilder::PARAM_STR;
-	}
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 *
-	 * @param IQueryBuilder $query
-	 * @return array the result as row
-	 * @throws Exception
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @throws DoesNotExistException if the item does not exist
-	 * @see findEntity
-	 *
-	 * @since 14.0.0
-	 */
-	protected function findOneQuery(IQueryBuilder $query): array {
-		$result = $query->executeQuery();
-
-		$row = $result->fetch();
-		if ($row === false) {
-			$result->closeCursor();
-			$msg = $this->buildDebugMessage(
-				'Did expect one result but found none when executing', $query
-			);
-			throw new DoesNotExistException($msg);
-		}
-
-		$row2 = $result->fetch();
-		$result->closeCursor();
-		if ($row2 !== false) {
-			$msg = $this->buildDebugMessage(
-				'Did not expect more than one result when executing', $query
-			);
-			throw new MultipleObjectsReturnedException($msg);
-		}
-
-		return $row;
-	}
-
-	/**
-	 * @param string $msg
-	 * @param IQueryBuilder $sql
-	 * @return string
-	 * @since 14.0.0
-	 */
-	private function buildDebugMessage(string $msg, IQueryBuilder $sql): string {
-		return $msg
-			. ': query "' . $sql->getSQL() . '"; ';
-	}
-
-
-	/**
-	 * Creates an entity from a row. Automatically determines the entity class
-	 * from the current mapper name (MyEntityMapper -> MyEntity)
-	 *
-	 * @param array $row the row which should be converted to an entity
-	 * @return Entity the entity
-	 * @psalm-return T the entity
-	 * @since 14.0.0
-	 */
-	protected function mapRowToEntity(array $row): Entity {
-		unset($row['DOCTRINE_ROWNUM']); // remove doctrine/dbal helper column
-		return \call_user_func($this->entityClass . '::fromRow', $row);
-	}
-
-
-	/**
-	 * Runs a sql query and returns an array of entities
-	 *
-	 * @param IQueryBuilder $query
-	 * @return list<Entity> all fetched entities
-	 * @psalm-return list<T> all fetched entities
-	 * @throws Exception
-	 * @since 14.0.0
-	 */
-	protected function findEntities(IQueryBuilder $query): array {
-		$result = $query->executeQuery();
-		try {
-			$entities = [];
-			while ($row = $result->fetch()) {
-				$entities[] = $this->mapRowToEntity($row);
-			}
-			return $entities;
-		} finally {
-			$result->closeCursor();
-		}
-	}
-
-	/**
-	 * Runs a sql query and yields each resulting entity to obtain database entries in a memory-efficient way
-	 *
-	 * @param IQueryBuilder $query
-	 * @return Generator Generator of fetched entities
-	 * @psalm-return Generator<T> Generator of fetched entities
-	 * @throws Exception
-	 * @since 30.0.0
-	 */
-	protected function yieldEntities(IQueryBuilder $query): Generator {
-		$result = $query->executeQuery();
-		try {
-			while ($row = $result->fetch()) {
-				yield $this->mapRowToEntity($row);
-			}
-		} finally {
-			$result->closeCursor();
-		}
-	}
-
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 *
-	 * @param IQueryBuilder $query
-	 * @return Entity the entity
-	 * @psalm-return T the entity
-	 * @throws Exception
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @throws DoesNotExistException if the item does not exist
-	 * @since 14.0.0
-	 */
-	protected function findEntity(IQueryBuilder $query): Entity {
-		return $this->mapRowToEntity($this->findOneQuery($query));
-	}
+    /** @var string */
+    protected $tableName;
+
+    /** @var string|class-string<T> */
+    protected $entityClass;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IDBConnection $db Instance of the Db abstraction layer
+     * @param string $tableName the name of the table. set this to allow entity
+     * @param class-string<T>|null $entityClass the name of the entity that the sql should be
+     *                                          mapped to queries without using sql
+     * @since 14.0.0
+     */
+    public function __construct(IDBConnection $db, string $tableName, ?string $entityClass = null) {
+        $this->db = $db;
+        $this->tableName = $tableName;
+
+        // if not given set the entity name to the class without the mapper part
+        // cache it here for later use since reflection is slow
+        if ($entityClass === null) {
+            $this->entityClass = str_replace('Mapper', '', \get_class($this));
+        } else {
+            $this->entityClass = $entityClass;
+        }
+    }
+
+
+    /**
+     * @return string the table name
+     * @since 14.0.0
+     */
+    public function getTableName(): string {
+        return $this->tableName;
+    }
+
+
+    /**
+     * Deletes an entity from the table
+     *
+     * @param Entity $entity the entity that should be deleted
+     * @psalm-param T $entity the entity that should be deleted
+     * @return Entity the deleted entity
+     * @psalm-return T the deleted entity
+     * @throws Exception
+     * @since 14.0.0
+     */
+    public function delete(Entity $entity): Entity {
+        $qb = $this->db->getQueryBuilder();
+
+        $idType = $this->getParameterTypeForProperty($entity, 'id');
+
+        $qb->delete($this->tableName)
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($entity->getId(), $idType))
+            );
+        $qb->executeStatement();
+        return $entity;
+    }
+
+    /**
+     * Creates a new entry in the db from an entity
+     *
+     * @param Entity $entity the entity that should be created
+     * @psalm-param T $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @psalm-return T the saved entity with the set id
+     * @throws Exception
+     * @since 14.0.0
+     */
+    public function insert(Entity $entity): Entity {
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        $properties = $entity->getUpdatedFields();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->insert($this->tableName);
+
+        // build the fields
+        foreach ($properties as $property => $updated) {
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+            $value = $entity->$getter();
+
+            if ($property === 'id' && $entity->id === null) {
+                continue;
+            }
+            $type = $this->getParameterTypeForProperty($entity, $property);
+            $qb->setValue($column, $qb->createNamedParameter($value, $type));
+        }
+
+        if ($entity instanceof SnowflakeAwareEntity) {
+            /** @psalm-suppress DocblockTypeContradiction */
+            $entity->generateId();
+            $qb->executeStatement();
+        } elseif ($entity->id === null) {
+            $qb->executeStatement();
+            // When autoincrement is used id is always an int
+            $entity->setId($qb->getLastInsertId());
+        } else {
+            $qb->executeStatement();
+        }
+        return $entity;
+    }
+
+    /**
+     * Tries to creates a new entry in the db from an entity and
+     * updates an existing entry if duplicate keys are detected
+     * by the database
+     *
+     * @param Entity $entity the entity that should be created/updated
+     * @psalm-param T $entity the entity that should be created/updated
+     * @return Entity the saved entity with the (new) id
+     * @psalm-return T the saved entity with the (new) id
+     * @throws Exception
+     * @throws \InvalidArgumentException if entity has no id
+     * @since 15.0.0
+     */
+    public function insertOrUpdate(Entity $entity): Entity {
+        try {
+            return $this->insert($entity);
+        } catch (Exception $ex) {
+            if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                return $this->update($entity);
+            }
+            throw $ex;
+        }
+    }
+
+    /**
+     * Updates an entry in the db from an entity
+     *
+     * @param Entity $entity the entity that should be created
+     * @psalm-param T $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @psalm-return T the saved entity with the set id
+     * @throws Exception
+     * @throws \InvalidArgumentException if entity has no id
+     * @since 14.0.0
+     */
+    public function update(Entity $entity): Entity {
+        // if entity wasn't changed it makes no sense to run a db query
+        $properties = $entity->getUpdatedFields();
+        if (\count($properties) === 0) {
+            return $entity;
+        }
+
+        // entity needs an id
+        $id = $entity->getId();
+        if ($id === null) {
+            throw new \InvalidArgumentException(
+                'Entity which should be updated has no id');
+        }
+
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        // do not update the id field
+        unset($properties['id']);
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName);
+
+        // build the fields
+        foreach ($properties as $property => $updated) {
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+            $value = $entity->$getter();
+
+            $type = $this->getParameterTypeForProperty($entity, $property);
+            $qb->set($column, $qb->createNamedParameter($value, $type));
+        }
+
+        $idType = $this->getParameterTypeForProperty($entity, 'id');
+
+        $qb->where(
+            $qb->expr()->eq('id', $qb->createNamedParameter($id, $idType))
+        );
+        $qb->executeStatement();
+
+        return $entity;
+    }
+
+    /**
+     * Returns the type parameter for the QueryBuilder for a specific property
+     * of the $entity
+     *
+     * @param Entity $entity The entity to get the types from
+     * @psalm-param T $entity
+     * @param string $property The property of $entity to get the type for
+     * @return int|string
+     * @since 16.0.0
+     */
+    protected function getParameterTypeForProperty(Entity $entity, string $property) {
+        $types = $entity->getFieldTypes();
+
+        if (!isset($types[ $property ])) {
+            return IQueryBuilder::PARAM_STR;
+        }
+
+        switch ($types[ $property ]) {
+            case 'int':
+            case Types::INTEGER:
+            case Types::SMALLINT:
+                return IQueryBuilder::PARAM_INT;
+            case Types::STRING:
+                return IQueryBuilder::PARAM_STR;
+            case 'bool':
+            case Types::BOOLEAN:
+                return IQueryBuilder::PARAM_BOOL;
+            case Types::BLOB:
+                return IQueryBuilder::PARAM_LOB;
+            case Types::DATE:
+                return IQueryBuilder::PARAM_DATETIME_MUTABLE;
+            case Types::DATETIME:
+                return IQueryBuilder::PARAM_DATETIME_MUTABLE;
+            case Types::DATETIME_TZ:
+                return IQueryBuilder::PARAM_DATETIME_TZ_MUTABLE;
+            case Types::DATE_IMMUTABLE:
+                return IQueryBuilder::PARAM_DATE_IMMUTABLE;
+            case Types::DATETIME_IMMUTABLE:
+                return IQueryBuilder::PARAM_DATETIME_IMMUTABLE;
+            case Types::DATETIME_TZ_IMMUTABLE:
+                return IQueryBuilder::PARAM_DATETIME_TZ_IMMUTABLE;
+            case Types::TIME:
+                return IQueryBuilder::PARAM_TIME_MUTABLE;
+            case Types::TIME_IMMUTABLE:
+                return IQueryBuilder::PARAM_TIME_IMMUTABLE;
+            case Types::JSON:
+                return IQueryBuilder::PARAM_JSON;
+        }
+
+        return IQueryBuilder::PARAM_STR;
+    }
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     *
+     * @param IQueryBuilder $query
+     * @return array the result as row
+     * @throws Exception
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @throws DoesNotExistException if the item does not exist
+     * @see findEntity
+     *
+     * @since 14.0.0
+     */
+    protected function findOneQuery(IQueryBuilder $query): array {
+        $result = $query->executeQuery();
+
+        $row = $result->fetch();
+        if ($row === false) {
+            $result->closeCursor();
+            $msg = $this->buildDebugMessage(
+                'Did expect one result but found none when executing', $query
+            );
+            throw new DoesNotExistException($msg);
+        }
+
+        $row2 = $result->fetch();
+        $result->closeCursor();
+        if ($row2 !== false) {
+            $msg = $this->buildDebugMessage(
+                'Did not expect more than one result when executing', $query
+            );
+            throw new MultipleObjectsReturnedException($msg);
+        }
+
+        return $row;
+    }
+
+    /**
+     * @param string $msg
+     * @param IQueryBuilder $sql
+     * @return string
+     * @since 14.0.0
+     */
+    private function buildDebugMessage(string $msg, IQueryBuilder $sql): string {
+        return $msg
+            . ': query "' . $sql->getSQL() . '"; ';
+    }
+
+
+    /**
+     * Creates an entity from a row. Automatically determines the entity class
+     * from the current mapper name (MyEntityMapper -> MyEntity)
+     *
+     * @param array $row the row which should be converted to an entity
+     * @return Entity the entity
+     * @psalm-return T the entity
+     * @since 14.0.0
+     */
+    protected function mapRowToEntity(array $row): Entity {
+        unset($row['DOCTRINE_ROWNUM']); // remove doctrine/dbal helper column
+        return \call_user_func($this->entityClass . '::fromRow', $row);
+    }
+
+
+    /**
+     * Runs a sql query and returns an array of entities
+     *
+     * @param IQueryBuilder $query
+     * @return list<Entity> all fetched entities
+     * @psalm-return list<T> all fetched entities
+     * @throws Exception
+     * @since 14.0.0
+     */
+    protected function findEntities(IQueryBuilder $query): array {
+        $result = $query->executeQuery();
+        try {
+            $entities = [];
+            while ($row = $result->fetch()) {
+                $entities[] = $this->mapRowToEntity($row);
+            }
+            return $entities;
+        } finally {
+            $result->closeCursor();
+        }
+    }
+
+    /**
+     * Runs a sql query and yields each resulting entity to obtain database entries in a memory-efficient way
+     *
+     * @param IQueryBuilder $query
+     * @return Generator Generator of fetched entities
+     * @psalm-return Generator<T> Generator of fetched entities
+     * @throws Exception
+     * @since 30.0.0
+     */
+    protected function yieldEntities(IQueryBuilder $query): Generator {
+        $result = $query->executeQuery();
+        try {
+            while ($row = $result->fetch()) {
+                yield $this->mapRowToEntity($row);
+            }
+        } finally {
+            $result->closeCursor();
+        }
+    }
+
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     *
+     * @param IQueryBuilder $query
+     * @return Entity the entity
+     * @psalm-return T the entity
+     * @throws Exception
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @throws DoesNotExistException if the item does not exist
+     * @since 14.0.0
+     */
+    protected function findEntity(IQueryBuilder $query): Entity {
+        return $this->mapRowToEntity($this->findOneQuery($query));
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
 		// build the fields
 		foreach ($properties as $property => $updated) {
 			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
+			$getter = 'get'.ucfirst($property);
 			$value = $entity->$getter();
 
 			if ($property === 'id' && $entity->id === null) {
@@ -189,7 +189,7 @@ 
 		// build the fields
 		foreach ($properties as $property => $updated) {
 			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
+			$getter = 'get'.ucfirst($property);
 			$value = $entity->$getter();
 
 			$type = $this->getParameterTypeForProperty($entity, $property);
@@ -219,11 +219,11 @@ 
 	protected function getParameterTypeForProperty(Entity $entity, string $property) {
 		$types = $entity->getFieldTypes();
 
-		if (!isset($types[ $property ])) {
+		if (!isset($types[$property])) {
 			return IQueryBuilder::PARAM_STR;
 		}
 
-		switch ($types[ $property ]) {
+		switch ($types[$property]) {
 			case 'int':
 			case Types::INTEGER:
 			case Types::SMALLINT:
@@ -303,7 +303,7 @@ 
 	 */
 	private function buildDebugMessage(string $msg, IQueryBuilder $sql): string {
 		return $msg
-			. ': query "' . $sql->getSQL() . '"; ';
+			. ': query "'.$sql->getSQL().'"; ';
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 */
 	protected function mapRowToEntity(array $row): Entity {
 		unset($row['DOCTRINE_ROWNUM']); // remove doctrine/dbal helper column
-		return \call_user_func($this->entityClass . '::fromRow', $row);
+		return \call_user_func($this->entityClass.'::fromRow', $row);
 	}
 
 

lib/public/Snowflake/Snowflake.php

Indentation +45 added lines, -45 removed lines

@@ -18,55 +18,55 @@
  */
 #[Consumable(since: '33.0.0')]
 final readonly class Snowflake {
-	/**
-	 * @psalm-param int<0,1023> $serverId
-	 * @psalm-param int<0,4095> $sequenceId
-	 * @psalm-param non-negative-int $seconds
-	 * @psalm-param int<0,999> $milliseconds
-	 */
-	public function __construct(
-		private int $serverId,
-		private int $sequenceId,
-		private bool $isCli,
-		private int $seconds,
-		private int $milliseconds,
-		private \DateTimeImmutable $createdAt,
-	) {
-	}
+    /**
+     * @psalm-param int<0,1023> $serverId
+     * @psalm-param int<0,4095> $sequenceId
+     * @psalm-param non-negative-int $seconds
+     * @psalm-param int<0,999> $milliseconds
+     */
+    public function __construct(
+        private int $serverId,
+        private int $sequenceId,
+        private bool $isCli,
+        private int $seconds,
+        private int $milliseconds,
+        private \DateTimeImmutable $createdAt,
+    ) {
+    }
 
-	/**
-	 * @psalm-return int<0,1023>
-	 */
-	public function getServerId(): int {
-		return $this->serverId;
-	}
+    /**
+     * @psalm-return int<0,1023>
+     */
+    public function getServerId(): int {
+        return $this->serverId;
+    }
 
-	/**
-	 * @psalm-return int<0,4095>
-	 */
-	public function getSequenceId(): int {
-		return $this->sequenceId;
-	}
+    /**
+     * @psalm-return int<0,4095>
+     */
+    public function getSequenceId(): int {
+        return $this->sequenceId;
+    }
 
-	public function isCli(): bool {
-		return $this->isCli;
-	}
+    public function isCli(): bool {
+        return $this->isCli;
+    }
 
-	/**
-	 * @psalm-return non-negative-int
-	 */
-	public function getSeconds(): int {
-		return $this->seconds;
-	}
+    /**
+     * @psalm-return non-negative-int
+     */
+    public function getSeconds(): int {
+        return $this->seconds;
+    }
 
-	/**
-	 * @psalm-return  int<0,999>
-	 */
-	public function getMilliseconds(): int {
-		return $this->milliseconds;
-	}
+    /**
+     * @psalm-return  int<0,999>
+     */
+    public function getMilliseconds(): int {
+        return $this->milliseconds;
+    }
 
-	public function getCreatedAt(): \DateTimeImmutable {
-		return $this->createdAt;
-	}
+    public function getCreatedAt(): \DateTimeImmutable {
+        return $this->createdAt;
+    }
 }

lib/private/Server.php

Indentation +1392 added lines, -1392 removed lines

@@ -260,1436 +260,1436 @@
  * 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->get(IAppDataFactory::class)->get('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->get(IAppDataFactory::class)->get('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					new AppConfig(
-						$c->get(\OCP\IConfig::class),
-						$c->get(\OCP\IAppConfig::class),
-						'theming',
-					),
-					$c->get(IUserConfig::class),
-					$c->get(IFactory::class)->get('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->get(IAppDataFactory::class)->get('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_USER', 'class' => UserByMailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::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->get(IAppDataFactory::class)->get('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->get(IAppDataFactory::class)->get('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    new AppConfig(
+                        $c->get(\OCP\IConfig::class),
+                        $c->get(\OCP\IAppConfig::class),
+                        'theming',
+                    ),
+                    $c->get(IUserConfig::class),
+                    $c->get(IFactory::class)->get('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->get(IAppDataFactory::class)->get('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_USER', 'class' => UserByMailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::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->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
-		$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
-			if (PHP_SAPI !== 'cli') {
-				$sequence = $c->get(APCuSequence::class);
-				if ($sequence->isAvailable()) {
-					return $sequence;
-				}
-			}
-
-			return $c->get(FileSequence::class);
-		}, false);
-		$this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
-
-		$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);
-	}
+        $this->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
+        $this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
+            if (PHP_SAPI !== 'cli') {
+                $sequence = $c->get(APCuSequence::class);
+                if ($sequence->isAvailable()) {
+                    return $sequence;
+                }
+            }
+
+            return $c->get(FileSequence::class);
+        }, false);
+        $this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
+
+        $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);
+    }
 }

Spacing +87 added lines, -87 removed lines

@@ -275,7 +275,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);
@@ -296,11 +296,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),
@@ -315,7 +315,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),
@@ -323,11 +323,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,
@@ -346,7 +346,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),
@@ -360,7 +360,7 @@ 
 			);
 		});
 
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
+		$this->registerService(IStorage::class, function(ContainerInterface $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -379,23 +379,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 */
@@ -421,7 +421,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(),
@@ -430,19 +430,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),
@@ -453,7 +453,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);
@@ -468,7 +468,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();
@@ -492,40 +492,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]);
 
@@ -533,12 +533,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]);
 
@@ -546,19 +546,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]);
 			});
@@ -572,7 +572,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);
 		});
 
@@ -580,7 +580,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(),
@@ -594,7 +594,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);
@@ -627,12 +627,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(),
@@ -645,14 +645,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),
@@ -672,7 +672,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);
@@ -683,13 +683,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);
@@ -700,7 +700,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(
@@ -730,7 +730,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');
@@ -743,17 +743,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
@@ -765,7 +765,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(
@@ -774,14 +774,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);
@@ -800,7 +800,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);
@@ -819,7 +819,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) {
@@ -832,7 +832,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)) {
@@ -854,7 +854,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 {
@@ -890,7 +890,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)
@@ -900,7 +900,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),
@@ -916,7 +916,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)) {
@@ -925,11 +925,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')));
@@ -951,51 +951,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) {
@@ -1009,7 +1009,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) {
@@ -1060,7 +1060,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),
@@ -1071,7 +1071,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(
 				[
@@ -1095,12 +1095,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 */
@@ -1109,7 +1109,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
@@ -1134,20 +1134,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)
@@ -1155,7 +1155,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),
@@ -1167,7 +1167,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();
 		});
 
@@ -1176,27 +1176,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));
 		});
@@ -1268,7 +1268,7 @@ 
 		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
 		$this->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
-		$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
+		$this->registerService(ISequence::class, function(ContainerInterface $c): ISequence {
 			if (PHP_SAPI !== 'cli') {
 				$sequence = $c->get(APCuSequence::class);
 				if ($sequence->isAvailable()) {

lib/private/Settings/AuthorizedGroup.php

Indentation +11 added lines, -11 removed lines

@@ -15,17 +15,17 @@
  * @method getClass(): string
  */
 class AuthorizedGroup extends Entity implements \JsonSerializable {
-	/** @var string $group_id */
-	protected $groupId;
+    /** @var string $group_id */
+    protected $groupId;
 
-	/** @var string $class */
-	protected $class;
+    /** @var string $class */
+    protected $class;
 
-	public function jsonSerialize(): array {
-		return [
-			'id' => $this->getId(),
-			'group_id' => $this->groupId,
-			'class' => $this->class
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'id' => $this->getId(),
+            'group_id' => $this->groupId,
+            'class' => $this->class
+        ];
+    }
 }

lib/private/Preview/Storage/LocalPreviewStorage.php

Indentation +212 added lines, -212 removed lines

@@ -29,216 +29,216 @@
 use RecursiveIteratorIterator;
 
 class LocalPreviewStorage implements IPreviewStorage {
-	private readonly string $rootFolder;
-	private readonly string $instanceId;
-
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-		private readonly IAppConfig $appConfig,
-		private readonly IDBConnection $connection,
-		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly LoggerInterface $logger,
-		private readonly ISnowflakeGenerator $generator,
-	) {
-		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
-	}
-
-	#[Override]
-	public function writePreview(Preview $preview, mixed $stream): int {
-		$previewPath = $this->constructPath($preview);
-		$this->createParentFiles($previewPath);
-		return file_put_contents($previewPath, $stream);
-	}
-
-	#[Override]
-	public function readPreview(Preview $preview): mixed {
-		$previewPath = $this->constructPath($preview);
-		$resource = @fopen($previewPath, 'r');
-		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
-		}
-		return $resource;
-	}
-
-	#[Override]
-	public function deletePreview(Preview $preview): void {
-		$previewPath = $this->constructPath($preview);
-		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
-		}
-	}
-
-	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
-	}
-
-	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
-	}
-
-	private function createParentFiles(string $path): void {
-		$dirname = dirname($path);
-		@mkdir($dirname, recursive: true);
-		if (!is_dir($dirname)) {
-			throw new NotPermittedException("Unable to create directory '$dirname'");
-		}
-	}
-
-	#[Override]
-	public function migratePreview(Preview $preview, SimpleFile $file): void {
-		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
-		if (!file_exists($sourcePath)) {
-			return;
-		}
-
-		$destinationPath = $this->constructPath($preview);
-		if (file_exists($destinationPath)) {
-			@unlink($sourcePath); // We already have a new preview, just delete the old one
-			return;
-		}
-
-		$this->createParentFiles($destinationPath);
-		$ok = rename($sourcePath, $destinationPath);
-		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
-		}
-	}
-
-	#[Override]
-	public function scan(): int {
-		$checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
-
-		$scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
-		$previewsFound = 0;
-		foreach (new RecursiveIteratorIterator($scanner) as $file) {
-			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
-				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
-					continue;
-				}
-				$preview->generateId();
-				try {
-					$preview->setSize($file->getSize());
-					$preview->setMtime($file->getMtime());
-					$preview->setEncrypted(false);
-
-					$qb = $this->connection->getQueryBuilder();
-					$result = $qb->select('storage', 'etag', 'mimetype')
-						->from('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
-						->setMaxResults(1)
-						->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
-						->executeQuery()
-						->fetchAll();
-
-					if (empty($result)) {
-						// original file is deleted
-						@unlink($file->getRealPath());
-						continue;
-					}
-
-					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
-						$rowAffected = $qb->delete('filecache')
-							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
-							->executeStatement();
-						if ($rowAffected > 0) {
-							$this->deleteParentsFromFileCache(dirname($relativePath));
-						}
-					}
-
-					$preview->setStorageId($result[0]['storage']);
-					$preview->setEtag($result[0]['etag']);
-					$preview->setSourceMimetype($result[0]['mimetype']);
-					$preview->generateId();
-					// try to insert, if that fails the preview is already in the DB
-					$this->previewMapper->insert($preview);
-
-					// Move old flat preview to new format
-					$dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
-					if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
-						$previewPath = $this->constructPath($preview);
-						$this->createParentFiles($previewPath);
-						$ok = rename($file->getRealPath(), $previewPath);
-						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
-						}
-					}
-				} catch (Exception $e) {
-					if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-						throw $e;
-					}
-				}
-				$previewsFound++;
-			}
-		}
-
-		return $previewsFound;
-	}
-
-	private function deleteParentsFromFileCache(string $dirname): void {
-		$qb = $this->connection->getQueryBuilder();
-
-		$result = $qb->select('fileid', 'path', 'storage', 'parent')
-			->from('filecache')
-			->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
-			->setMaxResults(1)
-			->runAcrossAllShards()
-			->executeQuery()
-			->fetchAll();
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->connection->beginTransaction();
-
-		$parentId = $result[0]['parent'];
-		$fileId = $result[0]['fileid'];
-		$storage = $result[0]['storage'];
-
-		try {
-			while (true) {
-				$qb = $this->connection->getQueryBuilder();
-				$childs = $qb->select('fileid', 'path', 'storage')
-					->from('filecache')
-					->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (!empty($childs)) {
-					break;
-				}
-
-				$qb = $this->connection->getQueryBuilder();
-				$qb->delete('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $result[0]['storage'])
-					->executeStatement();
-
-				$qb = $this->connection->getQueryBuilder();
-				$result = $qb->select('fileid', 'path', 'storage', 'parent')
-					->from('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
-					->setMaxResults(1)
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (empty($result)) {
-					break;
-				}
-
-				$fileId = $parentId;
-				$parentId = $result[0]['parent'];
-			}
-		} finally {
-			$this->connection->commit();
-		}
-	}
+    private readonly string $rootFolder;
+    private readonly string $instanceId;
+
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+        private readonly IAppConfig $appConfig,
+        private readonly IDBConnection $connection,
+        private readonly IMimeTypeDetector $mimeTypeDetector,
+        private readonly LoggerInterface $logger,
+        private readonly ISnowflakeGenerator $generator,
+    ) {
+        $this->instanceId = $this->config->getSystemValueString('instanceid');
+        $this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+    }
+
+    #[Override]
+    public function writePreview(Preview $preview, mixed $stream): int {
+        $previewPath = $this->constructPath($preview);
+        $this->createParentFiles($previewPath);
+        return file_put_contents($previewPath, $stream);
+    }
+
+    #[Override]
+    public function readPreview(Preview $preview): mixed {
+        $previewPath = $this->constructPath($preview);
+        $resource = @fopen($previewPath, 'r');
+        if ($resource === false) {
+            throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+        }
+        return $resource;
+    }
+
+    #[Override]
+    public function deletePreview(Preview $preview): void {
+        $previewPath = $this->constructPath($preview);
+        if (!@unlink($previewPath) && is_file($previewPath)) {
+            throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+        }
+    }
+
+    public function getPreviewRootFolder(): string {
+        return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+    }
+
+    private function constructPath(Preview $preview): string {
+        return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+    }
+
+    private function createParentFiles(string $path): void {
+        $dirname = dirname($path);
+        @mkdir($dirname, recursive: true);
+        if (!is_dir($dirname)) {
+            throw new NotPermittedException("Unable to create directory '$dirname'");
+        }
+    }
+
+    #[Override]
+    public function migratePreview(Preview $preview, SimpleFile $file): void {
+        // legacy flat directory
+        $sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+        if (!file_exists($sourcePath)) {
+            return;
+        }
+
+        $destinationPath = $this->constructPath($preview);
+        if (file_exists($destinationPath)) {
+            @unlink($sourcePath); // We already have a new preview, just delete the old one
+            return;
+        }
+
+        $this->createParentFiles($destinationPath);
+        $ok = rename($sourcePath, $destinationPath);
+        if (!$ok) {
+            throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+        }
+    }
+
+    #[Override]
+    public function scan(): int {
+        $checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
+
+        $scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
+        $previewsFound = 0;
+        foreach (new RecursiveIteratorIterator($scanner) as $file) {
+            if ($file->isFile()) {
+                $preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+                if ($preview === false) {
+                    $this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+                    continue;
+                }
+                $preview->generateId();
+                try {
+                    $preview->setSize($file->getSize());
+                    $preview->setMtime($file->getMtime());
+                    $preview->setEncrypted(false);
+
+                    $qb = $this->connection->getQueryBuilder();
+                    $result = $qb->select('storage', 'etag', 'mimetype')
+                        ->from('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
+                        ->setMaxResults(1)
+                        ->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
+                        ->executeQuery()
+                        ->fetchAll();
+
+                    if (empty($result)) {
+                        // original file is deleted
+                        @unlink($file->getRealPath());
+                        continue;
+                    }
+
+                    if ($checkForFileCache) {
+                        $relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+                        $rowAffected = $qb->delete('filecache')
+                            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
+                            ->executeStatement();
+                        if ($rowAffected > 0) {
+                            $this->deleteParentsFromFileCache(dirname($relativePath));
+                        }
+                    }
+
+                    $preview->setStorageId($result[0]['storage']);
+                    $preview->setEtag($result[0]['etag']);
+                    $preview->setSourceMimetype($result[0]['mimetype']);
+                    $preview->generateId();
+                    // try to insert, if that fails the preview is already in the DB
+                    $this->previewMapper->insert($preview);
+
+                    // Move old flat preview to new format
+                    $dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
+                    if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
+                        $previewPath = $this->constructPath($preview);
+                        $this->createParentFiles($previewPath);
+                        $ok = rename($file->getRealPath(), $previewPath);
+                        if (!$ok) {
+                            throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+                        }
+                    }
+                } catch (Exception $e) {
+                    if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                        throw $e;
+                    }
+                }
+                $previewsFound++;
+            }
+        }
+
+        return $previewsFound;
+    }
+
+    private function deleteParentsFromFileCache(string $dirname): void {
+        $qb = $this->connection->getQueryBuilder();
+
+        $result = $qb->select('fileid', 'path', 'storage', 'parent')
+            ->from('filecache')
+            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
+            ->setMaxResults(1)
+            ->runAcrossAllShards()
+            ->executeQuery()
+            ->fetchAll();
+
+        if (empty($result)) {
+            return;
+        }
+
+        $this->connection->beginTransaction();
+
+        $parentId = $result[0]['parent'];
+        $fileId = $result[0]['fileid'];
+        $storage = $result[0]['storage'];
+
+        try {
+            while (true) {
+                $qb = $this->connection->getQueryBuilder();
+                $childs = $qb->select('fileid', 'path', 'storage')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (!empty($childs)) {
+                    break;
+                }
+
+                $qb = $this->connection->getQueryBuilder();
+                $qb->delete('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $result[0]['storage'])
+                    ->executeStatement();
+
+                $qb = $this->connection->getQueryBuilder();
+                $result = $qb->select('fileid', 'path', 'storage', 'parent')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
+                    ->setMaxResults(1)
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (empty($result)) {
+                    break;
+                }
+
+                $fileId = $parentId;
+                $parentId = $result[0]['parent'];
+            }
+        } finally {
+            $this->connection->commit();
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
 		private readonly ISnowflakeGenerator $generator,
 	) {
 		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data');
 	}
 
 	#[Override]
@@ -57,7 +57,7 @@ 
 		$previewPath = $this->constructPath($preview);
 		$resource = @fopen($previewPath, 'r');
 		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+			throw new NotFoundException('Unable to open preview stream at '.$previewPath);
 		}
 		return $resource;
 	}
@@ -66,16 +66,16 @@ 
 	public function deletePreview(Preview $preview): void {
 		$previewPath = $this->constructPath($preview);
 		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+			throw new NotPermittedException('Unable to delete preview at '.$previewPath);
 		}
 	}
 
 	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+		return $this->rootFolder.'/appdata_'.$this->instanceId.'/preview/';
 	}
 
 	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+		return $this->getPreviewRootFolder().implode('/', str_split(substr(md5((string) $preview->getFileId()), 0, 7))).'/'.$preview->getFileId().'/'.$preview->getName();
 	}
 
 	private function createParentFiles(string $path): void {
@@ -89,7 +89,7 @@ 
 	#[Override]
 	public function migratePreview(Preview $preview, SimpleFile $file): void {
 		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+		$sourcePath = $this->getPreviewRootFolder().$preview->getFileId().'/'.$preview->getName();
 		if (!file_exists($sourcePath)) {
 			return;
 		}
@@ -103,7 +103,7 @@ 
 		$this->createParentFiles($destinationPath);
 		$ok = rename($sourcePath, $destinationPath);
 		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+			throw new LogicException('Failed to move '.$sourcePath.' to '.$destinationPath);
 		}
 	}
 
@@ -115,9 +115,9 @@ 
 		$previewsFound = 0;
 		foreach (new RecursiveIteratorIterator($scanner) as $file) {
 			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+				$preview = Preview::fromPath((string) $file, $this->mimeTypeDetector);
 				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+					$this->logger->error('Unable to parse preview information for '.$file->getRealPath());
 					continue;
 				}
 				$preview->generateId();
@@ -142,7 +142,7 @@ 
 					}
 
 					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+						$relativePath = str_replace($this->rootFolder.'/', '', $file->getRealPath());
 						$rowAffected = $qb->delete('filecache')
 							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
 							->executeStatement();
@@ -165,7 +165,7 @@ 
 						$this->createParentFiles($previewPath);
 						$ok = rename($file->getRealPath(), $previewPath);
 						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+							throw new LogicException('Failed to move '.$file->getRealPath().' to '.$previewPath);
 						}
 					}
 				} catch (Exception $e) {