fixup! fixup! fixup! chore: use Event instead of early boot method for Navigation registration

Author: susnux

lib/private/NavigationManager.php

@@ -167,10 +167,15 @@ private function proceedNavigation(array $list, string $type): array {
 	/**
 	 * removes all the entries
 	 */
-	public function clear(bool $loadDefaultLinks = true): void {
+	public function clear(bool $resetInit = true): void {
 		$this->entries = [];
 		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
+
+		if ($resetInit) {
+			$this->loadedAppInfo = [];
+			$this->additionalEntriesLoaded = false;
+			$this->init = false;
+		}
 	}
 
 	#[Override]

tests/lib/NavigationManagerTest.php

@@ -148,6 +148,12 @@ public function testAddClosure(array $entry, array $expectedEntry): void {
 		global $testAddClosureNumberOfCalls;
 		$testAddClosureNumberOfCalls = 0;
 
+		$this->appManager->expects($this->atLeastOnce())
+			->method('isAppLoaded')
+			->willReturnMap([
+				['files', true],
+			]);
+
 		$this->navigationManager->add(function () use ($entry) {
 			global $testAddClosureNumberOfCalls;
 			$testAddClosureNumberOfCalls++;
@@ -235,8 +241,10 @@ public function testWithAppManager($expected, $navigation, $isAdmin = false): vo
 			->willReturn($navigation);
 		$this->appManager->expects($this->any())
 			->method('isAppLoaded')
-			->with('test')
-			->willReturn(true);
+			->willReturnMap([
+				['test', true],
+				['files', true],
+			]);
 		$this->urlGenerator->expects($this->any())
 			->method('imagePath')
 			->willReturnCallback(function ($appName, $file) {
@@ -431,9 +439,20 @@ function (string $userId, string $appName, string $key, mixed $default = '') use
 			->method('isEnabledForUser')
 			->with('theming')
 			->willReturn(true);
-		$this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
-		$this->appManager->expects($this->any())->method('isAppLoaded')->with('test')->willReturn(true);
-		$this->appManager->expects($this->once())->method('getAppIcon')->with('test')->willReturn('/apps/test/img/app.svg');
+		$this->appManager->expects($this->once())
+			->method('getAppIcon')
+			->with('test')
+			->willReturn('/apps/test/img/app.svg');
+		$this->appManager->expects($this->once())
+			->method('getAppInfo')
+			->with('test')
+			->willReturn($navigation);
+		$this->appManager->expects($this->atLeastOnce())
+			->method('isAppLoaded')
+			->willReturnMap([
+				['test', true],
+				['files', true],
+			]);
 		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
 		$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {
 			return "/apps/$appName/img/$file";
@@ -635,7 +654,13 @@ public function testGetDefaultEntryIdForUser(string $defaultApps, string $userDe
 			];
 		});
 
-		$this->appManager->method('getEnabledApps')->willReturn([]);
+		$this->appManager->method('getEnabledApps')->willReturn(['files']);
+		$this->appManager->expects($this->atLeastOnce())
+			->method('isAppLoaded')
+			->willReturnMap([
+				['test', true],
+				['files', true],
+			]);
 
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('user1');