nextcloud / server

tests/lib/Template/CSSResourceLocatorTest.php

Indentation +94 added lines, -94 removed lines

@@ -25,98 +25,98 @@
 use Psr\Log\LoggerInterface;
 
 class CSSResourceLocatorTest extends \Test\TestCase {
-	private IAppData&MockObject $appData;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IConfig&MockObject $config;
-	private ThemingDefaults&MockObject $themingDefaults;
-	private ICacheFactory&MockObject $cacheFactory;
-	private LoggerInterface&MockObject $logger;
-	private ITimeFactory&MockObject $timeFactory;
-	private AppConfig&MockObject $appConfig;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->appData = $this->createMock(AppData::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->appConfig = $this->createMock(AppConfig::class);
-	}
-
-	private function cssResourceLocator() {
-		/** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
-		$factory = $this->createMock(Factory::class);
-		$factory->method('get')->with('css')->willReturn($this->appData);
-		return new CSSResourceLocator(
-			$this->logger,
-			$this->createMock(IConfig::class),
-			Server::get(IAppManager::class),
-			'theme',
-			['core' => 'map'],
-			['3rd' => 'party'],
-		);
-	}
-
-	private function rrmdir($directory) {
-		$files = array_diff(scandir($directory), ['.','..']);
-		foreach ($files as $file) {
-			if (is_dir($directory . '/' . $file)) {
-				$this->rrmdir($directory . '/' . $file);
-			} else {
-				unlink($directory . '/' . $file);
-			}
-		}
-		return rmdir($directory);
-	}
-
-	private function randomString(): string {
-		return sha1(random_bytes(10));
-	}
-
-	public function testFindWithAppPathSymlink(): void {
-		// First create new apps path, and a symlink to it
-		$apps_dirname = $this->randomString();
-		$new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
-		$new_apps_path_symlink = $new_apps_path . '_link';
-		mkdir($new_apps_path);
-		symlink($apps_dirname, $new_apps_path_symlink);
-
-		// Create an app within that path
-		mkdir($new_apps_path . '/' . 'test_css_app');
-
-		// Use the symlink as the app path
-		\OC::$APPSROOTS[] = [
-			'path' => $new_apps_path_symlink,
-			'url' => '/css-apps-test',
-			'writable' => false,
-		];
-
-		$locator = $this->cssResourceLocator();
-		$locator->find(['test_css_app/test-file']);
-
-		$resources = $locator->getResources();
-		$this->assertCount(1, $resources);
-		$resource = $resources[0];
-		$this->assertCount(3, $resource);
-		$root = $resource[0];
-		$webRoot = $resource[1];
-		$file = $resource[2];
-
-		$expectedRoot = $new_apps_path . '/test_css_app';
-		$expectedWebRoot = \OC::$WEBROOT . '/css-apps-test/test_css_app';
-		$expectedFile = 'test-file.css';
-
-		$this->assertEquals($expectedRoot, $root,
-			'Ensure the app path symlink is resolved into the real path');
-		$this->assertEquals($expectedWebRoot, $webRoot);
-		$this->assertEquals($expectedFile, $file);
-
-		array_pop(\OC::$APPSROOTS);
-		unlink($new_apps_path_symlink);
-		$this->rrmdir($new_apps_path);
-	}
+    private IAppData&MockObject $appData;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IConfig&MockObject $config;
+    private ThemingDefaults&MockObject $themingDefaults;
+    private ICacheFactory&MockObject $cacheFactory;
+    private LoggerInterface&MockObject $logger;
+    private ITimeFactory&MockObject $timeFactory;
+    private AppConfig&MockObject $appConfig;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->appData = $this->createMock(AppData::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->appConfig = $this->createMock(AppConfig::class);
+    }
+
+    private function cssResourceLocator() {
+        /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
+        $factory = $this->createMock(Factory::class);
+        $factory->method('get')->with('css')->willReturn($this->appData);
+        return new CSSResourceLocator(
+            $this->logger,
+            $this->createMock(IConfig::class),
+            Server::get(IAppManager::class),
+            'theme',
+            ['core' => 'map'],
+            ['3rd' => 'party'],
+        );
+    }
+
+    private function rrmdir($directory) {
+        $files = array_diff(scandir($directory), ['.','..']);
+        foreach ($files as $file) {
+            if (is_dir($directory . '/' . $file)) {
+                $this->rrmdir($directory . '/' . $file);
+            } else {
+                unlink($directory . '/' . $file);
+            }
+        }
+        return rmdir($directory);
+    }
+
+    private function randomString(): string {
+        return sha1(random_bytes(10));
+    }
+
+    public function testFindWithAppPathSymlink(): void {
+        // First create new apps path, and a symlink to it
+        $apps_dirname = $this->randomString();
+        $new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
+        $new_apps_path_symlink = $new_apps_path . '_link';
+        mkdir($new_apps_path);
+        symlink($apps_dirname, $new_apps_path_symlink);
+
+        // Create an app within that path
+        mkdir($new_apps_path . '/' . 'test_css_app');
+
+        // Use the symlink as the app path
+        \OC::$APPSROOTS[] = [
+            'path' => $new_apps_path_symlink,
+            'url' => '/css-apps-test',
+            'writable' => false,
+        ];
+
+        $locator = $this->cssResourceLocator();
+        $locator->find(['test_css_app/test-file']);
+
+        $resources = $locator->getResources();
+        $this->assertCount(1, $resources);
+        $resource = $resources[0];
+        $this->assertCount(3, $resource);
+        $root = $resource[0];
+        $webRoot = $resource[1];
+        $file = $resource[2];
+
+        $expectedRoot = $new_apps_path . '/test_css_app';
+        $expectedWebRoot = \OC::$WEBROOT . '/css-apps-test/test_css_app';
+        $expectedFile = 'test-file.css';
+
+        $this->assertEquals($expectedRoot, $root,
+            'Ensure the app path symlink is resolved into the real path');
+        $this->assertEquals($expectedWebRoot, $webRoot);
+        $this->assertEquals($expectedFile, $file);
+
+        array_pop(\OC::$APPSROOTS);
+        unlink($new_apps_path_symlink);
+        $this->rrmdir($new_apps_path);
+    }
 }

tests/lib/Template/JSCombinerTest.php

Indentation +489 added lines, -489 removed lines

@@ -25,511 +25,511 @@
 use Psr\Log\LoggerInterface;
 
 class JSCombinerTest extends \Test\TestCase {
-	private IAppData&MockObject $appData;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IConfig&MockObject $config;
-	private ICache&MockObject $depsCache;
-	private LoggerInterface&MockObject $logger;
-	private ICacheFactory&MockObject $cacheFactory;
-
-	private JSCombiner $jsCombiner;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appData = $this->createMock(IAppData::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->depsCache = $this->createMock(ICache::class);
-		$this->cacheFactory->expects($this->atLeastOnce())
-			->method('createDistributed')
-			->willReturn($this->depsCache);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->jsCombiner = new JSCombiner(
-			$this->appData,
-			$this->urlGenerator,
-			$this->cacheFactory,
-			$this->config,
-			$this->logger
-		);
-	}
-
-	public function testProcessDebugMode(): void {
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('debug')
-			->willReturn(true);
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertFalse($actual);
-	}
-
-	public function testProcessNotInstalled(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false],
-				['installed', false]
-			]);
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertFalse($actual);
-	}
-
-	public function testProcessUncachedFileNoAppDataFolder(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false],
-				['installed', true],
-			]);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willThrowException(new NotFoundException());
-		$this->appData->expects($this->once())->method('newFolder')->with('awesomeapp')->willReturn($folder);
-		$file = $this->createMock(ISimpleFile::class);
-		$gzfile = $this->createMock(ISimpleFile::class);
-
-		$fileDeps = $this->createMock(ISimpleFile::class);
-
-		$folder->method('getFile')
-			->willReturnCallback(function ($path) use ($file, $gzfile) {
-				if ($path === 'combine.js') {
-					return $file;
-				} elseif ($path === 'combine.js.deps') {
-					throw new NotFoundException();
-				} elseif ($path === 'combine.js.gzip') {
-					return $gzfile;
-				}
-				$this->fail();
-			});
-		$folder->expects($this->once())
-			->method('newFile')
-			->with('combine.js.deps')
-			->willReturn($fileDeps);
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertTrue($actual);
-	}
-
-	public function testProcessUncachedFile(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false],
-				['installed', true],
-			]);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
-		$file = $this->createMock(ISimpleFile::class);
-		$fileDeps = $this->createMock(ISimpleFile::class);
-		$gzfile = $this->createMock(ISimpleFile::class);
-
-		$folder->method('getFile')
-			->willReturnCallback(function ($path) use ($file, $gzfile) {
-				if ($path === 'combine.js') {
-					return $file;
-				} elseif ($path === 'combine.js.deps') {
-					throw new NotFoundException();
-				} elseif ($path === 'combine.js.gzip') {
-					return $gzfile;
-				}
-				$this->fail();
-			});
-		$folder->expects($this->once())
-			->method('newFile')
-			->with('combine.js.deps')
-			->willReturn($fileDeps);
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertTrue($actual);
-	}
-
-	public function testProcessCachedFile(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false],
-				['installed', true],
-			]);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
-		$file = $this->createMock(ISimpleFile::class);
-
-		$fileDeps = $this->createMock(ISimpleFile::class);
-
-		$fileDeps->expects($this->once())->method('getContent')->willReturn('{}');
-
-		$folder->method('fileExists')
-			->with('combine.js')
-			->willReturn(true);
-
-		$folder->method('getFile')
-			->willReturnCallback(function ($path) use ($file, $fileDeps) {
-				if ($path === 'combine.js') {
-					return $file;
-				}
-
-				if ($path === 'combine.js.deps') {
-					return $fileDeps;
-				}
-
-				$this->fail();
-			});
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertTrue($actual);
-	}
-
-	public function testProcessCachedFileMemcache(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false],
-				['installed', true],
-			]);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->expects($this->once())
-			->method('getFolder')
-			->with('awesomeapp')
-			->willReturn($folder);
-		$folder->method('getName')
-			->willReturn('awesomeapp');
-		$folder->method('fileExists')
-			->with('combine.js')
-			->willReturn(true);
-
-		$file = $this->createMock(ISimpleFile::class);
-
-		$this->depsCache->method('get')
-			->with('awesomeapp-combine.js.deps')
-			->willReturn('{}');
-
-		$folder->method('getFile')
-			->willReturnCallback(function ($path) use ($file) {
-				if ($path === 'combine.js') {
-					return $file;
-				}
-				$this->fail();
-			});
-
-		$actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
-		$this->assertTrue($actual);
-	}
-
-	public function testIsCachedNoDepsFile(): void {
-		$fileName = 'combine.json';
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-
-		$folder->method('getFile')
-			->willReturnCallback(function ($path) use ($file) {
-				if ($path === 'combine.js') {
-					return $file;
-				}
-				if ($path === 'combine.js.deps') {
-					throw new NotFoundException();
-				}
-				$this->fail();
-			});
-
-		$actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
-		$this->assertFalse($actual);
-	}
-
-	public function testIsCachedWithNotExistingFile(): void {
-		$fileName = 'combine.json';
-		$folder = $this->createMock(ISimpleFolder::class);
-		$folder->method('fileExists')
-			->with('combine.js')
-			->willReturn(true);
-		$file = $this->createMock(ISimpleFile::class);
-		$folder->method('getFile')
-			->with('combine.js.deps')
-			->willReturn($file);
-		$file->expects($this->once())
-			->method('getContent')
-			->willReturn(json_encode(['/etc/certainlynotexisting/file/ihope' => 10000]));
-
-		$actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
-		$this->assertFalse($actual);
-	}
-
-	public function testIsCachedWithOlderMtime(): void {
-		$fileName = 'combine.json';
-		$folder = $this->createMock(ISimpleFolder::class);
-		$folder->method('fileExists')
-			->with('combine.js')
-			->willReturn(true);
-		$file = $this->createMock(ISimpleFile::class);
-		$folder->method('getFile')
-			->with('combine.js.deps')
-			->willReturn($file);
-		$file->expects($this->once())
-			->method('getContent')
-			->willReturn(json_encode([__FILE__ => 1234]));
-
-		$actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
-		$this->assertFalse($actual);
-	}
-
-	public function testIsCachedWithoutContent(): void {
-		$fileName = 'combine.json';
-		$folder = $this->createMock(ISimpleFolder::class);
-		$folder->method('fileExists')
-			->with('combine.js')
-			->willReturn(true);
-		$file = $this->createMock(ISimpleFile::class);
-		$folder->method('getFile')
-			->with('combine.js.deps')
-			->willReturn($file);
-		$file->expects($this->once())
-			->method('getContent')
-			->willReturn('');
-		$this->logger->expects($this->once())
-			->method('info')
-			->with('JSCombiner: deps file empty: combine.js.deps');
-		$actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
-		$this->assertFalse($actual);
-	}
-
-	public function testCacheNoFile(): void {
-		$fileName = 'combine.js';
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$depsFile = $this->createMock(ISimpleFile::class);
-		$gzFile = $this->createMock(ISimpleFile::class);
-
-		$path = __DIR__ . '/data/';
-
-		$folder->method('getFile')->willThrowException(new NotFoundException());
-
-		$folder->method('newFile')->willReturnCallback(
-			function ($filename) use ($file, $depsFile, $gzFile) {
-				if ($filename === 'combine.js') {
-					return $file;
-				} elseif ($filename === 'combine.js.deps') {
-					return $depsFile;
-				} elseif ($filename === 'combine.js.gzip') {
-					return $gzFile;
-				}
-				$this->fail();
-			}
-		);
-
-		$file->expects($this->once())->method('putContent');
-		$depsFile->expects($this->once())->method('putContent');
-		$gzFile->expects($this->once())->method('putContent');
-
-		$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
-		$this->assertTrue($actual);
-	}
-
-	public function testCache(): void {
-		$fileName = 'combine.js';
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$depsFile = $this->createMock(ISimpleFile::class);
-		$gzFile = $this->createMock(ISimpleFile::class);
-
-		$path = __DIR__ . '/data/';
-
-		$folder->method('getFile')->willReturnCallback(
-			function ($filename) use ($file, $depsFile, $gzFile) {
-				if ($filename === 'combine.js') {
-					return $file;
-				} elseif ($filename === 'combine.js.deps') {
-					return $depsFile;
-				} elseif ($filename === 'combine.js.gzip') {
-					return $gzFile;
-				}
-				$this->fail();
-			}
-		);
-
-		$file->expects($this->once())->method('putContent');
-		$depsFile->expects($this->once())->method('putContent');
-		$gzFile->expects($this->once())->method('putContent');
-
-		$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
-		$this->assertTrue($actual);
-	}
-
-	public function testCacheNotPermittedException(): void {
-		$fileName = 'combine.js';
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$depsFile = $this->createMock(ISimpleFile::class);
-		$gzFile = $this->createMock(ISimpleFile::class);
-
-		$path = __DIR__ . '/data/';
-
-		$folder->expects($this->exactly(3))
-			->method('getFile')
-			->willReturnMap([
-				[$fileName, $file],
-				[$fileName . '.deps', $depsFile],
-				[$fileName . '.gzip', $gzFile]
-			]);
-
-		$file->expects($this->once())
-			->method('putContent')
-			->with('var a = \'hello\';
+    private IAppData&MockObject $appData;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IConfig&MockObject $config;
+    private ICache&MockObject $depsCache;
+    private LoggerInterface&MockObject $logger;
+    private ICacheFactory&MockObject $cacheFactory;
+
+    private JSCombiner $jsCombiner;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appData = $this->createMock(IAppData::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->depsCache = $this->createMock(ICache::class);
+        $this->cacheFactory->expects($this->atLeastOnce())
+            ->method('createDistributed')
+            ->willReturn($this->depsCache);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->jsCombiner = new JSCombiner(
+            $this->appData,
+            $this->urlGenerator,
+            $this->cacheFactory,
+            $this->config,
+            $this->logger
+        );
+    }
+
+    public function testProcessDebugMode(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('debug')
+            ->willReturn(true);
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertFalse($actual);
+    }
+
+    public function testProcessNotInstalled(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false],
+                ['installed', false]
+            ]);
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertFalse($actual);
+    }
+
+    public function testProcessUncachedFileNoAppDataFolder(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false],
+                ['installed', true],
+            ]);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willThrowException(new NotFoundException());
+        $this->appData->expects($this->once())->method('newFolder')->with('awesomeapp')->willReturn($folder);
+        $file = $this->createMock(ISimpleFile::class);
+        $gzfile = $this->createMock(ISimpleFile::class);
+
+        $fileDeps = $this->createMock(ISimpleFile::class);
+
+        $folder->method('getFile')
+            ->willReturnCallback(function ($path) use ($file, $gzfile) {
+                if ($path === 'combine.js') {
+                    return $file;
+                } elseif ($path === 'combine.js.deps') {
+                    throw new NotFoundException();
+                } elseif ($path === 'combine.js.gzip') {
+                    return $gzfile;
+                }
+                $this->fail();
+            });
+        $folder->expects($this->once())
+            ->method('newFile')
+            ->with('combine.js.deps')
+            ->willReturn($fileDeps);
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertTrue($actual);
+    }
+
+    public function testProcessUncachedFile(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false],
+                ['installed', true],
+            ]);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
+        $file = $this->createMock(ISimpleFile::class);
+        $fileDeps = $this->createMock(ISimpleFile::class);
+        $gzfile = $this->createMock(ISimpleFile::class);
+
+        $folder->method('getFile')
+            ->willReturnCallback(function ($path) use ($file, $gzfile) {
+                if ($path === 'combine.js') {
+                    return $file;
+                } elseif ($path === 'combine.js.deps') {
+                    throw new NotFoundException();
+                } elseif ($path === 'combine.js.gzip') {
+                    return $gzfile;
+                }
+                $this->fail();
+            });
+        $folder->expects($this->once())
+            ->method('newFile')
+            ->with('combine.js.deps')
+            ->willReturn($fileDeps);
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertTrue($actual);
+    }
+
+    public function testProcessCachedFile(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false],
+                ['installed', true],
+            ]);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
+        $file = $this->createMock(ISimpleFile::class);
+
+        $fileDeps = $this->createMock(ISimpleFile::class);
+
+        $fileDeps->expects($this->once())->method('getContent')->willReturn('{}');
+
+        $folder->method('fileExists')
+            ->with('combine.js')
+            ->willReturn(true);
+
+        $folder->method('getFile')
+            ->willReturnCallback(function ($path) use ($file, $fileDeps) {
+                if ($path === 'combine.js') {
+                    return $file;
+                }
+
+                if ($path === 'combine.js.deps') {
+                    return $fileDeps;
+                }
+
+                $this->fail();
+            });
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertTrue($actual);
+    }
+
+    public function testProcessCachedFileMemcache(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false],
+                ['installed', true],
+            ]);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->expects($this->once())
+            ->method('getFolder')
+            ->with('awesomeapp')
+            ->willReturn($folder);
+        $folder->method('getName')
+            ->willReturn('awesomeapp');
+        $folder->method('fileExists')
+            ->with('combine.js')
+            ->willReturn(true);
+
+        $file = $this->createMock(ISimpleFile::class);
+
+        $this->depsCache->method('get')
+            ->with('awesomeapp-combine.js.deps')
+            ->willReturn('{}');
+
+        $folder->method('getFile')
+            ->willReturnCallback(function ($path) use ($file) {
+                if ($path === 'combine.js') {
+                    return $file;
+                }
+                $this->fail();
+            });
+
+        $actual = $this->jsCombiner->process(__DIR__, '/data/combine.json', 'awesomeapp');
+        $this->assertTrue($actual);
+    }
+
+    public function testIsCachedNoDepsFile(): void {
+        $fileName = 'combine.json';
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+
+        $folder->method('getFile')
+            ->willReturnCallback(function ($path) use ($file) {
+                if ($path === 'combine.js') {
+                    return $file;
+                }
+                if ($path === 'combine.js.deps') {
+                    throw new NotFoundException();
+                }
+                $this->fail();
+            });
+
+        $actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
+        $this->assertFalse($actual);
+    }
+
+    public function testIsCachedWithNotExistingFile(): void {
+        $fileName = 'combine.json';
+        $folder = $this->createMock(ISimpleFolder::class);
+        $folder->method('fileExists')
+            ->with('combine.js')
+            ->willReturn(true);
+        $file = $this->createMock(ISimpleFile::class);
+        $folder->method('getFile')
+            ->with('combine.js.deps')
+            ->willReturn($file);
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['/etc/certainlynotexisting/file/ihope' => 10000]));
+
+        $actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
+        $this->assertFalse($actual);
+    }
+
+    public function testIsCachedWithOlderMtime(): void {
+        $fileName = 'combine.json';
+        $folder = $this->createMock(ISimpleFolder::class);
+        $folder->method('fileExists')
+            ->with('combine.js')
+            ->willReturn(true);
+        $file = $this->createMock(ISimpleFile::class);
+        $folder->method('getFile')
+            ->with('combine.js.deps')
+            ->willReturn($file);
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode([__FILE__ => 1234]));
+
+        $actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
+        $this->assertFalse($actual);
+    }
+
+    public function testIsCachedWithoutContent(): void {
+        $fileName = 'combine.json';
+        $folder = $this->createMock(ISimpleFolder::class);
+        $folder->method('fileExists')
+            ->with('combine.js')
+            ->willReturn(true);
+        $file = $this->createMock(ISimpleFile::class);
+        $folder->method('getFile')
+            ->with('combine.js.deps')
+            ->willReturn($file);
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willReturn('');
+        $this->logger->expects($this->once())
+            ->method('info')
+            ->with('JSCombiner: deps file empty: combine.js.deps');
+        $actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]);
+        $this->assertFalse($actual);
+    }
+
+    public function testCacheNoFile(): void {
+        $fileName = 'combine.js';
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $depsFile = $this->createMock(ISimpleFile::class);
+        $gzFile = $this->createMock(ISimpleFile::class);
+
+        $path = __DIR__ . '/data/';
+
+        $folder->method('getFile')->willThrowException(new NotFoundException());
+
+        $folder->method('newFile')->willReturnCallback(
+            function ($filename) use ($file, $depsFile, $gzFile) {
+                if ($filename === 'combine.js') {
+                    return $file;
+                } elseif ($filename === 'combine.js.deps') {
+                    return $depsFile;
+                } elseif ($filename === 'combine.js.gzip') {
+                    return $gzFile;
+                }
+                $this->fail();
+            }
+        );
+
+        $file->expects($this->once())->method('putContent');
+        $depsFile->expects($this->once())->method('putContent');
+        $gzFile->expects($this->once())->method('putContent');
+
+        $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
+        $this->assertTrue($actual);
+    }
+
+    public function testCache(): void {
+        $fileName = 'combine.js';
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $depsFile = $this->createMock(ISimpleFile::class);
+        $gzFile = $this->createMock(ISimpleFile::class);
+
+        $path = __DIR__ . '/data/';
+
+        $folder->method('getFile')->willReturnCallback(
+            function ($filename) use ($file, $depsFile, $gzFile) {
+                if ($filename === 'combine.js') {
+                    return $file;
+                } elseif ($filename === 'combine.js.deps') {
+                    return $depsFile;
+                } elseif ($filename === 'combine.js.gzip') {
+                    return $gzFile;
+                }
+                $this->fail();
+            }
+        );
+
+        $file->expects($this->once())->method('putContent');
+        $depsFile->expects($this->once())->method('putContent');
+        $gzFile->expects($this->once())->method('putContent');
+
+        $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
+        $this->assertTrue($actual);
+    }
+
+    public function testCacheNotPermittedException(): void {
+        $fileName = 'combine.js';
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $depsFile = $this->createMock(ISimpleFile::class);
+        $gzFile = $this->createMock(ISimpleFile::class);
+
+        $path = __DIR__ . '/data/';
+
+        $folder->expects($this->exactly(3))
+            ->method('getFile')
+            ->willReturnMap([
+                [$fileName, $file],
+                [$fileName . '.deps', $depsFile],
+                [$fileName . '.gzip', $gzFile]
+            ]);
+
+        $file->expects($this->once())
+            ->method('putContent')
+            ->with('var a = \'hello\';
 
 
 var b = \'world\';
 
 
 ');
-		$depsFile
-			->expects($this->once())
-			->method('putContent')
-			->with($this->callback(
-				function ($content) {
-					$deps = json_decode($content, true);
-					return array_key_exists(__DIR__ . '/data//1.js', $deps)
-						&& array_key_exists(__DIR__ . '/data//2.js', $deps);
-				}))
-			->willThrowException(new NotPermittedException());
-
-		$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
-		$this->assertFalse($actual);
-	}
-
-	public function testCacheSuccess(): void {
-		$fileName = 'combine.js';
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$depsFile = $this->createMock(ISimpleFile::class);
-		$gzFile = $this->createMock(ISimpleFile::class);
-
-		$path = __DIR__ . '/data/';
-
-
-		$folder->method('getFile')->willReturnCallback(
-			function ($filename) use ($file, $depsFile, $gzFile) {
-				if ($filename === 'combine.js') {
-					return $file;
-				} elseif ($filename === 'combine.js.deps') {
-					return $depsFile;
-				} elseif ($filename === 'combine.js.gzip') {
-					return $gzFile;
-				}
-				$this->fail();
-			}
-		);
-
-		$file->expects($this->once())
-			->method('putContent')
-			->with('var a = \'hello\';
+        $depsFile
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($this->callback(
+                function ($content) {
+                    $deps = json_decode($content, true);
+                    return array_key_exists(__DIR__ . '/data//1.js', $deps)
+                        && array_key_exists(__DIR__ . '/data//2.js', $deps);
+                }))
+            ->willThrowException(new NotPermittedException());
+
+        $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
+        $this->assertFalse($actual);
+    }
+
+    public function testCacheSuccess(): void {
+        $fileName = 'combine.js';
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $depsFile = $this->createMock(ISimpleFile::class);
+        $gzFile = $this->createMock(ISimpleFile::class);
+
+        $path = __DIR__ . '/data/';
+
+
+        $folder->method('getFile')->willReturnCallback(
+            function ($filename) use ($file, $depsFile, $gzFile) {
+                if ($filename === 'combine.js') {
+                    return $file;
+                } elseif ($filename === 'combine.js.deps') {
+                    return $depsFile;
+                } elseif ($filename === 'combine.js.gzip') {
+                    return $gzFile;
+                }
+                $this->fail();
+            }
+        );
+
+        $file->expects($this->once())
+            ->method('putContent')
+            ->with('var a = \'hello\';
 
 
 var b = \'world\';
 
 
 ');
-		$depsFile->expects($this->once())->method('putContent')->with($this->callback(
-			function ($content) {
-				$deps = json_decode($content, true);
-				return array_key_exists(__DIR__ . '/data//1.js', $deps)
-					&& array_key_exists(__DIR__ . '/data//2.js', $deps);
-			}));
-		$gzFile->expects($this->once())->method('putContent')->with($this->callback(
-			function ($content) {
-				return gzdecode($content) === 'var a = \'hello\';
+        $depsFile->expects($this->once())->method('putContent')->with($this->callback(
+            function ($content) {
+                $deps = json_decode($content, true);
+                return array_key_exists(__DIR__ . '/data//1.js', $deps)
+                    && array_key_exists(__DIR__ . '/data//2.js', $deps);
+            }));
+        $gzFile->expects($this->once())->method('putContent')->with($this->callback(
+            function ($content) {
+                return gzdecode($content) === 'var a = \'hello\';
 
 
 var b = \'world\';
 
 
 ';
-			}
-		));
-
-		$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
-		$this->assertTrue($actual);
-	}
-
-	public static function dataGetCachedSCSS(): array {
-		return [
-			['awesomeapp', 'core/js/foo.json', '/js/core/foo.js'],
-			['files', 'apps/files/js/foo.json', '/js/files/foo.js']
-		];
-	}
-
-	/**
-	 * @param $appName
-	 * @param $fileName
-	 * @param $result
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetCachedSCSS')]
-	public function testGetCachedSCSS($appName, $fileName, $result): void {
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->with('core.Js.getJs', [
-				'fileName' => 'foo.js',
-				'appName' => $appName
-			])
-			->willReturn(\OC::$WEBROOT . $result);
-
-		$actual = $this->jsCombiner->getCachedJS($appName, $fileName);
-		$this->assertEquals(substr($result, 1), $actual);
-	}
-
-	public function testGetContent(): void {
-		// Create temporary file with some content
-		$tmpFile = Server::get(ITempManager::class)->getTemporaryFile('JSCombinerTest');
-		$pathInfo = pathinfo($tmpFile);
-		file_put_contents($tmpFile, json_encode(['/foo/bar/test', $pathInfo['dirname'] . '/js/mytest.js']));
-		$tmpFilePathArray = explode('/', $pathInfo['basename']);
-		array_pop($tmpFilePathArray);
-
-		$expected = [
-			'//foo/bar/test',
-			'/' . implode('/', $tmpFilePathArray) . $pathInfo['dirname'] . '/js/mytest.js',
-		];
-		$this->assertEquals($expected, $this->jsCombiner->getContent($pathInfo['dirname'], $pathInfo['basename']));
-	}
-
-	public function testGetContentInvalidJson(): void {
-		// Create temporary file with some content
-		$tmpFile = Server::get(ITempManager::class)->getTemporaryFile('JSCombinerTest');
-		$pathInfo = pathinfo($tmpFile);
-		file_put_contents($tmpFile, 'CertainlyNotJson');
-		$expected = [];
-		$this->assertEquals($expected, $this->jsCombiner->getContent($pathInfo['dirname'], $pathInfo['basename']));
-	}
-
-	public function testResetCache(): void {
-		$file = $this->createMock(ISimpleFile::class);
-		$file->expects($this->once())
-			->method('delete');
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$folder->expects($this->once())
-			->method('getDirectoryListing')
-			->willReturn([$file]);
-
-		$cache = $this->createMock(ICache::class);
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->willReturn($cache);
-		$cache->expects($this->never())
-			->method('clear');
-		$this->appData->expects($this->once())
-			->method('getDirectoryListing')
-			->willReturn([$folder]);
-
-		$this->jsCombiner->resetCache();
-	}
+            }
+        ));
+
+        $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
+        $this->assertTrue($actual);
+    }
+
+    public static function dataGetCachedSCSS(): array {
+        return [
+            ['awesomeapp', 'core/js/foo.json', '/js/core/foo.js'],
+            ['files', 'apps/files/js/foo.json', '/js/files/foo.js']
+        ];
+    }
+
+    /**
+     * @param $appName
+     * @param $fileName
+     * @param $result
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetCachedSCSS')]
+    public function testGetCachedSCSS($appName, $fileName, $result): void {
+        $this->urlGenerator->expects($this->once())
+            ->method('linkToRoute')
+            ->with('core.Js.getJs', [
+                'fileName' => 'foo.js',
+                'appName' => $appName
+            ])
+            ->willReturn(\OC::$WEBROOT . $result);
+
+        $actual = $this->jsCombiner->getCachedJS($appName, $fileName);
+        $this->assertEquals(substr($result, 1), $actual);
+    }
+
+    public function testGetContent(): void {
+        // Create temporary file with some content
+        $tmpFile = Server::get(ITempManager::class)->getTemporaryFile('JSCombinerTest');
+        $pathInfo = pathinfo($tmpFile);
+        file_put_contents($tmpFile, json_encode(['/foo/bar/test', $pathInfo['dirname'] . '/js/mytest.js']));
+        $tmpFilePathArray = explode('/', $pathInfo['basename']);
+        array_pop($tmpFilePathArray);
+
+        $expected = [
+            '//foo/bar/test',
+            '/' . implode('/', $tmpFilePathArray) . $pathInfo['dirname'] . '/js/mytest.js',
+        ];
+        $this->assertEquals($expected, $this->jsCombiner->getContent($pathInfo['dirname'], $pathInfo['basename']));
+    }
+
+    public function testGetContentInvalidJson(): void {
+        // Create temporary file with some content
+        $tmpFile = Server::get(ITempManager::class)->getTemporaryFile('JSCombinerTest');
+        $pathInfo = pathinfo($tmpFile);
+        file_put_contents($tmpFile, 'CertainlyNotJson');
+        $expected = [];
+        $this->assertEquals($expected, $this->jsCombiner->getContent($pathInfo['dirname'], $pathInfo['basename']));
+    }
+
+    public function testResetCache(): void {
+        $file = $this->createMock(ISimpleFile::class);
+        $file->expects($this->once())
+            ->method('delete');
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $folder->expects($this->once())
+            ->method('getDirectoryListing')
+            ->willReturn([$file]);
+
+        $cache = $this->createMock(ICache::class);
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->willReturn($cache);
+        $cache->expects($this->never())
+            ->method('clear');
+        $this->appData->expects($this->once())
+            ->method('getDirectoryListing')
+            ->willReturn([$folder]);
+
+        $this->jsCombiner->resetCache();
+    }
 }

tests/lib/Template/JSResourceLocatorTest.php

Indentation +157 added lines, -157 removed lines

@@ -21,161 +21,161 @@
 use Psr\Log\LoggerInterface;
 
 class JSResourceLocatorTest extends \Test\TestCase {
-	private IAppData&MockObject $appData;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IConfig&MockObject $config;
-	private ICacheFactory&MockObject $cacheFactory;
-	private LoggerInterface&MockObject $logger;
-	private IAppManager&MockObject $appManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appData = $this->createMock(IAppData::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-	}
-
-	private function jsResourceLocator(): JSResourceLocator {
-		$jsCombiner = new JSCombiner(
-			$this->appData,
-			$this->urlGenerator,
-			$this->cacheFactory,
-			$this->config,
-			$this->logger
-		);
-		return new JSResourceLocator(
-			$this->logger,
-			$this->config,
-			$jsCombiner,
-			$this->appManager,
-		);
-	}
-
-	private function rrmdir($directory) {
-		$files = array_diff(scandir($directory), ['.','..']);
-		foreach ($files as $file) {
-			if (is_dir($directory . '/' . $file)) {
-				$this->rrmdir($directory . '/' . $file);
-			} else {
-				unlink($directory . '/' . $file);
-			}
-		}
-		return rmdir($directory);
-	}
-
-	private function randomString(): string {
-		return sha1(random_bytes(10));
-	}
-
-	public function testFindWithAppPathSymlink(): void {
-		$appName = 'test-js-app';
-
-		// First create new apps path, and a symlink to it
-		$apps_dirname = $this->randomString();
-		$new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
-		$new_apps_path_symlink = $new_apps_path . '_link';
-		$this->assertTrue((
-			mkdir($new_apps_path) && symlink($apps_dirname, $new_apps_path_symlink)
-		), 'Setup of apps path failed');
-
-		// Create an app within that path
-		$this->assertTrue((
-			mkdir($new_apps_path . '/' . $appName) && touch($new_apps_path . '/' . $appName . '/' . 'test-file.js')
-		), 'Setup of app within the new apps path failed');
-
-		// Use the symlink as the app path
-		$this->appManager->expects($this->once())
-			->method('getAppPath')
-			->with($appName)
-			->willReturn("$new_apps_path_symlink/$appName");
-		$this->appManager->expects($this->once())
-			->method('getAppWebPath')
-			->with($appName)
-			->willReturn("/js-apps-test/$appName");
-
-		// Run the tests
-		$locator = $this->jsResourceLocator();
-		$locator->find(["$appName/test-file"]);
-
-		$resources = $locator->getResources();
-		$this->assertCount(1, $resources);
-		$resource = $resources[0];
-		$this->assertCount(3, $resource);
-		$root = $resource[0];
-		$webRoot = $resource[1];
-		$file = $resource[2];
-
-		$expectedRoot = $new_apps_path;
-		$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test';
-		$expectedFile = $appName . '/test-file.js';
-
-		$this->assertEquals($expectedRoot, $root,
-			'Ensure the app path symlink is resolved into the real path');
-		$this->assertEquals($expectedWebRoot, $webRoot);
-		$this->assertEquals($expectedFile, $file);
-
-		unlink($new_apps_path_symlink);
-		$this->rrmdir($new_apps_path);
-	}
-
-	public function testNotExistingTranslationHandledSilent(): void {
-		$this->appManager->expects($this->once())
-			->method('getAppPath')
-			->with('core')
-			->willThrowException(new AppPathNotFoundException());
-		$this->appManager->expects($this->atMost(1))
-			->method('getAppWebPath')
-			->with('core')
-			->willThrowException(new AppPathNotFoundException());
-		// Assert logger is not called
-		$this->logger->expects($this->never())
-			->method('error');
-
-		// Run the tests
-		$locator = $this->jsResourceLocator();
-		$locator->find(['core/l10n/en.js']);
-
-		$resources = $locator->getResources();
-		$this->assertCount(0, $resources);
-	}
-
-	public function testFindModuleJSWithFallback(): void {
-		// First create new apps path, and a symlink to it
-		$apps_dirname = $this->randomString();
-		$new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
-		mkdir($new_apps_path);
-
-		// Create an app within that path
-		mkdir("$new_apps_path/test-js-app");
-		touch("$new_apps_path/test-js-app/module.mjs");
-		touch("$new_apps_path/test-js-app/both.mjs");
-		touch("$new_apps_path/test-js-app/both.js");
-		touch("$new_apps_path/test-js-app/plain.js");
-
-		// Use the app path
-		$this->appManager->expects($this->any())
-			->method('getAppPath')
-			->with('test-js-app')
-			->willReturn("$new_apps_path/test-js-app");
-
-		$locator = $this->jsResourceLocator();
-		$locator->find(['test-js-app/module', 'test-js-app/both', 'test-js-app/plain']);
-
-		$resources = $locator->getResources();
-		$this->assertCount(3, $resources);
-
-		$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app';
-		$expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];
-
-		for ($idx = 0; $idx++; $idx < 3) {
-			$this->assertEquals($expectedWebRoot, $resources[$idx][1]);
-			$this->assertEquals($expectedFiles[$idx], $resources[$idx][2]);
-		}
-
-		$this->rrmdir($new_apps_path);
-	}
+    private IAppData&MockObject $appData;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IConfig&MockObject $config;
+    private ICacheFactory&MockObject $cacheFactory;
+    private LoggerInterface&MockObject $logger;
+    private IAppManager&MockObject $appManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appData = $this->createMock(IAppData::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+    }
+
+    private function jsResourceLocator(): JSResourceLocator {
+        $jsCombiner = new JSCombiner(
+            $this->appData,
+            $this->urlGenerator,
+            $this->cacheFactory,
+            $this->config,
+            $this->logger
+        );
+        return new JSResourceLocator(
+            $this->logger,
+            $this->config,
+            $jsCombiner,
+            $this->appManager,
+        );
+    }
+
+    private function rrmdir($directory) {
+        $files = array_diff(scandir($directory), ['.','..']);
+        foreach ($files as $file) {
+            if (is_dir($directory . '/' . $file)) {
+                $this->rrmdir($directory . '/' . $file);
+            } else {
+                unlink($directory . '/' . $file);
+            }
+        }
+        return rmdir($directory);
+    }
+
+    private function randomString(): string {
+        return sha1(random_bytes(10));
+    }
+
+    public function testFindWithAppPathSymlink(): void {
+        $appName = 'test-js-app';
+
+        // First create new apps path, and a symlink to it
+        $apps_dirname = $this->randomString();
+        $new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
+        $new_apps_path_symlink = $new_apps_path . '_link';
+        $this->assertTrue((
+            mkdir($new_apps_path) && symlink($apps_dirname, $new_apps_path_symlink)
+        ), 'Setup of apps path failed');
+
+        // Create an app within that path
+        $this->assertTrue((
+            mkdir($new_apps_path . '/' . $appName) && touch($new_apps_path . '/' . $appName . '/' . 'test-file.js')
+        ), 'Setup of app within the new apps path failed');
+
+        // Use the symlink as the app path
+        $this->appManager->expects($this->once())
+            ->method('getAppPath')
+            ->with($appName)
+            ->willReturn("$new_apps_path_symlink/$appName");
+        $this->appManager->expects($this->once())
+            ->method('getAppWebPath')
+            ->with($appName)
+            ->willReturn("/js-apps-test/$appName");
+
+        // Run the tests
+        $locator = $this->jsResourceLocator();
+        $locator->find(["$appName/test-file"]);
+
+        $resources = $locator->getResources();
+        $this->assertCount(1, $resources);
+        $resource = $resources[0];
+        $this->assertCount(3, $resource);
+        $root = $resource[0];
+        $webRoot = $resource[1];
+        $file = $resource[2];
+
+        $expectedRoot = $new_apps_path;
+        $expectedWebRoot = \OC::$WEBROOT . '/js-apps-test';
+        $expectedFile = $appName . '/test-file.js';
+
+        $this->assertEquals($expectedRoot, $root,
+            'Ensure the app path symlink is resolved into the real path');
+        $this->assertEquals($expectedWebRoot, $webRoot);
+        $this->assertEquals($expectedFile, $file);
+
+        unlink($new_apps_path_symlink);
+        $this->rrmdir($new_apps_path);
+    }
+
+    public function testNotExistingTranslationHandledSilent(): void {
+        $this->appManager->expects($this->once())
+            ->method('getAppPath')
+            ->with('core')
+            ->willThrowException(new AppPathNotFoundException());
+        $this->appManager->expects($this->atMost(1))
+            ->method('getAppWebPath')
+            ->with('core')
+            ->willThrowException(new AppPathNotFoundException());
+        // Assert logger is not called
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        // Run the tests
+        $locator = $this->jsResourceLocator();
+        $locator->find(['core/l10n/en.js']);
+
+        $resources = $locator->getResources();
+        $this->assertCount(0, $resources);
+    }
+
+    public function testFindModuleJSWithFallback(): void {
+        // First create new apps path, and a symlink to it
+        $apps_dirname = $this->randomString();
+        $new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
+        mkdir($new_apps_path);
+
+        // Create an app within that path
+        mkdir("$new_apps_path/test-js-app");
+        touch("$new_apps_path/test-js-app/module.mjs");
+        touch("$new_apps_path/test-js-app/both.mjs");
+        touch("$new_apps_path/test-js-app/both.js");
+        touch("$new_apps_path/test-js-app/plain.js");
+
+        // Use the app path
+        $this->appManager->expects($this->any())
+            ->method('getAppPath')
+            ->with('test-js-app')
+            ->willReturn("$new_apps_path/test-js-app");
+
+        $locator = $this->jsResourceLocator();
+        $locator->find(['test-js-app/module', 'test-js-app/both', 'test-js-app/plain']);
+
+        $resources = $locator->getResources();
+        $this->assertCount(3, $resources);
+
+        $expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app';
+        $expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];
+
+        for ($idx = 0; $idx++; $idx < 3) {
+            $this->assertEquals($expectedWebRoot, $resources[$idx][1]);
+            $this->assertEquals($expectedFiles[$idx], $resources[$idx][2]);
+        }
+
+        $this->rrmdir($new_apps_path);
+    }
 }

tests/lib/Template/ResourceLocatorTest.php

Indentation +53 added lines, -53 removed lines

@@ -17,64 +17,64 @@
 use Psr\Log\LoggerInterface;
 
 class ResourceLocatorTest extends \Test\TestCase {
-	private LoggerInterface&MockObject $logger;
-	private IConfig&MockObject $config;
+    private LoggerInterface&MockObject $logger;
+    private IConfig&MockObject $config;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->config = $this->createMock(IConfig::class);
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->config = $this->createMock(IConfig::class);
+    }
 
-	public function getResourceLocator(string $theme): ResourceLocator&MockObject {
-		$this->config
-			->expects($this->any())
-			->method('getSystemValueString')
-			->with('theme', '')
-			->willReturn($theme);
-		return $this->getMockForAbstractClass(ResourceLocator::class,
-			[$this->logger, $this->config],
-			'', true, true, true, []);
-	}
+    public function getResourceLocator(string $theme): ResourceLocator&MockObject {
+        $this->config
+            ->expects($this->any())
+            ->method('getSystemValueString')
+            ->with('theme', '')
+            ->willReturn($theme);
+        return $this->getMockForAbstractClass(ResourceLocator::class,
+            [$this->logger, $this->config],
+            '', true, true, true, []);
+    }
 
-	public function testFind(): void {
-		$locator = $this->getResourceLocator('theme');
-		$locator->expects($this->once())
-			->method('doFind')
-			->with('foo');
-		$locator->expects($this->once())
-			->method('doFindTheme')
-			->with('foo');
-		$locator->find(['foo']);
-	}
+    public function testFind(): void {
+        $locator = $this->getResourceLocator('theme');
+        $locator->expects($this->once())
+            ->method('doFind')
+            ->with('foo');
+        $locator->expects($this->once())
+            ->method('doFindTheme')
+            ->with('foo');
+        $locator->find(['foo']);
+    }
 
-	public function testFindNotFound(): void {
-		$locator = $this->getResourceLocator('theme',
-			['core' => 'map'], ['3rd' => 'party'], ['foo' => 'bar']);
-		$locator->expects($this->once())
-			->method('doFind')
-			->with('foo')
-			->willThrowException(new ResourceNotFoundException('foo', 'map'));
-		$locator->expects($this->once())
-			->method('doFindTheme')
-			->with('foo')
-			->willThrowException(new ResourceNotFoundException('foo', 'map'));
-		$this->logger->expects($this->exactly(2))
-			->method('debug')
-			->with($this->stringContains('map/foo'));
-		$locator->find(['foo']);
-	}
+    public function testFindNotFound(): void {
+        $locator = $this->getResourceLocator('theme',
+            ['core' => 'map'], ['3rd' => 'party'], ['foo' => 'bar']);
+        $locator->expects($this->once())
+            ->method('doFind')
+            ->with('foo')
+            ->willThrowException(new ResourceNotFoundException('foo', 'map'));
+        $locator->expects($this->once())
+            ->method('doFindTheme')
+            ->with('foo')
+            ->willThrowException(new ResourceNotFoundException('foo', 'map'));
+        $this->logger->expects($this->exactly(2))
+            ->method('debug')
+            ->with($this->stringContains('map/foo'));
+        $locator->find(['foo']);
+    }
 
-	public function testAppendIfExist(): void {
-		$locator = $this->getResourceLocator('theme');
-		$method = new \ReflectionMethod($locator, 'appendIfExist');
-		$method->setAccessible(true);
+    public function testAppendIfExist(): void {
+        $locator = $this->getResourceLocator('theme');
+        $method = new \ReflectionMethod($locator, 'appendIfExist');
+        $method->setAccessible(true);
 
-		$method->invoke($locator, __DIR__, basename(__FILE__), 'webroot');
-		$resource1 = [__DIR__, 'webroot', basename(__FILE__)];
-		$this->assertEquals([$resource1], $locator->getResources());
+        $method->invoke($locator, __DIR__, basename(__FILE__), 'webroot');
+        $resource1 = [__DIR__, 'webroot', basename(__FILE__)];
+        $this->assertEquals([$resource1], $locator->getResources());
 
-		$method->invoke($locator, __DIR__, 'does-not-exist');
-		$this->assertEquals([$resource1], $locator->getResources());
-	}
+        $method->invoke($locator, __DIR__, 'does-not-exist');
+        $this->assertEquals([$resource1], $locator->getResources());
+    }
 }

tests/lib/TemplateLayoutTest.php

Indentation +92 added lines, -92 removed lines

@@ -21,97 +21,97 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class TemplateLayoutTest extends \Test\TestCase {
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private IAppManager&MockObject $appManager;
-	private InitialStateService&MockObject $initialState;
-	private INavigationManager&MockObject $navigationManager;
-	private ITemplateManager&MockObject $templateManager;
-	private ServerVersion&MockObject $serverVersion;
-
-	private TemplateLayout $templateLayout;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->initialState = $this->createMock(InitialStateService::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
-		$this->templateManager = $this->createMock(ITemplateManager::class);
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataVersionHash')]
-	public function testVersionHash(
-		string|false $path,
-		string|false $file,
-		bool $installed,
-		bool $debug,
-		string $expected,
-	): void {
-		$this->appManager->expects(self::any())
-			->method('getAppVersion')
-			->willReturnCallback(fn ($appId) => match ($appId) {
-				'shippedApp' => 'shipped_1',
-				'otherApp' => 'other_2',
-				default => "$appId",
-			});
-		$this->appManager->expects(self::any())
-			->method('isShipped')
-			->willReturnCallback(fn (string $app) => $app === 'shippedApp');
-
-		$this->config->expects(self::atLeastOnce())
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['installed', $installed],
-				['debug', $debug],
-			]);
-		$this->config->expects(self::any())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('42');
-
-		$this->templateLayout = $this->getMockBuilder(TemplateLayout::class)
-			->onlyMethods(['getAppNamefromPath'])
-			->setConstructorArgs([
-				$this->config,
-				$this->appConfig,
-				$this->appManager,
-				$this->initialState,
-				$this->navigationManager,
-				$this->templateManager,
-				$this->serverVersion,
-			])
-			->getMock();
-
-		$layout = $this->templateLayout->getPageTemplate(TemplateResponse::RENDER_AS_ERROR, '');
-
-		self::invokePrivate(TemplateLayout::class, 'versionHash', ['version_hash']);
-
-		$this->templateLayout->expects(self::any())
-			->method('getAppNamefromPath')
-			->willReturnCallback(fn ($appName) => match($appName) {
-				'apps/shipped' => 'shippedApp',
-				'other/app.css' => 'otherApp',
-				default => false,
-			});
-
-		$hash = self::invokePrivate($this->templateLayout, 'getVersionHashSuffix', [$path, $file]);
-		self::assertEquals($expected, $hash);
-	}
-
-	public static function dataVersionHash() {
-		return [
-			'no hash if in debug mode' => ['apps/shipped', 'style.css', true, true, ''],
-			'only version hash if not installed' => ['apps/shipped', 'style.css', false, false, '?v=version_hash'],
-			'version hash with cache buster if app not found' => ['unknown/path', '', true, false, '?v=version_hash-42'],
-			'version hash with cache buster if neither path nor file provided' => [false, false, true, false, '?v=version_hash-42'],
-			'app version hash if external app' => ['', 'other/app.css', true, false, '?v=' . substr(md5('other_2'), 0, 8) . '-42'],
-			'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
-			'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
-		];
-	}
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private IAppManager&MockObject $appManager;
+    private InitialStateService&MockObject $initialState;
+    private INavigationManager&MockObject $navigationManager;
+    private ITemplateManager&MockObject $templateManager;
+    private ServerVersion&MockObject $serverVersion;
+
+    private TemplateLayout $templateLayout;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->initialState = $this->createMock(InitialStateService::class);
+        $this->navigationManager = $this->createMock(INavigationManager::class);
+        $this->templateManager = $this->createMock(ITemplateManager::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataVersionHash')]
+    public function testVersionHash(
+        string|false $path,
+        string|false $file,
+        bool $installed,
+        bool $debug,
+        string $expected,
+    ): void {
+        $this->appManager->expects(self::any())
+            ->method('getAppVersion')
+            ->willReturnCallback(fn ($appId) => match ($appId) {
+                'shippedApp' => 'shipped_1',
+                'otherApp' => 'other_2',
+                default => "$appId",
+            });
+        $this->appManager->expects(self::any())
+            ->method('isShipped')
+            ->willReturnCallback(fn (string $app) => $app === 'shippedApp');
+
+        $this->config->expects(self::atLeastOnce())
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['installed', $installed],
+                ['debug', $debug],
+            ]);
+        $this->config->expects(self::any())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('42');
+
+        $this->templateLayout = $this->getMockBuilder(TemplateLayout::class)
+            ->onlyMethods(['getAppNamefromPath'])
+            ->setConstructorArgs([
+                $this->config,
+                $this->appConfig,
+                $this->appManager,
+                $this->initialState,
+                $this->navigationManager,
+                $this->templateManager,
+                $this->serverVersion,
+            ])
+            ->getMock();
+
+        $layout = $this->templateLayout->getPageTemplate(TemplateResponse::RENDER_AS_ERROR, '');
+
+        self::invokePrivate(TemplateLayout::class, 'versionHash', ['version_hash']);
+
+        $this->templateLayout->expects(self::any())
+            ->method('getAppNamefromPath')
+            ->willReturnCallback(fn ($appName) => match($appName) {
+                'apps/shipped' => 'shippedApp',
+                'other/app.css' => 'otherApp',
+                default => false,
+            });
+
+        $hash = self::invokePrivate($this->templateLayout, 'getVersionHashSuffix', [$path, $file]);
+        self::assertEquals($expected, $hash);
+    }
+
+    public static function dataVersionHash() {
+        return [
+            'no hash if in debug mode' => ['apps/shipped', 'style.css', true, true, ''],
+            'only version hash if not installed' => ['apps/shipped', 'style.css', false, false, '?v=version_hash'],
+            'version hash with cache buster if app not found' => ['unknown/path', '', true, false, '?v=version_hash-42'],
+            'version hash with cache buster if neither path nor file provided' => [false, false, true, false, '?v=version_hash-42'],
+            'app version hash if external app' => ['', 'other/app.css', true, false, '?v=' . substr(md5('other_2'), 0, 8) . '-42'],
+            'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
+            'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
+        ];
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -45,8 +45,8 @@ 
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataVersionHash')]
 	public function testVersionHash(
-		string|false $path,
-		string|false $file,
+		string | false $path,
+		string | false $file,
 		bool $installed,
 		bool $debug,
 		string $expected,
@@ -108,9 +108,9 @@ 
 			'only version hash if not installed' => ['apps/shipped', 'style.css', false, false, '?v=version_hash'],
 			'version hash with cache buster if app not found' => ['unknown/path', '', true, false, '?v=version_hash-42'],
 			'version hash with cache buster if neither path nor file provided' => [false, false, true, false, '?v=version_hash-42'],
-			'app version hash if external app' => ['', 'other/app.css', true, false, '?v=' . substr(md5('other_2'), 0, 8) . '-42'],
-			'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
-			'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
+			'app version hash if external app' => ['', 'other/app.css', true, false, '?v='.substr(md5('other_2'), 0, 8).'-42'],
+			'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v='.substr(md5('shipped_1-version_hash'), 0, 8).'-42'],
+			'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v='.substr(md5('shipped_1-version_hash'), 0, 8).'-42'],
 		];
 	}
 

lib/private/Server.php

Indentation +1372 added lines, -1372 removed lines

@@ -248,1417 +248,1417 @@
  * 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),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::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(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				)
-			);
-		});
-
-		$this->registerService(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),
-			);
-
-			$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));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::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(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                )
+            );
+        });
+
+        $this->registerService(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),
+            );
+
+            $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));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->connectDispatcher();
-	}
+        $this->connectDispatcher();
+    }
 
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/private/TemplateLayout.php

Indentation +371 added lines, -371 removed lines

@@ -39,375 +39,375 @@
 use OCP\Util;
 
 class TemplateLayout {
-	private static string $versionHash = '';
-	/** @var string[] */
-	private static array $cacheBusterCache = [];
-
-	public ?CSSResourceLocator $cssLocator = null;
-	public ?JSResourceLocator $jsLocator = null;
-
-	public function __construct(
-		private IConfig $config,
-		private readonly IAppConfig $appConfig,
-		private IAppManager $appManager,
-		private InitialStateService $initialState,
-		private INavigationManager $navigationManager,
-		private ITemplateManager $templateManager,
-		private ServerVersion $serverVersion,
-	) {
-	}
-
-	public function getPageTemplate(string $renderAs, string $appId): ITemplate {
-		// Add fallback theming variables if not rendered as user
-		if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
-			// TODO cache generated default theme if enabled for fallback if server is erroring ?
-			Util::addStyle('theming', 'default');
-		}
-
-		// Decide which page we show
-		switch ($renderAs) {
-			case TemplateResponse::RENDER_AS_USER:
-				$page = $this->templateManager->getTemplate('core', 'layout.user');
-				if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-					$page->assign('bodyid', 'body-settings');
-				} else {
-					$page->assign('bodyid', 'body-user');
-				}
-
-				$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
-				$this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
-
-				$this->initialState->provideInitialState('unified-search', 'min-search-length', $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MIN_SEARCH_LENGTH));
-				if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
-					$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
-					$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
-					Util::addScript('core', 'legacy-unified-search', 'core');
-				} else {
-					Util::addScript('core', 'unified-search', 'core');
-				}
-
-				// Set logo link target
-				$logoUrl = $this->config->getSystemValueString('logo_url', '');
-				$page->assign('logoUrl', $logoUrl);
-
-				// Set default entry name
-				$defaultEntryId = $this->navigationManager->getDefaultEntryIdForUser();
-				$defaultEntry = $this->navigationManager->get($defaultEntryId);
-				$page->assign('defaultAppName', $defaultEntry['name'] ?? '');
-
-				// Add navigation entry
-				$page->assign('application', '');
-				$page->assign('appid', $appId);
-
-				$navigation = $this->navigationManager->getAll();
-				$page->assign('navigation', $navigation);
-				$settingsNavigation = $this->navigationManager->getAll('settings');
-				$this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
-
-				foreach ($navigation as $entry) {
-					if ($entry['active']) {
-						$page->assign('application', $entry['name']);
-						break;
-					}
-				}
-
-				foreach ($settingsNavigation as $entry) {
-					if ($entry['active']) {
-						$page->assign('application', $entry['name']);
-						break;
-					}
-				}
-
-				$user = Server::get(IUserSession::class)->getUser();
-
-				if ($user === null) {
-					$page->assign('user_uid', false);
-					$page->assign('user_displayname', false);
-					$page->assign('userAvatarSet', false);
-					$page->assign('userStatus', false);
-				} else {
-					$page->assign('user_uid', $user->getUID());
-					$page->assign('user_displayname', $user->getDisplayName());
-					$page->assign('userAvatarSet', true);
-					$page->assign('userAvatarVersion', $this->config->getUserValue($user->getUID(), 'avatar', 'version', 0));
-				}
-				break;
-			case TemplateResponse::RENDER_AS_ERROR:
-				$page = $this->templateManager->getTemplate('core', 'layout.guest', '', false);
-				$page->assign('bodyid', 'body-login');
-				$page->assign('user_displayname', '');
-				$page->assign('user_uid', '');
-				break;
-			case TemplateResponse::RENDER_AS_GUEST:
-				$page = $this->templateManager->getTemplate('core', 'layout.guest');
-				Util::addStyle('guest');
-				$page->assign('bodyid', 'body-login');
-
-				$userDisplayName = false;
-				$user = Server::get(IUserSession::class)->getUser();
-				if ($user) {
-					$userDisplayName = $user->getDisplayName();
-				}
-
-				$page->assign('user_displayname', $userDisplayName);
-				$page->assign('user_uid', \OC_User::getUser());
-				break;
-			case TemplateResponse::RENDER_AS_PUBLIC:
-				$page = $this->templateManager->getTemplate('core', 'layout.public');
-				$page->assign('appid', $appId);
-				$page->assign('bodyid', 'body-public');
-
-				// Set logo link target
-				$logoUrl = $this->config->getSystemValueString('logo_url', '');
-				$page->assign('logoUrl', $logoUrl);
-
-				$subscription = Server::get(IRegistry::class);
-				$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
-				if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
-					$showSimpleSignup = false;
-				}
-
-				$defaultSignUpLink = 'https://nextcloud.com/signup/';
-				$signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
-				if ($signUpLink !== $defaultSignUpLink) {
-					$showSimpleSignup = true;
-				}
-
-				if ($this->appManager->isEnabledForUser('registration')) {
-					$urlGenerator = Server::get(IURLGenerator::class);
-					$signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
-				}
-
-				$page->assign('showSimpleSignUpLink', $showSimpleSignup);
-				$page->assign('signUpLink', $signUpLink);
-				break;
-			default:
-				$page = $this->templateManager->getTemplate('core', 'layout.base');
-				break;
-		}
-		// Send the language, locale, and direction to our layouts
-		$l10nFactory = Server::get(IFactory::class);
-		$lang = $l10nFactory->findLanguage();
-		$locale = $l10nFactory->findLocale($lang);
-		$direction = $l10nFactory->getLanguageDirection($lang);
-
-		$lang = str_replace('_', '-', $lang);
-		$page->assign('language', $lang);
-		$page->assign('locale', $locale);
-		$page->assign('direction', $direction);
-
-		// Set body data-theme
-		try {
-			$themesService = Server::get(\OCA\Theming\Service\ThemesService::class);
-		} catch (\Exception) {
-			$themesService = null;
-		}
-		$page->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);
-
-		if ($this->config->getSystemValueBool('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = $this->appManager->getAppInstalledVersions(true);
-				$v['core'] = implode('.', $this->serverVersion->getVersion());
-				self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
-
-		// Add the js files
-		$jsFiles = $this->findJavascriptFiles(Util::getScripts());
-		$page->assign('jsfiles', []);
-		if ($this->config->getSystemValueBool('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
-			// this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
-			// see https://github.com/nextcloud/server/pull/22636 for details
-			$jsConfigHelper = new JSConfigHelper(
-				$this->serverVersion,
-				\OCP\Util::getL10N('lib'),
-				\OCP\Server::get(Defaults::class),
-				$this->appManager,
-				\OC::$server->getSession(),
-				\OC::$server->getUserSession()->getUser(),
-				$this->config,
-				$this->appConfig,
-				\OC::$server->getGroupManager(),
-				\OC::$server->get(IniGetWrapper::class),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->get(CapabilitiesManager::class),
-				\OCP\Server::get(IInitialStateService::class),
-				\OCP\Server::get(IProvider::class),
-				\OCP\Server::get(FilenameValidator::class),
-			);
-			$config = $jsConfigHelper->getConfig();
-			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
-				$page->assign('inline_ocjs', $config);
-			} else {
-				$page->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
-			}
-		}
-		foreach ($jsFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-			$page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
-		}
-
-		$request = \OCP\Server::get(IRequest::class);
-
-		try {
-			$pathInfo = $request->getPathInfo();
-		} catch (\Exception $e) {
-			$pathInfo = '';
-		}
-
-		// Do not initialise scss appdata until we have a fully installed instance
-		// Do not load scss for update, errors, installation or login page
-		if ($this->config->getSystemValueBool('installed', false)
-			&& !\OCP\Util::needUpgrade()
-			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)
-			&& $renderAs !== TemplateResponse::RENDER_AS_ERROR
-		) {
-			$cssFiles = $this->findStylesheetFiles(\OC_Util::$styles);
-		} else {
-			// If we ignore the scss compiler,
-			// we need to load the guest css fallback
-			Util::addStyle('guest');
-			$cssFiles = $this->findStylesheetFiles(\OC_Util::$styles);
-		}
-
-		$page->assign('cssfiles', []);
-		$page->assign('printcssfiles', []);
-		$this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
-		foreach ($cssFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-
-			if (str_ends_with($file, 'print.css')) {
-				$page->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
-			} else {
-				$suffix = $this->getVersionHashSuffix($web, $file);
-
-				if (!str_contains($file, '?v=')) {
-					$page->append('cssfiles', $web . '/' . $file . $suffix);
-				} else {
-					$page->append('cssfiles', $web . '/' . $file . '-' . substr($suffix, 3));
-				}
-			}
-		}
-
-		if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
-			// Prevent auto zoom with iOS but still allow user zoom
-			// On chrome (and others) this does not work (will also disable user zoom)
-			$page->assign('viewport_maximum_scale', '1.0');
-		}
-
-		$page->assign('initialStates', $this->initialState->getInitialStates());
-
-		$page->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
-		$page->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
-
-		return $page;
-	}
-
-	protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
-		if ($this->config->getSystemValueBool('debug', false)) {
-			// allows chrome workspace mapping in debug mode
-			return '';
-		}
-
-		if ($this->config->getSystemValueBool('installed', false) === false) {
-			// if not installed just return the version hash
-			return '?v=' . self::$versionHash;
-		}
-
-		$hash = false;
-		// Try the web-root first
-		if ($path !== '') {
-			$hash = $this->getVersionHashByPath($path);
-		}
-		// If not found try the file
-		if ($hash === false && $file !== '') {
-			$hash = $this->getVersionHashByPath($file);
-		}
-		// As a last resort we use the server version hash
-		if ($hash === false) {
-			$hash = self::$versionHash;
-		}
-
-		// The theming app is force-enabled thus the cache buster is always available
-		$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		return '?v=' . $hash . $themingSuffix;
-	}
-
-	private function getVersionHashByPath(string $path): string|false {
-		if (array_key_exists($path, self::$cacheBusterCache) === false) {
-			// Not yet cached, so lets find the cache buster string
-			$appId = $this->getAppNamefromPath($path);
-			if ($appId === false) {
-				// No app Id could be guessed
-				return false;
-			}
-
-			if ($appId === 'core') {
-				// core is not a real app but the server itself
-				$hash = self::$versionHash;
-			} else {
-				$appVersion = $this->appManager->getAppVersion($appId);
-				// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
-				if ($this->appManager->isShipped($appId)) {
-					$appVersion .= '-' . self::$versionHash;
-				}
-
-				$hash = substr(md5($appVersion), 0, 8);
-			}
-			self::$cacheBusterCache[$path] = $hash;
-		}
-
-		return self::$cacheBusterCache[$path];
-	}
-
-	private function findStylesheetFiles(array $styles): array {
-		if ($this->cssLocator === null) {
-			$this->cssLocator = \OCP\Server::get(CSSResourceLocator::class);
-		}
-		$this->cssLocator->find($styles);
-		return $this->cssLocator->getResources();
-	}
-
-	public function getAppNamefromPath(string $path): string|false {
-		if ($path !== '') {
-			$pathParts = explode('/', $path);
-			if ($pathParts[0] === 'css') {
-				// This is a scss request
-				return $pathParts[1];
-			} elseif ($pathParts[0] === 'core') {
-				return 'core';
-			}
-			return end($pathParts);
-		}
-		return false;
-	}
-
-	private function findJavascriptFiles(array $scripts): array {
-		if ($this->jsLocator === null) {
-			$this->jsLocator = \OCP\Server::get(JSResourceLocator::class);
-		}
-		$this->jsLocator->find($scripts);
-		return $this->jsLocator->getResources();
-	}
-
-	/**
-	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
-	 * @param string $filePath Absolute path
-	 * @return string Relative path
-	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
-	 */
-	public static function convertToRelativePath(string $filePath) {
-		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if (count($relativePath) !== 2) {
-			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
-		}
-
-		return $relativePath[1];
-	}
+    private static string $versionHash = '';
+    /** @var string[] */
+    private static array $cacheBusterCache = [];
+
+    public ?CSSResourceLocator $cssLocator = null;
+    public ?JSResourceLocator $jsLocator = null;
+
+    public function __construct(
+        private IConfig $config,
+        private readonly IAppConfig $appConfig,
+        private IAppManager $appManager,
+        private InitialStateService $initialState,
+        private INavigationManager $navigationManager,
+        private ITemplateManager $templateManager,
+        private ServerVersion $serverVersion,
+    ) {
+    }
+
+    public function getPageTemplate(string $renderAs, string $appId): ITemplate {
+        // Add fallback theming variables if not rendered as user
+        if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
+            // TODO cache generated default theme if enabled for fallback if server is erroring ?
+            Util::addStyle('theming', 'default');
+        }
+
+        // Decide which page we show
+        switch ($renderAs) {
+            case TemplateResponse::RENDER_AS_USER:
+                $page = $this->templateManager->getTemplate('core', 'layout.user');
+                if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+                    $page->assign('bodyid', 'body-settings');
+                } else {
+                    $page->assign('bodyid', 'body-user');
+                }
+
+                $this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
+                $this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
+
+                $this->initialState->provideInitialState('unified-search', 'min-search-length', $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MIN_SEARCH_LENGTH));
+                if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
+                    $this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
+                    $this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
+                    Util::addScript('core', 'legacy-unified-search', 'core');
+                } else {
+                    Util::addScript('core', 'unified-search', 'core');
+                }
+
+                // Set logo link target
+                $logoUrl = $this->config->getSystemValueString('logo_url', '');
+                $page->assign('logoUrl', $logoUrl);
+
+                // Set default entry name
+                $defaultEntryId = $this->navigationManager->getDefaultEntryIdForUser();
+                $defaultEntry = $this->navigationManager->get($defaultEntryId);
+                $page->assign('defaultAppName', $defaultEntry['name'] ?? '');
+
+                // Add navigation entry
+                $page->assign('application', '');
+                $page->assign('appid', $appId);
+
+                $navigation = $this->navigationManager->getAll();
+                $page->assign('navigation', $navigation);
+                $settingsNavigation = $this->navigationManager->getAll('settings');
+                $this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
+
+                foreach ($navigation as $entry) {
+                    if ($entry['active']) {
+                        $page->assign('application', $entry['name']);
+                        break;
+                    }
+                }
+
+                foreach ($settingsNavigation as $entry) {
+                    if ($entry['active']) {
+                        $page->assign('application', $entry['name']);
+                        break;
+                    }
+                }
+
+                $user = Server::get(IUserSession::class)->getUser();
+
+                if ($user === null) {
+                    $page->assign('user_uid', false);
+                    $page->assign('user_displayname', false);
+                    $page->assign('userAvatarSet', false);
+                    $page->assign('userStatus', false);
+                } else {
+                    $page->assign('user_uid', $user->getUID());
+                    $page->assign('user_displayname', $user->getDisplayName());
+                    $page->assign('userAvatarSet', true);
+                    $page->assign('userAvatarVersion', $this->config->getUserValue($user->getUID(), 'avatar', 'version', 0));
+                }
+                break;
+            case TemplateResponse::RENDER_AS_ERROR:
+                $page = $this->templateManager->getTemplate('core', 'layout.guest', '', false);
+                $page->assign('bodyid', 'body-login');
+                $page->assign('user_displayname', '');
+                $page->assign('user_uid', '');
+                break;
+            case TemplateResponse::RENDER_AS_GUEST:
+                $page = $this->templateManager->getTemplate('core', 'layout.guest');
+                Util::addStyle('guest');
+                $page->assign('bodyid', 'body-login');
+
+                $userDisplayName = false;
+                $user = Server::get(IUserSession::class)->getUser();
+                if ($user) {
+                    $userDisplayName = $user->getDisplayName();
+                }
+
+                $page->assign('user_displayname', $userDisplayName);
+                $page->assign('user_uid', \OC_User::getUser());
+                break;
+            case TemplateResponse::RENDER_AS_PUBLIC:
+                $page = $this->templateManager->getTemplate('core', 'layout.public');
+                $page->assign('appid', $appId);
+                $page->assign('bodyid', 'body-public');
+
+                // Set logo link target
+                $logoUrl = $this->config->getSystemValueString('logo_url', '');
+                $page->assign('logoUrl', $logoUrl);
+
+                $subscription = Server::get(IRegistry::class);
+                $showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
+                if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
+                    $showSimpleSignup = false;
+                }
+
+                $defaultSignUpLink = 'https://nextcloud.com/signup/';
+                $signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
+                if ($signUpLink !== $defaultSignUpLink) {
+                    $showSimpleSignup = true;
+                }
+
+                if ($this->appManager->isEnabledForUser('registration')) {
+                    $urlGenerator = Server::get(IURLGenerator::class);
+                    $signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
+                }
+
+                $page->assign('showSimpleSignUpLink', $showSimpleSignup);
+                $page->assign('signUpLink', $signUpLink);
+                break;
+            default:
+                $page = $this->templateManager->getTemplate('core', 'layout.base');
+                break;
+        }
+        // Send the language, locale, and direction to our layouts
+        $l10nFactory = Server::get(IFactory::class);
+        $lang = $l10nFactory->findLanguage();
+        $locale = $l10nFactory->findLocale($lang);
+        $direction = $l10nFactory->getLanguageDirection($lang);
+
+        $lang = str_replace('_', '-', $lang);
+        $page->assign('language', $lang);
+        $page->assign('locale', $locale);
+        $page->assign('direction', $direction);
+
+        // Set body data-theme
+        try {
+            $themesService = Server::get(\OCA\Theming\Service\ThemesService::class);
+        } catch (\Exception) {
+            $themesService = null;
+        }
+        $page->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);
+
+        if ($this->config->getSystemValueBool('installed', false)) {
+            if (empty(self::$versionHash)) {
+                $v = $this->appManager->getAppInstalledVersions(true);
+                $v['core'] = implode('.', $this->serverVersion->getVersion());
+                self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
+            }
+        } else {
+            self::$versionHash = md5('not installed');
+        }
+
+        // Add the js files
+        $jsFiles = $this->findJavascriptFiles(Util::getScripts());
+        $page->assign('jsfiles', []);
+        if ($this->config->getSystemValueBool('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
+            // this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
+            // see https://github.com/nextcloud/server/pull/22636 for details
+            $jsConfigHelper = new JSConfigHelper(
+                $this->serverVersion,
+                \OCP\Util::getL10N('lib'),
+                \OCP\Server::get(Defaults::class),
+                $this->appManager,
+                \OC::$server->getSession(),
+                \OC::$server->getUserSession()->getUser(),
+                $this->config,
+                $this->appConfig,
+                \OC::$server->getGroupManager(),
+                \OC::$server->get(IniGetWrapper::class),
+                \OC::$server->getURLGenerator(),
+                \OC::$server->get(CapabilitiesManager::class),
+                \OCP\Server::get(IInitialStateService::class),
+                \OCP\Server::get(IProvider::class),
+                \OCP\Server::get(FilenameValidator::class),
+            );
+            $config = $jsConfigHelper->getConfig();
+            if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
+                $page->assign('inline_ocjs', $config);
+            } else {
+                $page->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
+            }
+        }
+        foreach ($jsFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+            $page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+        }
+
+        $request = \OCP\Server::get(IRequest::class);
+
+        try {
+            $pathInfo = $request->getPathInfo();
+        } catch (\Exception $e) {
+            $pathInfo = '';
+        }
+
+        // Do not initialise scss appdata until we have a fully installed instance
+        // Do not load scss for update, errors, installation or login page
+        if ($this->config->getSystemValueBool('installed', false)
+            && !\OCP\Util::needUpgrade()
+            && $pathInfo !== ''
+            && !preg_match('/^\/login/', $pathInfo)
+            && $renderAs !== TemplateResponse::RENDER_AS_ERROR
+        ) {
+            $cssFiles = $this->findStylesheetFiles(\OC_Util::$styles);
+        } else {
+            // If we ignore the scss compiler,
+            // we need to load the guest css fallback
+            Util::addStyle('guest');
+            $cssFiles = $this->findStylesheetFiles(\OC_Util::$styles);
+        }
+
+        $page->assign('cssfiles', []);
+        $page->assign('printcssfiles', []);
+        $this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
+        foreach ($cssFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+
+            if (str_ends_with($file, 'print.css')) {
+                $page->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+            } else {
+                $suffix = $this->getVersionHashSuffix($web, $file);
+
+                if (!str_contains($file, '?v=')) {
+                    $page->append('cssfiles', $web . '/' . $file . $suffix);
+                } else {
+                    $page->append('cssfiles', $web . '/' . $file . '-' . substr($suffix, 3));
+                }
+            }
+        }
+
+        if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
+            // Prevent auto zoom with iOS but still allow user zoom
+            // On chrome (and others) this does not work (will also disable user zoom)
+            $page->assign('viewport_maximum_scale', '1.0');
+        }
+
+        $page->assign('initialStates', $this->initialState->getInitialStates());
+
+        $page->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
+        $page->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
+
+        return $page;
+    }
+
+    protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
+        if ($this->config->getSystemValueBool('debug', false)) {
+            // allows chrome workspace mapping in debug mode
+            return '';
+        }
+
+        if ($this->config->getSystemValueBool('installed', false) === false) {
+            // if not installed just return the version hash
+            return '?v=' . self::$versionHash;
+        }
+
+        $hash = false;
+        // Try the web-root first
+        if ($path !== '') {
+            $hash = $this->getVersionHashByPath($path);
+        }
+        // If not found try the file
+        if ($hash === false && $file !== '') {
+            $hash = $this->getVersionHashByPath($file);
+        }
+        // As a last resort we use the server version hash
+        if ($hash === false) {
+            $hash = self::$versionHash;
+        }
+
+        // The theming app is force-enabled thus the cache buster is always available
+        $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        return '?v=' . $hash . $themingSuffix;
+    }
+
+    private function getVersionHashByPath(string $path): string|false {
+        if (array_key_exists($path, self::$cacheBusterCache) === false) {
+            // Not yet cached, so lets find the cache buster string
+            $appId = $this->getAppNamefromPath($path);
+            if ($appId === false) {
+                // No app Id could be guessed
+                return false;
+            }
+
+            if ($appId === 'core') {
+                // core is not a real app but the server itself
+                $hash = self::$versionHash;
+            } else {
+                $appVersion = $this->appManager->getAppVersion($appId);
+                // For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
+                if ($this->appManager->isShipped($appId)) {
+                    $appVersion .= '-' . self::$versionHash;
+                }
+
+                $hash = substr(md5($appVersion), 0, 8);
+            }
+            self::$cacheBusterCache[$path] = $hash;
+        }
+
+        return self::$cacheBusterCache[$path];
+    }
+
+    private function findStylesheetFiles(array $styles): array {
+        if ($this->cssLocator === null) {
+            $this->cssLocator = \OCP\Server::get(CSSResourceLocator::class);
+        }
+        $this->cssLocator->find($styles);
+        return $this->cssLocator->getResources();
+    }
+
+    public function getAppNamefromPath(string $path): string|false {
+        if ($path !== '') {
+            $pathParts = explode('/', $path);
+            if ($pathParts[0] === 'css') {
+                // This is a scss request
+                return $pathParts[1];
+            } elseif ($pathParts[0] === 'core') {
+                return 'core';
+            }
+            return end($pathParts);
+        }
+        return false;
+    }
+
+    private function findJavascriptFiles(array $scripts): array {
+        if ($this->jsLocator === null) {
+            $this->jsLocator = \OCP\Server::get(JSResourceLocator::class);
+        }
+        $this->jsLocator->find($scripts);
+        return $this->jsLocator->getResources();
+    }
+
+    /**
+     * Converts the absolute file path to a relative path from \OC::$SERVERROOT
+     * @param string $filePath Absolute path
+     * @return string Relative path
+     * @throws \Exception If $filePath is not under \OC::$SERVERROOT
+     */
+    public static function convertToRelativePath(string $filePath) {
+        $relativePath = explode(\OC::$SERVERROOT, $filePath);
+        if (count($relativePath) !== 2) {
+            throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+        }
+
+        return $relativePath[1];
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
 		switch ($renderAs) {
 			case TemplateResponse::RENDER_AS_USER:
 				$page = $this->templateManager->getTemplate('core', 'layout.user');
-				if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+				if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
 					$page->assign('bodyid', 'body-settings');
 				} else {
 					$page->assign('bodyid', 'body-user');
@@ -79,7 +79,7 @@ 
 
 				$this->initialState->provideInitialState('unified-search', 'min-search-length', $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MIN_SEARCH_LENGTH));
 				if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
-					$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
+					$this->initialState->provideInitialState('unified-search', 'limit-default', (int) $this->config->getAppValue('core', 'unified-search.limit-default', (string) SearchQuery::LIMIT_DEFAULT));
 					$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
 					Util::addScript('core', 'legacy-unified-search', 'core');
 				} else {
@@ -247,7 +247,7 @@ 
 		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+			$page->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 		}
 
 		$request = \OCP\Server::get(IRequest::class);
@@ -282,14 +282,14 @@ 
 			$file = $info[2];
 
 			if (str_ends_with($file, 'print.css')) {
-				$page->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+				$page->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 			} else {
 				$suffix = $this->getVersionHashSuffix($web, $file);
 
 				if (!str_contains($file, '?v=')) {
-					$page->append('cssfiles', $web . '/' . $file . $suffix);
+					$page->append('cssfiles', $web.'/'.$file.$suffix);
 				} else {
-					$page->append('cssfiles', $web . '/' . $file . '-' . substr($suffix, 3));
+					$page->append('cssfiles', $web.'/'.$file.'-'.substr($suffix, 3));
 				}
 			}
 		}
@@ -316,7 +316,7 @@ 
 
 		if ($this->config->getSystemValueBool('installed', false) === false) {
 			// if not installed just return the version hash
-			return '?v=' . self::$versionHash;
+			return '?v='.self::$versionHash;
 		}
 
 		$hash = false;
@@ -334,12 +334,12 @@ 
 		}
 
 		// The theming app is force-enabled thus the cache buster is always available
-		$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+		$themingSuffix = '-'.$this->config->getAppValue('theming', 'cachebuster', '0');
 
-		return '?v=' . $hash . $themingSuffix;
+		return '?v='.$hash.$themingSuffix;
 	}
 
-	private function getVersionHashByPath(string $path): string|false {
+	private function getVersionHashByPath(string $path): string | false {
 		if (array_key_exists($path, self::$cacheBusterCache) === false) {
 			// Not yet cached, so lets find the cache buster string
 			$appId = $this->getAppNamefromPath($path);
@@ -355,7 +355,7 @@ 
 				$appVersion = $this->appManager->getAppVersion($appId);
 				// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
 				if ($this->appManager->isShipped($appId)) {
-					$appVersion .= '-' . self::$versionHash;
+					$appVersion .= '-'.self::$versionHash;
 				}
 
 				$hash = substr(md5($appVersion), 0, 8);
@@ -374,7 +374,7 @@ 
 		return $this->cssLocator->getResources();
 	}
 
-	public function getAppNamefromPath(string $path): string|false {
+	public function getAppNamefromPath(string $path): string | false {
 		if ($path !== '') {
 			$pathParts = explode('/', $path);
 			if ($pathParts[0] === 'css') {

lib/private/L10N/L10N.php

Indentation +207 added lines, -207 removed lines

@@ -15,211 +15,211 @@
 use Symfony\Component\Translation\IdentityTranslator;
 
 class L10N implements IL10N {
-	/** @var IFactory */
-	protected $factory;
-
-	/** @var string App of this object */
-	protected $app;
-
-	/** @var string Language of this object */
-	protected $lang;
-
-	/** @var string Locale of this object */
-	protected $locale;
-
-	/** @var IdentityTranslator */
-	private $identityTranslator;
-
-	/** @var string[] */
-	private $translations = [];
-
-	/**
-	 * @param IFactory $factory
-	 * @param string $app
-	 * @param string $lang
-	 * @param string $locale
-	 * @param array $files
-	 */
-	public function __construct(IFactory $factory, $app, $lang, $locale, array $files) {
-		$this->factory = $factory;
-		$this->app = $app;
-		$this->lang = $lang;
-		$this->locale = $locale;
-
-		foreach ($files as $languageFile) {
-			$this->load($languageFile);
-		}
-	}
-
-	/**
-	 * The code (en, de, ...) of the language that is used for this instance
-	 *
-	 * @return string language
-	 */
-	public function getLanguageCode(): string {
-		return $this->lang;
-	}
-
-	/**
-	 * The code (en_US, fr_CA, ...) of the locale that is used for this instance
-	 *
-	 * @return string locale
-	 */
-	public function getLocaleCode(): string {
-		return $this->locale;
-	}
-
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array|string $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 */
-	public function t(string $text, $parameters = []): string {
-		if (!\is_array($parameters)) {
-			$parameters = [$parameters];
-		}
-
-		return (string)new L10NString($this, $text, $parameters);
-	}
-
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 *
-	 */
-	public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string {
-		$identifier = "_{$text_singular}_::_{$text_plural}_";
-		if (isset($this->translations[$identifier])) {
-			return (string)new L10NString($this, $identifier, $parameters, $count);
-		}
-
-		if ($count === 1) {
-			return (string)new L10NString($this, $text_singular, $parameters, $count);
-		}
-
-		return (string)new L10NString($this, $text_plural, $parameters, $count);
-	}
-
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param \DateTime|int|string|null $data parameters for this localization
-	 * @param array $options
-	 * @return string|int|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - params: timestamp (int/string)
-	 *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
-	 *  - jsdate: Returns the short JS date format
-	 */
-	public function l(string $type, $data = null, array $options = []) {
-		if ($this->locale === null) {
-			// Use the language of the instance
-			$this->locale = $this->getLanguageCode();
-		}
-		if ($this->locale === 'sr@latin') {
-			$this->locale = 'sr_latn';
-		}
-
-		if ($type === 'firstday') {
-			return (int)Calendar::getFirstWeekday($this->locale);
-		}
-		if ($type === 'jsdate') {
-			return (string)Calendar::getDateFormat('short', $this->locale);
-		}
-
-		$value = new \DateTime();
-		if ($data instanceof \DateTime) {
-			$value = $data;
-		} elseif (\is_string($data) && !is_numeric($data)) {
-			$data = strtotime($data);
-			$value->setTimestamp($data);
-		} elseif ($data !== null) {
-			$data = (int)$data;
-			$value->setTimestamp($data);
-		}
-
-		$options = array_merge(['width' => 'long'], $options);
-		$width = $options['width'];
-		switch ($type) {
-			case 'date':
-				return (string)Calendar::formatDate($value, $width, $this->locale);
-			case 'datetime':
-				return (string)Calendar::formatDatetime($value, $width, $this->locale);
-			case 'time':
-				return (string)Calendar::formatTime($value, $width, $this->locale);
-			case 'weekdayName':
-				return (string)Calendar::getWeekdayName($value, $width, $this->locale);
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Returns an associative array with all translations
-	 *
-	 * Called by \OC_L10N_String
-	 * @return array
-	 */
-	public function getTranslations(): array {
-		return $this->translations;
-	}
-
-	/**
-	 * @internal
-	 * @return IdentityTranslator
-	 */
-	public function getIdentityTranslator(): IdentityTranslator {
-		if (\is_null($this->identityTranslator)) {
-			$this->identityTranslator = new IdentityTranslator();
-			// We need to use the language code here instead of the locale,
-			// because Symfony does not distinguish between the two and would
-			// otherwise e.g. with locale "Czech" and language "German" try to
-			// pick a non-existing plural rule, because Czech has 4 plural forms
-			// and German only 2.
-			$this->identityTranslator->setLocale($this->getLanguageCode());
-		}
-
-		return $this->identityTranslator;
-	}
-
-	/**
-	 * @param string $translationFile
-	 * @return bool
-	 */
-	protected function load(string $translationFile): bool {
-		$json = json_decode(file_get_contents($translationFile), true);
-		if (!\is_array($json)) {
-			$jsonError = json_last_error();
-			\OCP\Server::get(LoggerInterface::class)->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
-			return false;
-		}
-
-		$this->translations = array_merge($this->translations, $json['translations']);
-		return true;
-	}
+    /** @var IFactory */
+    protected $factory;
+
+    /** @var string App of this object */
+    protected $app;
+
+    /** @var string Language of this object */
+    protected $lang;
+
+    /** @var string Locale of this object */
+    protected $locale;
+
+    /** @var IdentityTranslator */
+    private $identityTranslator;
+
+    /** @var string[] */
+    private $translations = [];
+
+    /**
+     * @param IFactory $factory
+     * @param string $app
+     * @param string $lang
+     * @param string $locale
+     * @param array $files
+     */
+    public function __construct(IFactory $factory, $app, $lang, $locale, array $files) {
+        $this->factory = $factory;
+        $this->app = $app;
+        $this->lang = $lang;
+        $this->locale = $locale;
+
+        foreach ($files as $languageFile) {
+            $this->load($languageFile);
+        }
+    }
+
+    /**
+     * The code (en, de, ...) of the language that is used for this instance
+     *
+     * @return string language
+     */
+    public function getLanguageCode(): string {
+        return $this->lang;
+    }
+
+    /**
+     * The code (en_US, fr_CA, ...) of the locale that is used for this instance
+     *
+     * @return string locale
+     */
+    public function getLocaleCode(): string {
+        return $this->locale;
+    }
+
+    /**
+     * Translating
+     * @param string $text The text we need a translation for
+     * @param array|string $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     */
+    public function t(string $text, $parameters = []): string {
+        if (!\is_array($parameters)) {
+            $parameters = [$parameters];
+        }
+
+        return (string)new L10NString($this, $text, $parameters);
+    }
+
+    /**
+     * Translating
+     * @param string $text_singular the string to translate for exactly one object
+     * @param string $text_plural the string to translate for n objects
+     * @param integer $count Number of objects
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned. %n will be replaced with the number of objects.
+     *
+     * The correct plural is determined by the plural_forms-function
+     * provided by the po file.
+     *
+     */
+    public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string {
+        $identifier = "_{$text_singular}_::_{$text_plural}_";
+        if (isset($this->translations[$identifier])) {
+            return (string)new L10NString($this, $identifier, $parameters, $count);
+        }
+
+        if ($count === 1) {
+            return (string)new L10NString($this, $text_singular, $parameters, $count);
+        }
+
+        return (string)new L10NString($this, $text_plural, $parameters, $count);
+    }
+
+    /**
+     * Localization
+     * @param string $type Type of localization
+     * @param \DateTime|int|string|null $data parameters for this localization
+     * @param array $options
+     * @return string|int|false
+     *
+     * Returns the localized data.
+     *
+     * Implemented types:
+     *  - date
+     *    - Creates a date
+     *    - params: timestamp (int/string)
+     *  - datetime
+     *    - Creates date and time
+     *    - params: timestamp (int/string)
+     *  - time
+     *    - Creates a time
+     *    - params: timestamp (int/string)
+     *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
+     *  - jsdate: Returns the short JS date format
+     */
+    public function l(string $type, $data = null, array $options = []) {
+        if ($this->locale === null) {
+            // Use the language of the instance
+            $this->locale = $this->getLanguageCode();
+        }
+        if ($this->locale === 'sr@latin') {
+            $this->locale = 'sr_latn';
+        }
+
+        if ($type === 'firstday') {
+            return (int)Calendar::getFirstWeekday($this->locale);
+        }
+        if ($type === 'jsdate') {
+            return (string)Calendar::getDateFormat('short', $this->locale);
+        }
+
+        $value = new \DateTime();
+        if ($data instanceof \DateTime) {
+            $value = $data;
+        } elseif (\is_string($data) && !is_numeric($data)) {
+            $data = strtotime($data);
+            $value->setTimestamp($data);
+        } elseif ($data !== null) {
+            $data = (int)$data;
+            $value->setTimestamp($data);
+        }
+
+        $options = array_merge(['width' => 'long'], $options);
+        $width = $options['width'];
+        switch ($type) {
+            case 'date':
+                return (string)Calendar::formatDate($value, $width, $this->locale);
+            case 'datetime':
+                return (string)Calendar::formatDatetime($value, $width, $this->locale);
+            case 'time':
+                return (string)Calendar::formatTime($value, $width, $this->locale);
+            case 'weekdayName':
+                return (string)Calendar::getWeekdayName($value, $width, $this->locale);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns an associative array with all translations
+     *
+     * Called by \OC_L10N_String
+     * @return array
+     */
+    public function getTranslations(): array {
+        return $this->translations;
+    }
+
+    /**
+     * @internal
+     * @return IdentityTranslator
+     */
+    public function getIdentityTranslator(): IdentityTranslator {
+        if (\is_null($this->identityTranslator)) {
+            $this->identityTranslator = new IdentityTranslator();
+            // We need to use the language code here instead of the locale,
+            // because Symfony does not distinguish between the two and would
+            // otherwise e.g. with locale "Czech" and language "German" try to
+            // pick a non-existing plural rule, because Czech has 4 plural forms
+            // and German only 2.
+            $this->identityTranslator->setLocale($this->getLanguageCode());
+        }
+
+        return $this->identityTranslator;
+    }
+
+    /**
+     * @param string $translationFile
+     * @return bool
+     */
+    protected function load(string $translationFile): bool {
+        $json = json_decode(file_get_contents($translationFile), true);
+        if (!\is_array($json)) {
+            $jsonError = json_last_error();
+            \OCP\Server::get(LoggerInterface::class)->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
+            return false;
+        }
+
+        $this->translations = array_merge($this->translations, $json['translations']);
+        return true;
+    }
 }

lib/private/Template/CSSResourceLocator.php

Indentation +64 added lines, -64 removed lines

@@ -16,76 +16,76 @@
 use Psr\Log\LoggerInterface;
 
 class CSSResourceLocator extends ResourceLocator {
-	public function __construct(
-		LoggerInterface $logger,
-		IConfig $config,
-		protected IAppManager $appManager,
-	) {
-		parent::__construct($logger, $config);
-	}
+    public function __construct(
+        LoggerInterface $logger,
+        IConfig $config,
+        protected IAppManager $appManager,
+    ) {
+        parent::__construct($logger, $config);
+    }
 
-	public function doFind(string $resource): void {
-		$parts = explode('/', $resource, 2);
-		if (count($parts) < 2) {
-			return;
-		}
-		[$app,$subpath] = $parts;
-		if ($this->appendIfExist($this->serverroot, $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
-		) {
-			return;
-		}
-		try {
-			$app_path = $this->appManager->getAppPath($app);
-			$app_url = $this->appManager->getAppWebPath($app);
-		} catch (AppPathNotFoundException $e) {
-			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $subpath . '.css',
-				'app' => 'cssresourceloader',
-				'exception' => $e,
-			]);
-			return;
-		}
+    public function doFind(string $resource): void {
+        $parts = explode('/', $resource, 2);
+        if (count($parts) < 2) {
+            return;
+        }
+        [$app,$subpath] = $parts;
+        if ($this->appendIfExist($this->serverroot, $resource . '.css')
+            || $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
+        ) {
+            return;
+        }
+        try {
+            $app_path = $this->appManager->getAppPath($app);
+            $app_url = $this->appManager->getAppWebPath($app);
+        } catch (AppPathNotFoundException $e) {
+            $this->logger->error('Could not find resource {resource} to load', [
+                'resource' => $app . '/' . $subpath . '.css',
+                'app' => 'cssresourceloader',
+                'exception' => $e,
+            ]);
+            return;
+        }
 
-		// Account for the possibility of having symlinks in app path. Doing
-		// this here instead of above as an empty argument to realpath gets
-		// turned into cwd.
-		$app_path = realpath($app_path);
+        // Account for the possibility of having symlinks in app path. Doing
+        // this here instead of above as an empty argument to realpath gets
+        // turned into cwd.
+        $app_path = realpath($app_path);
 
-		$this->append($app_path, $subpath . '.css', $app_url);
-	}
+        $this->append($app_path, $subpath . '.css', $app_url);
+    }
 
-	public function doFindTheme(string $resource): void {
-		$theme_dir = 'themes/' . $this->theme . '/';
-		$this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
-	}
+    public function doFindTheme(string $resource): void {
+        $theme_dir = 'themes/' . $this->theme . '/';
+        $this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
+            || $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
+            || $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
+    }
 
-	public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {
-		if (!$scss) {
-			parent::append($root, $file, $webRoot, $throw);
-		} else {
-			if ($webRoot === null || $webRoot === '') {
-				$webRoot = $this->findWebRoot($root);
+    public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {
+        if (!$scss) {
+            parent::append($root, $file, $webRoot, $throw);
+        } else {
+            if ($webRoot === null || $webRoot === '') {
+                $webRoot = $this->findWebRoot($root);
 
-				if ($webRoot === null) {
-					$webRoot = '';
-					$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
-						'app' => 'lib',
-						'root' => $root,
-						'file' => $file,
-						'webRoot' => $webRoot,
-						'throw' => $throw ? 'true' : 'false'
-					]);
+                if ($webRoot === null) {
+                    $webRoot = '';
+                    $this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
+                        'app' => 'lib',
+                        'root' => $root,
+                        'file' => $file,
+                        'webRoot' => $webRoot,
+                        'throw' => $throw ? 'true' : 'false'
+                    ]);
 
-					if ($throw && $root === '/') {
-						throw new ResourceNotFoundException($file, $webRoot);
-					}
-				}
-			}
+                    if ($throw && $root === '/') {
+                        throw new ResourceNotFoundException($file, $webRoot);
+                    }
+                }
+            }
 
-			$this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
-		}
-	}
+            $this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -29,9 +29,9 @@ 
 		if (count($parts) < 2) {
 			return;
 		}
-		[$app,$subpath] = $parts;
-		if ($this->appendIfExist($this->serverroot, $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
+		[$app, $subpath] = $parts;
+		if ($this->appendIfExist($this->serverroot, $resource.'.css')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$resource.'.css')
 		) {
 			return;
 		}
@@ -40,7 +40,7 @@ 
 			$app_url = $this->appManager->getAppWebPath($app);
 		} catch (AppPathNotFoundException $e) {
 			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $subpath . '.css',
+				'resource' => $app.'/'.$subpath.'.css',
 				'app' => 'cssresourceloader',
 				'exception' => $e,
 			]);
@@ -52,14 +52,14 @@ 
 		// turned into cwd.
 		$app_path = realpath($app_path);
 
-		$this->append($app_path, $subpath . '.css', $app_url);
+		$this->append($app_path, $subpath.'.css', $app_url);
 	}
 
 	public function doFindTheme(string $resource): void {
-		$theme_dir = 'themes/' . $this->theme . '/';
-		$this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css');
+		$theme_dir = 'themes/'.$this->theme.'/';
+		$this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$resource.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$resource.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$resource.'.css');
 	}
 
 	public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void {