nextcloud / server

tests/lib/NavigationManagerTest.php

Indentation +808 added lines, -808 removed lines

@@ -24,812 +24,812 @@
 use Psr\Log\LoggerInterface;
 
 class NavigationManagerTest extends TestCase {
-	/** @var AppManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appManager;
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	protected $urlGenerator;
-	/** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $l10nFac;
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	protected $userSession;
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $groupManager;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-
-	protected IEVentDispatcher|MockObject $dispatcher;
-
-	/** @var \OC\NavigationManager */
-	protected $navigationManager;
-	protected LoggerInterface $logger;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appManager = $this->createMock(AppManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->l10nFac = $this->createMock(IFactory::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->groupManager = $this->createMock(Manager::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->navigationManager = new NavigationManager(
-			$this->appManager,
-			$this->urlGenerator,
-			$this->l10nFac,
-			$this->userSession,
-			$this->groupManager,
-			$this->config,
-			$this->logger,
-			$this->dispatcher,
-		);
-
-		$this->navigationManager->clear(false);
-	}
-
-	public function addArrayData() {
-		return [
-			[
-				'entry id' => [
-					'id' => 'entry id',
-					'name' => 'link text',
-					'order' => 1,
-					'icon' => 'optional',
-					'href' => 'url',
-					'type' => 'settings',
-					'classes' => '',
-					'unread' => 0
-				],
-				'entry id2' => [
-					'id' => 'entry id',
-					'name' => 'link text',
-					'order' => 1,
-					'icon' => 'optional',
-					'href' => 'url',
-					'active' => false,
-					'type' => 'settings',
-					'classes' => '',
-					'unread' => 0
-				]
-			],
-			[
-				'entry id' => [
-					'id' => 'entry id',
-					'name' => 'link text',
-					'order' => 1,
-					//'icon'	=> 'optional',
-					'href' => 'url',
-					'active' => true,
-					'unread' => 0,
-				],
-				'entry id2' => [
-					'id' => 'entry id',
-					'name' => 'link text',
-					'order' => 1,
-					'icon' => '',
-					'href' => 'url',
-					'active' => false,
-					'type' => 'link',
-					'classes' => '',
-					'unread' => 0,
-					'default' => true,
-				]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider addArrayData
-	 *
-	 * @param array $entry
-	 * @param array $expectedEntry
-	 */
-	public function testAddArray(array $entry, array $expectedEntry): void {
-		$this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists');
-		$this->navigationManager->add($entry);
-
-		$navigationEntries = $this->navigationManager->getAll('all');
-		$this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
-		$this->assertEquals($expectedEntry, $navigationEntries['entry id']);
-
-		$this->navigationManager->clear(false);
-		$this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists after clear()');
-	}
-
-	/**
-	 * @dataProvider addArrayData
-	 *
-	 * @param array $entry
-	 * @param array $expectedEntry
-	 */
-	public function testAddClosure(array $entry, array $expectedEntry): void {
-		global $testAddClosureNumberOfCalls;
-		$testAddClosureNumberOfCalls = 0;
-
-		$this->navigationManager->add(function () use ($entry) {
-			global $testAddClosureNumberOfCalls;
-			$testAddClosureNumberOfCalls++;
-
-			return $entry;
-		});
-
-		$this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by add()');
-
-		$navigationEntries = $this->navigationManager->getAll('all');
-		$this->assertEquals(1, $testAddClosureNumberOfCalls, 'Expected that the closure is called by getAll()');
-		$this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
-		$this->assertEquals($expectedEntry, $navigationEntries['entry id']);
-
-		$navigationEntries = $this->navigationManager->getAll('all');
-		$this->assertEquals(1, $testAddClosureNumberOfCalls, 'Expected that the closure is only called once for getAll()');
-		$this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
-		$this->assertEquals($expectedEntry, $navigationEntries['entry id']);
-
-		$this->navigationManager->clear(false);
-		$this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists after clear()');
-	}
-
-	public function testAddArrayClearGetAll(): void {
-		$entry = [
-			'id' => 'entry id',
-			'name' => 'link text',
-			'order' => 1,
-			'icon' => 'optional',
-			'href' => 'url'
-		];
-
-		$this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists');
-		$this->navigationManager->add($entry);
-		$this->navigationManager->clear(false);
-		$this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists after clear()');
-	}
-
-	public function testAddClosureClearGetAll(): void {
-		$this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists');
-
-		$entry = [
-			'id' => 'entry id',
-			'name' => 'link text',
-			'order' => 1,
-			'icon' => 'optional',
-			'href' => 'url'
-		];
-
-		global $testAddClosureNumberOfCalls;
-		$testAddClosureNumberOfCalls = 0;
-
-		$this->navigationManager->add(function () use ($entry) {
-			global $testAddClosureNumberOfCalls;
-			$testAddClosureNumberOfCalls++;
-
-			return $entry;
-		});
-
-		$this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by add()');
-		$this->navigationManager->clear(false);
-		$this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by clear()');
-		$this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists after clear()');
-		$this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by getAll()');
-	}
-
-	/**
-	 * @dataProvider providesNavigationConfig
-	 */
-	public function testWithAppManager($expected, $navigation, $isAdmin = false): void {
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
-			return vsprintf($text, $parameters);
-		});
-
-		/* Return default value */
-		$this->config->method('getUserValue')
-			->willReturnArgument(3);
-
-		$this->appManager->expects($this->any())
-			->method('isEnabledForUser')
-			->with('theming')
-			->willReturn(true);
-		$this->appManager->expects($this->once())
-			->method('getAppInfo')
-			->with('test')
-			->willReturn($navigation);
-		$this->urlGenerator->expects($this->any())
-			->method('imagePath')
-			->willReturnCallback(function ($appName, $file) {
-				return "/apps/$appName/img/$file";
-			});
-		$this->appManager->expects($this->any())
-			->method('getAppIcon')
-			->willReturnCallback(fn (string $appName) => "/apps/$appName/img/app.svg");
-		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
-		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
-			if ($route === 'core.login.logout') {
-				return 'https://example.com/logout';
-			}
-			return '/apps/test/';
-		});
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())->method('getUID')->willReturn('user001');
-		$this->userSession->expects($this->any())->method('getUser')->willReturn($user);
-		$this->userSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
-		$this->appManager->expects($this->any())
-			->method('getEnabledAppsForUser')
-			->with($user)
-			->willReturn(['test']);
-		$this->groupManager->expects($this->any())->method('isAdmin')->willReturn($isAdmin);
-		$subadmin = $this->createMock(SubAdmin::class);
-		$subadmin->expects($this->any())->method('isSubAdmin')->with($user)->willReturn(false);
-		$this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
-
-		$this->navigationManager->clear();
-		$this->dispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->willReturnCallback(function ($event) {
-				$this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
-			});
-		$entries = $this->navigationManager->getAll('all');
-		$this->assertEquals($expected, $entries);
-	}
-
-	public function providesNavigationConfig() {
-		$apps = [
-			'core_apps' => [
-				'id' => 'core_apps',
-				'order' => 5,
-				'href' => '/apps/test/',
-				'icon' => '/apps/settings/img/apps.svg',
-				'name' => 'Apps',
-				'active' => false,
-				'type' => 'settings',
-				'classes' => '',
-				'unread' => 0
-			]
-		];
-		$defaults = [
-			'profile' => [
-				'type' => 'settings',
-				'id' => 'profile',
-				'order' => 1,
-				'href' => '/apps/test/',
-				'name' => 'View profile',
-				'icon' => '',
-				'active' => false,
-				'classes' => '',
-				'unread' => 0,
-			],
-			'accessibility_settings' => [
-				'type' => 'settings',
-				'id' => 'accessibility_settings',
-				'order' => 2,
-				'href' => '/apps/test/',
-				'name' => 'Appearance and accessibility',
-				'icon' => '/apps/theming/img/accessibility-dark.svg',
-				'active' => false,
-				'classes' => '',
-				'unread' => 0,
-			],
-			'settings' => [
-				'id' => 'settings',
-				'order' => 3,
-				'href' => '/apps/test/',
-				'icon' => '/apps/settings/img/admin.svg',
-				'name' => 'Settings',
-				'active' => false,
-				'type' => 'settings',
-				'classes' => '',
-				'unread' => 0
-			],
-			'logout' => [
-				'id' => 'logout',
-				'order' => 99999,
-				'href' => 'https://example.com/logout?requesttoken=' . urlencode(\OCP\Util::callRegister()),
-				'icon' => '/apps/core/img/actions/logout.svg',
-				'name' => 'Log out',
-				'active' => false,
-				'type' => 'settings',
-				'classes' => '',
-				'unread' => 0
-			]
-		];
-		$adminSettings = [
-			'accessibility_settings' => $defaults['accessibility_settings'],
-			'settings' => [
-				'id' => 'settings',
-				'order' => 3,
-				'href' => '/apps/test/',
-				'icon' => '/apps/settings/img/personal.svg',
-				'name' => 'Personal settings',
-				'active' => false,
-				'type' => 'settings',
-				'classes' => '',
-				'unread' => 0
-			],
-			'admin_settings' => [
-				'id' => 'admin_settings',
-				'order' => 4,
-				'href' => '/apps/test/',
-				'icon' => '/apps/settings/img/admin.svg',
-				'name' => 'Administration settings',
-				'active' => false,
-				'type' => 'settings',
-				'classes' => '',
-				'unread' => 0
-			]
-		];
-
-		return [
-			'minimalistic' => [
-				array_merge(
-					['profile' => $defaults['profile']],
-					['accessibility_settings' => $defaults['accessibility_settings']],
-					['settings' => $defaults['settings']],
-					['test' => [
-						'id' => 'test',
-						'order' => 100,
-						'href' => '/apps/test/',
-						'icon' => '/apps/test/img/app.svg',
-						'name' => 'Test',
-						'active' => false,
-						'type' => 'link',
-						'classes' => '',
-						'unread' => 0,
-						'default' => true,
-						'app' => 'test',
-					]],
-					['logout' => $defaults['logout']]
-				),
-				['navigations' => [
-					'navigation' => [
-						['route' => 'test.page.index', 'name' => 'Test']
-					]
-				]]
-			],
-			'minimalistic-settings' => [
-				array_merge(
-					['profile' => $defaults['profile']],
-					['accessibility_settings' => $defaults['accessibility_settings']],
-					['settings' => $defaults['settings']],
-					['test' => [
-						'id' => 'test',
-						'order' => 100,
-						'href' => '/apps/test/',
-						'icon' => '/apps/test/img/app.svg',
-						'name' => 'Test',
-						'active' => false,
-						'type' => 'settings',
-						'classes' => '',
-						'unread' => 0,
-					]],
-					['logout' => $defaults['logout']]
-				),
-				['navigations' => [
-					'navigation' => [
-						['route' => 'test.page.index', 'name' => 'Test', 'type' => 'settings']
-					],
-				]]
-			],
-			'with-multiple' => [
-				array_merge(
-					['profile' => $defaults['profile']],
-					['accessibility_settings' => $defaults['accessibility_settings']],
-					['settings' => $defaults['settings']],
-					['test' => [
-						'id' => 'test',
-						'order' => 100,
-						'href' => '/apps/test/',
-						'icon' => '/apps/test/img/app.svg',
-						'name' => 'Test',
-						'active' => false,
-						'type' => 'link',
-						'classes' => '',
-						'unread' => 0,
-						'default' => false,
-						'app' => 'test',
-					],
-						'test1' => [
-							'id' => 'test1',
-							'order' => 50,
-							'href' => '/apps/test/',
-							'icon' => '/apps/test/img/app.svg',
-							'name' => 'Other test',
-							'active' => false,
-							'type' => 'link',
-							'classes' => '',
-							'unread' => 0,
-							'default' => true, // because of order
-							'app' => 'test',
-						]],
-					['logout' => $defaults['logout']]
-				),
-				['navigations' => [
-					'navigation' => [
-						['route' => 'test.page.index', 'name' => 'Test'],
-						['route' => 'test.page.index', 'name' => 'Other test', 'order' => 50],
-					]
-				]]
-			],
-			'admin' => [
-				array_merge(
-					['profile' => $defaults['profile']],
-					$adminSettings,
-					$apps,
-					['test' => [
-						'id' => 'test',
-						'order' => 100,
-						'href' => '/apps/test/',
-						'icon' => '/apps/test/img/app.svg',
-						'name' => 'Test',
-						'active' => false,
-						'type' => 'link',
-						'classes' => '',
-						'unread' => 0,
-						'default' => true,
-						'app' => 'test',
-					]],
-					['logout' => $defaults['logout']]
-				),
-				['navigations' => [
-					'navigation' => [
-						['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']
-					],
-				]],
-				true
-			],
-			'no name' => [
-				array_merge(
-					['profile' => $defaults['profile']],
-					$adminSettings,
-					$apps,
-					['logout' => $defaults['logout']]
-				),
-				['navigations' => [
-					'navigation' => [
-						['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index']
-					],
-				]],
-				true
-			],
-			'no admin' => [
-				$defaults,
-				['navigations' => [
-					'navigation' => [
-						['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']
-					],
-				]],
-			]
-		];
-	}
-
-	public function testWithAppManagerAndApporder(): void {
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
-			return vsprintf($text, $parameters);
-		});
-
-		$testOrder = 12;
-		$expected = [
-			'test' => [
-				'type' => 'link',
-				'id' => 'test',
-				'order' => $testOrder,
-				'href' => '/apps/test/',
-				'name' => 'Test',
-				'icon' => '/apps/test/img/app.svg',
-				'active' => false,
-				'classes' => '',
-				'unread' => 0,
-				'default' => true,
-				'app' => 'test',
-			],
-		];
-		$navigation = ['navigations' => [
-			'navigation' => [
-				['route' => 'test.page.index', 'name' => 'Test']
-			],
-		]];
-
-		$this->config->method('getUserValue')
-			->willReturnCallback(
-				function (string $userId, string $appName, string $key, mixed $default = '') use ($testOrder) {
-					$this->assertEquals('user001', $userId);
-					if ($key === 'apporder') {
-						return json_encode(['test' => ['app' => 'test', 'order' => $testOrder]]);
-					}
-					return $default;
-				}
-			);
-
-		$this->appManager->expects($this->any())
-			->method('isEnabledForUser')
-			->with('theming')
-			->willReturn(true);
-		$this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
-		$this->appManager->expects($this->once())->method('getAppIcon')->with('test')->willReturn('/apps/test/img/app.svg');
-		$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";
-		});
-		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
-			if ($route === 'core.login.logout') {
-				return 'https://example.com/logout';
-			}
-			return '/apps/test/';
-		});
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())->method('getUID')->willReturn('user001');
-		$this->userSession->expects($this->any())->method('getUser')->willReturn($user);
-		$this->userSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
-		$this->appManager->expects($this->any())
-			->method('getEnabledAppsForUser')
-			->with($user)
-			->willReturn(['test']);
-		$this->groupManager->expects($this->any())->method('isAdmin')->willReturn(false);
-		$subadmin = $this->createMock(SubAdmin::class);
-		$subadmin->expects($this->any())->method('isSubAdmin')->with($user)->willReturn(false);
-		$this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
-
-		$this->navigationManager->clear();
-		$this->dispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->willReturnCallback(function ($event) {
-				$this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
-			});
-		$entries = $this->navigationManager->getAll();
-		$this->assertEquals($expected, $entries);
-	}
-
-	public static function provideDefaultEntries(): array {
-		return [
-			// none specified, default to files
-			[
-				'',
-				'',
-				'{}',
-				true,
-				'files',
-			],
-			// none specified, without fallback
-			[
-				'',
-				'',
-				'{}',
-				false,
-				'',
-			],
-			// unexisting or inaccessible app specified, default to files
-			[
-				'unexist',
-				'',
-				'{}',
-				true,
-				'files',
-			],
-			// unexisting or inaccessible app specified, without fallbacks
-			[
-				'unexist',
-				'',
-				'{}',
-				false,
-				'',
-			],
-			// non-standard app
-			[
-				'settings',
-				'',
-				'{}',
-				true,
-				'settings',
-			],
-			// non-standard app, without fallback
-			[
-				'settings',
-				'',
-				'{}',
-				false,
-				'settings',
-			],
-			// non-standard app with fallback
-			[
-				'unexist,settings',
-				'',
-				'{}',
-				true,
-				'settings',
-			],
-			// system default app and user apporder
-			[
-				// system default is settings
-				'unexist,settings',
-				'',
-				// apporder says default app is files (order is lower)
-				'{"files_id":{"app":"files","order":1},"settings_id":{"app":"settings","order":2}}',
-				true,
-				// system default should override apporder
-				'settings'
-			],
-			// user-customized defaultapp
-			[
-				'',
-				'files',
-				'',
-				true,
-				'files',
-			],
-			// user-customized defaultapp with systemwide
-			[
-				'unexist,settings',
-				'files',
-				'',
-				true,
-				'files',
-			],
-			// user-customized defaultapp with system wide and apporder
-			[
-				'unexist,settings',
-				'files',
-				'{"settings_id":{"app":"settings","order":1},"files_id":{"app":"files","order":2}}',
-				true,
-				'files',
-			],
-			// user-customized apporder fallback
-			[
-				'',
-				'',
-				'{"settings_id":{"app":"settings","order":1},"files":{"app":"files","order":2}}',
-				true,
-				'settings',
-			],
-			// user-customized apporder fallback with missing app key (entries added by closures does not always have an app key set (Nextcloud 27 spreed app for example))
-			[
-				'',
-				'',
-				'{"spreed":{"order":1},"files":{"app":"files","order":2}}',
-				true,
-				'files',
-			],
-			// user-customized apporder, but called without fallback
-			[
-				'',
-				'',
-				'{"settings":{"app":"settings","order":1},"files":{"app":"files","order":2}}',
-				false,
-				'',
-			],
-			// user-customized apporder with an app that has multiple routes
-			[
-				'',
-				'',
-				'{"settings_id":{"app":"settings","order":1},"settings_id_2":{"app":"settings","order":3},"id_files":{"app":"files","order":2}}',
-				true,
-				'settings',
-			],
-			// closure navigation entries are also resolved
-			[
-				'closure2',
-				'',
-				'',
-				true,
-				'closure2',
-			],
-			[
-				'',
-				'closure2',
-				'',
-				true,
-				'closure2',
-			],
-			[
-				'',
-				'',
-				'{"closure2":{"order":1,"app":"closure2","href":"/closure2"}}',
-				true,
-				'closure2',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider provideDefaultEntries
-	 */
-	public function testGetDefaultEntryIdForUser(string $defaultApps, string $userDefaultApps, string $userApporder, bool $withFallbacks, string $expectedApp): void {
-		$this->navigationManager->add([
-			'id' => 'files',
-		]);
-		$this->navigationManager->add([
-			'id' => 'settings',
-		]);
-		$this->navigationManager->add(static function (): array {
-			return [
-				'id' => 'closure1',
-				'href' => '/closure1',
-			];
-		});
-		$this->navigationManager->add(static function (): array {
-			return [
-				'id' => 'closure2',
-				'href' => '/closure2',
-			];
-		});
-
-		$this->appManager->method('getEnabledApps')->willReturn([]);
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user1');
-
-		$this->userSession->expects($this->atLeastOnce())
-			->method('getUser')
-			->willReturn($user);
-
-		$this->config->expects($this->atLeastOnce())
-			->method('getSystemValueString')
-			->with('defaultapp', $this->anything())
-			->willReturn($defaultApps);
-
-		$this->config->expects($this->atLeastOnce())
-			->method('getUserValue')
-			->willReturnMap([
-				['user1', 'core', 'defaultapp', '', $userDefaultApps],
-				['user1', 'core', 'apporder', '[]', $userApporder],
-			]);
-
-		$this->assertEquals($expectedApp, $this->navigationManager->getDefaultEntryIdForUser(null, $withFallbacks));
-	}
-
-	public function testDefaultEntryUpdated(): void {
-		$this->appManager->method('getEnabledApps')->willReturn([]);
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user1');
-
-		$this->userSession
-			->method('getUser')
-			->willReturn($user);
-
-		$this->config
-			->method('getSystemValueString')
-			->with('defaultapp', $this->anything())
-			->willReturn('app4,app3,app2,app1');
-
-		$this->config
-			->method('getUserValue')
-			->willReturnMap([
-				['user1', 'core', 'defaultapp', '', ''],
-				['user1', 'core', 'apporder', '[]', ''],
-			]);
-
-		$this->navigationManager->add([
-			'id' => 'app1',
-		]);
-
-		$this->assertEquals('app1', $this->navigationManager->getDefaultEntryIdForUser(null, false));
-		$this->assertEquals(true, $this->navigationManager->get('app1')['default']);
-
-		$this->navigationManager->add([
-			'id' => 'app3',
-		]);
-
-		$this->assertEquals('app3', $this->navigationManager->getDefaultEntryIdForUser(null, false));
-		$this->assertEquals(false, $this->navigationManager->get('app1')['default']);
-		$this->assertEquals(true, $this->navigationManager->get('app3')['default']);
-
-		$this->navigationManager->add([
-			'id' => 'app2',
-		]);
-
-		$this->assertEquals('app3', $this->navigationManager->getDefaultEntryIdForUser(null, false));
-		$this->assertEquals(false, $this->navigationManager->get('app1')['default']);
-		$this->assertEquals(false, $this->navigationManager->get('app2')['default']);
-		$this->assertEquals(true, $this->navigationManager->get('app3')['default']);
-
-		$this->navigationManager->add([
-			'id' => 'app4',
-		]);
-
-		$this->assertEquals('app4', $this->navigationManager->getDefaultEntryIdForUser(null, false));
-		$this->assertEquals(false, $this->navigationManager->get('app1')['default']);
-		$this->assertEquals(false, $this->navigationManager->get('app2')['default']);
-		$this->assertEquals(false, $this->navigationManager->get('app3')['default']);
-		$this->assertEquals(true, $this->navigationManager->get('app4')['default']);
-	}
+    /** @var AppManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $appManager;
+    /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
+    protected $urlGenerator;
+    /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $l10nFac;
+    /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
+    protected $userSession;
+    /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $groupManager;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+
+    protected IEVentDispatcher|MockObject $dispatcher;
+
+    /** @var \OC\NavigationManager */
+    protected $navigationManager;
+    protected LoggerInterface $logger;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appManager = $this->createMock(AppManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->l10nFac = $this->createMock(IFactory::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->groupManager = $this->createMock(Manager::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+        $this->navigationManager = new NavigationManager(
+            $this->appManager,
+            $this->urlGenerator,
+            $this->l10nFac,
+            $this->userSession,
+            $this->groupManager,
+            $this->config,
+            $this->logger,
+            $this->dispatcher,
+        );
+
+        $this->navigationManager->clear(false);
+    }
+
+    public function addArrayData() {
+        return [
+            [
+                'entry id' => [
+                    'id' => 'entry id',
+                    'name' => 'link text',
+                    'order' => 1,
+                    'icon' => 'optional',
+                    'href' => 'url',
+                    'type' => 'settings',
+                    'classes' => '',
+                    'unread' => 0
+                ],
+                'entry id2' => [
+                    'id' => 'entry id',
+                    'name' => 'link text',
+                    'order' => 1,
+                    'icon' => 'optional',
+                    'href' => 'url',
+                    'active' => false,
+                    'type' => 'settings',
+                    'classes' => '',
+                    'unread' => 0
+                ]
+            ],
+            [
+                'entry id' => [
+                    'id' => 'entry id',
+                    'name' => 'link text',
+                    'order' => 1,
+                    //'icon'	=> 'optional',
+                    'href' => 'url',
+                    'active' => true,
+                    'unread' => 0,
+                ],
+                'entry id2' => [
+                    'id' => 'entry id',
+                    'name' => 'link text',
+                    'order' => 1,
+                    'icon' => '',
+                    'href' => 'url',
+                    'active' => false,
+                    'type' => 'link',
+                    'classes' => '',
+                    'unread' => 0,
+                    'default' => true,
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider addArrayData
+     *
+     * @param array $entry
+     * @param array $expectedEntry
+     */
+    public function testAddArray(array $entry, array $expectedEntry): void {
+        $this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists');
+        $this->navigationManager->add($entry);
+
+        $navigationEntries = $this->navigationManager->getAll('all');
+        $this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
+        $this->assertEquals($expectedEntry, $navigationEntries['entry id']);
+
+        $this->navigationManager->clear(false);
+        $this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists after clear()');
+    }
+
+    /**
+     * @dataProvider addArrayData
+     *
+     * @param array $entry
+     * @param array $expectedEntry
+     */
+    public function testAddClosure(array $entry, array $expectedEntry): void {
+        global $testAddClosureNumberOfCalls;
+        $testAddClosureNumberOfCalls = 0;
+
+        $this->navigationManager->add(function () use ($entry) {
+            global $testAddClosureNumberOfCalls;
+            $testAddClosureNumberOfCalls++;
+
+            return $entry;
+        });
+
+        $this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by add()');
+
+        $navigationEntries = $this->navigationManager->getAll('all');
+        $this->assertEquals(1, $testAddClosureNumberOfCalls, 'Expected that the closure is called by getAll()');
+        $this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
+        $this->assertEquals($expectedEntry, $navigationEntries['entry id']);
+
+        $navigationEntries = $this->navigationManager->getAll('all');
+        $this->assertEquals(1, $testAddClosureNumberOfCalls, 'Expected that the closure is only called once for getAll()');
+        $this->assertCount(1, $navigationEntries, 'Expected that 1 navigation entry exists');
+        $this->assertEquals($expectedEntry, $navigationEntries['entry id']);
+
+        $this->navigationManager->clear(false);
+        $this->assertEmpty($this->navigationManager->getAll('all'), 'Expected no navigation entry exists after clear()');
+    }
+
+    public function testAddArrayClearGetAll(): void {
+        $entry = [
+            'id' => 'entry id',
+            'name' => 'link text',
+            'order' => 1,
+            'icon' => 'optional',
+            'href' => 'url'
+        ];
+
+        $this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists');
+        $this->navigationManager->add($entry);
+        $this->navigationManager->clear(false);
+        $this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists after clear()');
+    }
+
+    public function testAddClosureClearGetAll(): void {
+        $this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists');
+
+        $entry = [
+            'id' => 'entry id',
+            'name' => 'link text',
+            'order' => 1,
+            'icon' => 'optional',
+            'href' => 'url'
+        ];
+
+        global $testAddClosureNumberOfCalls;
+        $testAddClosureNumberOfCalls = 0;
+
+        $this->navigationManager->add(function () use ($entry) {
+            global $testAddClosureNumberOfCalls;
+            $testAddClosureNumberOfCalls++;
+
+            return $entry;
+        });
+
+        $this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by add()');
+        $this->navigationManager->clear(false);
+        $this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by clear()');
+        $this->assertEmpty($this->navigationManager->getAll(), 'Expected no navigation entry exists after clear()');
+        $this->assertEquals(0, $testAddClosureNumberOfCalls, 'Expected that the closure is not called by getAll()');
+    }
+
+    /**
+     * @dataProvider providesNavigationConfig
+     */
+    public function testWithAppManager($expected, $navigation, $isAdmin = false): void {
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
+            return vsprintf($text, $parameters);
+        });
+
+        /* Return default value */
+        $this->config->method('getUserValue')
+            ->willReturnArgument(3);
+
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForUser')
+            ->with('theming')
+            ->willReturn(true);
+        $this->appManager->expects($this->once())
+            ->method('getAppInfo')
+            ->with('test')
+            ->willReturn($navigation);
+        $this->urlGenerator->expects($this->any())
+            ->method('imagePath')
+            ->willReturnCallback(function ($appName, $file) {
+                return "/apps/$appName/img/$file";
+            });
+        $this->appManager->expects($this->any())
+            ->method('getAppIcon')
+            ->willReturnCallback(fn (string $appName) => "/apps/$appName/img/app.svg");
+        $this->l10nFac->expects($this->any())->method('get')->willReturn($l);
+        $this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
+            if ($route === 'core.login.logout') {
+                return 'https://example.com/logout';
+            }
+            return '/apps/test/';
+        });
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())->method('getUID')->willReturn('user001');
+        $this->userSession->expects($this->any())->method('getUser')->willReturn($user);
+        $this->userSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
+        $this->appManager->expects($this->any())
+            ->method('getEnabledAppsForUser')
+            ->with($user)
+            ->willReturn(['test']);
+        $this->groupManager->expects($this->any())->method('isAdmin')->willReturn($isAdmin);
+        $subadmin = $this->createMock(SubAdmin::class);
+        $subadmin->expects($this->any())->method('isSubAdmin')->with($user)->willReturn(false);
+        $this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
+
+        $this->navigationManager->clear();
+        $this->dispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->willReturnCallback(function ($event) {
+                $this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
+            });
+        $entries = $this->navigationManager->getAll('all');
+        $this->assertEquals($expected, $entries);
+    }
+
+    public function providesNavigationConfig() {
+        $apps = [
+            'core_apps' => [
+                'id' => 'core_apps',
+                'order' => 5,
+                'href' => '/apps/test/',
+                'icon' => '/apps/settings/img/apps.svg',
+                'name' => 'Apps',
+                'active' => false,
+                'type' => 'settings',
+                'classes' => '',
+                'unread' => 0
+            ]
+        ];
+        $defaults = [
+            'profile' => [
+                'type' => 'settings',
+                'id' => 'profile',
+                'order' => 1,
+                'href' => '/apps/test/',
+                'name' => 'View profile',
+                'icon' => '',
+                'active' => false,
+                'classes' => '',
+                'unread' => 0,
+            ],
+            'accessibility_settings' => [
+                'type' => 'settings',
+                'id' => 'accessibility_settings',
+                'order' => 2,
+                'href' => '/apps/test/',
+                'name' => 'Appearance and accessibility',
+                'icon' => '/apps/theming/img/accessibility-dark.svg',
+                'active' => false,
+                'classes' => '',
+                'unread' => 0,
+            ],
+            'settings' => [
+                'id' => 'settings',
+                'order' => 3,
+                'href' => '/apps/test/',
+                'icon' => '/apps/settings/img/admin.svg',
+                'name' => 'Settings',
+                'active' => false,
+                'type' => 'settings',
+                'classes' => '',
+                'unread' => 0
+            ],
+            'logout' => [
+                'id' => 'logout',
+                'order' => 99999,
+                'href' => 'https://example.com/logout?requesttoken=' . urlencode(\OCP\Util::callRegister()),
+                'icon' => '/apps/core/img/actions/logout.svg',
+                'name' => 'Log out',
+                'active' => false,
+                'type' => 'settings',
+                'classes' => '',
+                'unread' => 0
+            ]
+        ];
+        $adminSettings = [
+            'accessibility_settings' => $defaults['accessibility_settings'],
+            'settings' => [
+                'id' => 'settings',
+                'order' => 3,
+                'href' => '/apps/test/',
+                'icon' => '/apps/settings/img/personal.svg',
+                'name' => 'Personal settings',
+                'active' => false,
+                'type' => 'settings',
+                'classes' => '',
+                'unread' => 0
+            ],
+            'admin_settings' => [
+                'id' => 'admin_settings',
+                'order' => 4,
+                'href' => '/apps/test/',
+                'icon' => '/apps/settings/img/admin.svg',
+                'name' => 'Administration settings',
+                'active' => false,
+                'type' => 'settings',
+                'classes' => '',
+                'unread' => 0
+            ]
+        ];
+
+        return [
+            'minimalistic' => [
+                array_merge(
+                    ['profile' => $defaults['profile']],
+                    ['accessibility_settings' => $defaults['accessibility_settings']],
+                    ['settings' => $defaults['settings']],
+                    ['test' => [
+                        'id' => 'test',
+                        'order' => 100,
+                        'href' => '/apps/test/',
+                        'icon' => '/apps/test/img/app.svg',
+                        'name' => 'Test',
+                        'active' => false,
+                        'type' => 'link',
+                        'classes' => '',
+                        'unread' => 0,
+                        'default' => true,
+                        'app' => 'test',
+                    ]],
+                    ['logout' => $defaults['logout']]
+                ),
+                ['navigations' => [
+                    'navigation' => [
+                        ['route' => 'test.page.index', 'name' => 'Test']
+                    ]
+                ]]
+            ],
+            'minimalistic-settings' => [
+                array_merge(
+                    ['profile' => $defaults['profile']],
+                    ['accessibility_settings' => $defaults['accessibility_settings']],
+                    ['settings' => $defaults['settings']],
+                    ['test' => [
+                        'id' => 'test',
+                        'order' => 100,
+                        'href' => '/apps/test/',
+                        'icon' => '/apps/test/img/app.svg',
+                        'name' => 'Test',
+                        'active' => false,
+                        'type' => 'settings',
+                        'classes' => '',
+                        'unread' => 0,
+                    ]],
+                    ['logout' => $defaults['logout']]
+                ),
+                ['navigations' => [
+                    'navigation' => [
+                        ['route' => 'test.page.index', 'name' => 'Test', 'type' => 'settings']
+                    ],
+                ]]
+            ],
+            'with-multiple' => [
+                array_merge(
+                    ['profile' => $defaults['profile']],
+                    ['accessibility_settings' => $defaults['accessibility_settings']],
+                    ['settings' => $defaults['settings']],
+                    ['test' => [
+                        'id' => 'test',
+                        'order' => 100,
+                        'href' => '/apps/test/',
+                        'icon' => '/apps/test/img/app.svg',
+                        'name' => 'Test',
+                        'active' => false,
+                        'type' => 'link',
+                        'classes' => '',
+                        'unread' => 0,
+                        'default' => false,
+                        'app' => 'test',
+                    ],
+                        'test1' => [
+                            'id' => 'test1',
+                            'order' => 50,
+                            'href' => '/apps/test/',
+                            'icon' => '/apps/test/img/app.svg',
+                            'name' => 'Other test',
+                            'active' => false,
+                            'type' => 'link',
+                            'classes' => '',
+                            'unread' => 0,
+                            'default' => true, // because of order
+                            'app' => 'test',
+                        ]],
+                    ['logout' => $defaults['logout']]
+                ),
+                ['navigations' => [
+                    'navigation' => [
+                        ['route' => 'test.page.index', 'name' => 'Test'],
+                        ['route' => 'test.page.index', 'name' => 'Other test', 'order' => 50],
+                    ]
+                ]]
+            ],
+            'admin' => [
+                array_merge(
+                    ['profile' => $defaults['profile']],
+                    $adminSettings,
+                    $apps,
+                    ['test' => [
+                        'id' => 'test',
+                        'order' => 100,
+                        'href' => '/apps/test/',
+                        'icon' => '/apps/test/img/app.svg',
+                        'name' => 'Test',
+                        'active' => false,
+                        'type' => 'link',
+                        'classes' => '',
+                        'unread' => 0,
+                        'default' => true,
+                        'app' => 'test',
+                    ]],
+                    ['logout' => $defaults['logout']]
+                ),
+                ['navigations' => [
+                    'navigation' => [
+                        ['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']
+                    ],
+                ]],
+                true
+            ],
+            'no name' => [
+                array_merge(
+                    ['profile' => $defaults['profile']],
+                    $adminSettings,
+                    $apps,
+                    ['logout' => $defaults['logout']]
+                ),
+                ['navigations' => [
+                    'navigation' => [
+                        ['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index']
+                    ],
+                ]],
+                true
+            ],
+            'no admin' => [
+                $defaults,
+                ['navigations' => [
+                    'navigation' => [
+                        ['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']
+                    ],
+                ]],
+            ]
+        ];
+    }
+
+    public function testWithAppManagerAndApporder(): void {
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
+            return vsprintf($text, $parameters);
+        });
+
+        $testOrder = 12;
+        $expected = [
+            'test' => [
+                'type' => 'link',
+                'id' => 'test',
+                'order' => $testOrder,
+                'href' => '/apps/test/',
+                'name' => 'Test',
+                'icon' => '/apps/test/img/app.svg',
+                'active' => false,
+                'classes' => '',
+                'unread' => 0,
+                'default' => true,
+                'app' => 'test',
+            ],
+        ];
+        $navigation = ['navigations' => [
+            'navigation' => [
+                ['route' => 'test.page.index', 'name' => 'Test']
+            ],
+        ]];
+
+        $this->config->method('getUserValue')
+            ->willReturnCallback(
+                function (string $userId, string $appName, string $key, mixed $default = '') use ($testOrder) {
+                    $this->assertEquals('user001', $userId);
+                    if ($key === 'apporder') {
+                        return json_encode(['test' => ['app' => 'test', 'order' => $testOrder]]);
+                    }
+                    return $default;
+                }
+            );
+
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForUser')
+            ->with('theming')
+            ->willReturn(true);
+        $this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
+        $this->appManager->expects($this->once())->method('getAppIcon')->with('test')->willReturn('/apps/test/img/app.svg');
+        $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";
+        });
+        $this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
+            if ($route === 'core.login.logout') {
+                return 'https://example.com/logout';
+            }
+            return '/apps/test/';
+        });
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())->method('getUID')->willReturn('user001');
+        $this->userSession->expects($this->any())->method('getUser')->willReturn($user);
+        $this->userSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
+        $this->appManager->expects($this->any())
+            ->method('getEnabledAppsForUser')
+            ->with($user)
+            ->willReturn(['test']);
+        $this->groupManager->expects($this->any())->method('isAdmin')->willReturn(false);
+        $subadmin = $this->createMock(SubAdmin::class);
+        $subadmin->expects($this->any())->method('isSubAdmin')->with($user)->willReturn(false);
+        $this->groupManager->expects($this->any())->method('getSubAdmin')->willReturn($subadmin);
+
+        $this->navigationManager->clear();
+        $this->dispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->willReturnCallback(function ($event) {
+                $this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
+            });
+        $entries = $this->navigationManager->getAll();
+        $this->assertEquals($expected, $entries);
+    }
+
+    public static function provideDefaultEntries(): array {
+        return [
+            // none specified, default to files
+            [
+                '',
+                '',
+                '{}',
+                true,
+                'files',
+            ],
+            // none specified, without fallback
+            [
+                '',
+                '',
+                '{}',
+                false,
+                '',
+            ],
+            // unexisting or inaccessible app specified, default to files
+            [
+                'unexist',
+                '',
+                '{}',
+                true,
+                'files',
+            ],
+            // unexisting or inaccessible app specified, without fallbacks
+            [
+                'unexist',
+                '',
+                '{}',
+                false,
+                '',
+            ],
+            // non-standard app
+            [
+                'settings',
+                '',
+                '{}',
+                true,
+                'settings',
+            ],
+            // non-standard app, without fallback
+            [
+                'settings',
+                '',
+                '{}',
+                false,
+                'settings',
+            ],
+            // non-standard app with fallback
+            [
+                'unexist,settings',
+                '',
+                '{}',
+                true,
+                'settings',
+            ],
+            // system default app and user apporder
+            [
+                // system default is settings
+                'unexist,settings',
+                '',
+                // apporder says default app is files (order is lower)
+                '{"files_id":{"app":"files","order":1},"settings_id":{"app":"settings","order":2}}',
+                true,
+                // system default should override apporder
+                'settings'
+            ],
+            // user-customized defaultapp
+            [
+                '',
+                'files',
+                '',
+                true,
+                'files',
+            ],
+            // user-customized defaultapp with systemwide
+            [
+                'unexist,settings',
+                'files',
+                '',
+                true,
+                'files',
+            ],
+            // user-customized defaultapp with system wide and apporder
+            [
+                'unexist,settings',
+                'files',
+                '{"settings_id":{"app":"settings","order":1},"files_id":{"app":"files","order":2}}',
+                true,
+                'files',
+            ],
+            // user-customized apporder fallback
+            [
+                '',
+                '',
+                '{"settings_id":{"app":"settings","order":1},"files":{"app":"files","order":2}}',
+                true,
+                'settings',
+            ],
+            // user-customized apporder fallback with missing app key (entries added by closures does not always have an app key set (Nextcloud 27 spreed app for example))
+            [
+                '',
+                '',
+                '{"spreed":{"order":1},"files":{"app":"files","order":2}}',
+                true,
+                'files',
+            ],
+            // user-customized apporder, but called without fallback
+            [
+                '',
+                '',
+                '{"settings":{"app":"settings","order":1},"files":{"app":"files","order":2}}',
+                false,
+                '',
+            ],
+            // user-customized apporder with an app that has multiple routes
+            [
+                '',
+                '',
+                '{"settings_id":{"app":"settings","order":1},"settings_id_2":{"app":"settings","order":3},"id_files":{"app":"files","order":2}}',
+                true,
+                'settings',
+            ],
+            // closure navigation entries are also resolved
+            [
+                'closure2',
+                '',
+                '',
+                true,
+                'closure2',
+            ],
+            [
+                '',
+                'closure2',
+                '',
+                true,
+                'closure2',
+            ],
+            [
+                '',
+                '',
+                '{"closure2":{"order":1,"app":"closure2","href":"/closure2"}}',
+                true,
+                'closure2',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideDefaultEntries
+     */
+    public function testGetDefaultEntryIdForUser(string $defaultApps, string $userDefaultApps, string $userApporder, bool $withFallbacks, string $expectedApp): void {
+        $this->navigationManager->add([
+            'id' => 'files',
+        ]);
+        $this->navigationManager->add([
+            'id' => 'settings',
+        ]);
+        $this->navigationManager->add(static function (): array {
+            return [
+                'id' => 'closure1',
+                'href' => '/closure1',
+            ];
+        });
+        $this->navigationManager->add(static function (): array {
+            return [
+                'id' => 'closure2',
+                'href' => '/closure2',
+            ];
+        });
+
+        $this->appManager->method('getEnabledApps')->willReturn([]);
+
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user1');
+
+        $this->userSession->expects($this->atLeastOnce())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->config->expects($this->atLeastOnce())
+            ->method('getSystemValueString')
+            ->with('defaultapp', $this->anything())
+            ->willReturn($defaultApps);
+
+        $this->config->expects($this->atLeastOnce())
+            ->method('getUserValue')
+            ->willReturnMap([
+                ['user1', 'core', 'defaultapp', '', $userDefaultApps],
+                ['user1', 'core', 'apporder', '[]', $userApporder],
+            ]);
+
+        $this->assertEquals($expectedApp, $this->navigationManager->getDefaultEntryIdForUser(null, $withFallbacks));
+    }
+
+    public function testDefaultEntryUpdated(): void {
+        $this->appManager->method('getEnabledApps')->willReturn([]);
+
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user1');
+
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->config
+            ->method('getSystemValueString')
+            ->with('defaultapp', $this->anything())
+            ->willReturn('app4,app3,app2,app1');
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturnMap([
+                ['user1', 'core', 'defaultapp', '', ''],
+                ['user1', 'core', 'apporder', '[]', ''],
+            ]);
+
+        $this->navigationManager->add([
+            'id' => 'app1',
+        ]);
+
+        $this->assertEquals('app1', $this->navigationManager->getDefaultEntryIdForUser(null, false));
+        $this->assertEquals(true, $this->navigationManager->get('app1')['default']);
+
+        $this->navigationManager->add([
+            'id' => 'app3',
+        ]);
+
+        $this->assertEquals('app3', $this->navigationManager->getDefaultEntryIdForUser(null, false));
+        $this->assertEquals(false, $this->navigationManager->get('app1')['default']);
+        $this->assertEquals(true, $this->navigationManager->get('app3')['default']);
+
+        $this->navigationManager->add([
+            'id' => 'app2',
+        ]);
+
+        $this->assertEquals('app3', $this->navigationManager->getDefaultEntryIdForUser(null, false));
+        $this->assertEquals(false, $this->navigationManager->get('app1')['default']);
+        $this->assertEquals(false, $this->navigationManager->get('app2')['default']);
+        $this->assertEquals(true, $this->navigationManager->get('app3')['default']);
+
+        $this->navigationManager->add([
+            'id' => 'app4',
+        ]);
+
+        $this->assertEquals('app4', $this->navigationManager->getDefaultEntryIdForUser(null, false));
+        $this->assertEquals(false, $this->navigationManager->get('app1')['default']);
+        $this->assertEquals(false, $this->navigationManager->get('app2')['default']);
+        $this->assertEquals(false, $this->navigationManager->get('app3')['default']);
+        $this->assertEquals(true, $this->navigationManager->get('app4')['default']);
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -37,7 +37,7 @@ 
 	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
 	protected $config;
 
-	protected IEVentDispatcher|MockObject $dispatcher;
+	protected IEVentDispatcher | MockObject $dispatcher;
 
 	/** @var \OC\NavigationManager */
 	protected $navigationManager;
@@ -147,7 +147,7 @@ 
 		global $testAddClosureNumberOfCalls;
 		$testAddClosureNumberOfCalls = 0;
 
-		$this->navigationManager->add(function () use ($entry) {
+		$this->navigationManager->add(function() use ($entry) {
 			global $testAddClosureNumberOfCalls;
 			$testAddClosureNumberOfCalls++;
 
@@ -199,7 +199,7 @@ 
 		global $testAddClosureNumberOfCalls;
 		$testAddClosureNumberOfCalls = 0;
 
-		$this->navigationManager->add(function () use ($entry) {
+		$this->navigationManager->add(function() use ($entry) {
 			global $testAddClosureNumberOfCalls;
 			$testAddClosureNumberOfCalls++;
 
@@ -218,7 +218,7 @@ 
 	 */
 	public function testWithAppManager($expected, $navigation, $isAdmin = false): void {
 		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
+		$l->expects($this->any())->method('t')->willReturnCallback(function($text, $parameters = []) {
 			return vsprintf($text, $parameters);
 		});
 
@@ -236,14 +236,14 @@ 
 			->willReturn($navigation);
 		$this->urlGenerator->expects($this->any())
 			->method('imagePath')
-			->willReturnCallback(function ($appName, $file) {
+			->willReturnCallback(function($appName, $file) {
 				return "/apps/$appName/img/$file";
 			});
 		$this->appManager->expects($this->any())
 			->method('getAppIcon')
 			->willReturnCallback(fn (string $appName) => "/apps/$appName/img/app.svg");
 		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
-		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
+		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function($route) {
 			if ($route === 'core.login.logout') {
 				return 'https://example.com/logout';
 			}
@@ -265,7 +265,7 @@ 
 		$this->navigationManager->clear();
 		$this->dispatcher->expects($this->once())
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) {
+			->willReturnCallback(function($event) {
 				$this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
 			});
 		$entries = $this->navigationManager->getAll('all');
@@ -323,7 +323,7 @@ 
 			'logout' => [
 				'id' => 'logout',
 				'order' => 99999,
-				'href' => 'https://example.com/logout?requesttoken=' . urlencode(\OCP\Util::callRegister()),
+				'href' => 'https://example.com/logout?requesttoken='.urlencode(\OCP\Util::callRegister()),
 				'icon' => '/apps/core/img/actions/logout.svg',
 				'name' => 'Log out',
 				'active' => false,
@@ -503,7 +503,7 @@ 
 
 	public function testWithAppManagerAndApporder(): void {
 		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())->method('t')->willReturnCallback(function ($text, $parameters = []) {
+		$l->expects($this->any())->method('t')->willReturnCallback(function($text, $parameters = []) {
 			return vsprintf($text, $parameters);
 		});
 
@@ -531,7 +531,7 @@ 
 
 		$this->config->method('getUserValue')
 			->willReturnCallback(
-				function (string $userId, string $appName, string $key, mixed $default = '') use ($testOrder) {
+				function(string $userId, string $appName, string $key, mixed $default = '') use ($testOrder) {
 					$this->assertEquals('user001', $userId);
 					if ($key === 'apporder') {
 						return json_encode(['test' => ['app' => 'test', 'order' => $testOrder]]);
@@ -547,10 +547,10 @@ 
 		$this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
 		$this->appManager->expects($this->once())->method('getAppIcon')->with('test')->willReturn('/apps/test/img/app.svg');
 		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
-		$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {
+		$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function($appName, $file) {
 			return "/apps/$appName/img/$file";
 		});
-		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
+		$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function($route) {
 			if ($route === 'core.login.logout') {
 				return 'https://example.com/logout';
 			}
@@ -572,7 +572,7 @@ 
 		$this->navigationManager->clear();
 		$this->dispatcher->expects($this->once())
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) {
+			->willReturnCallback(function($event) {
 				$this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
 			});
 		$entries = $this->navigationManager->getAll();
@@ -739,13 +739,13 @@ 
 		$this->navigationManager->add([
 			'id' => 'settings',
 		]);
-		$this->navigationManager->add(static function (): array {
+		$this->navigationManager->add(static function(): array {
 			return [
 				'id' => 'closure1',
 				'href' => '/closure1',
 			];
 		});
-		$this->navigationManager->add(static function (): array {
+		$this->navigationManager->add(static function(): array {
 			return [
 				'id' => 'closure2',
 				'href' => '/closure2',

lib/private/NavigationManager.php

Indentation +466 added lines, -466 removed lines

@@ -27,470 +27,470 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	protected $unreadCounters = [];
-
-	/** @var bool */
-	protected $init = false;
-	/** @var IAppManager|AppManager */
-	protected $appManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFac;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var Manager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
-	/** User defined app order (cached for the `add` function) */
-	private array $customAppOrder;
-	private LoggerInterface $logger;
-
-	public function __construct(
-		IAppManager $appManager,
-		IURLGenerator $urlGenerator,
-		IFactory $l10nFac,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		IConfig $config,
-		LoggerInterface $logger,
-		protected IEventDispatcher $eventDispatcher,
-	) {
-		$this->appManager = $appManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFac = $l10nFac;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
-		$this->init(false);
-
-		$id = $entry['id'];
-
-		$entry['active'] = false;
-		$entry['unread'] = $this->unreadCounters[$id] ?? 0;
-		if (!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if (!isset($entry['classes'])) {
-			$entry['classes'] = '';
-		}
-		if (!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-
-		if ($entry['type'] === 'link') {
-			// app might not be set when using closures, in this case try to fallback to ID
-			if (!isset($entry['app']) && $this->appManager->isEnabledForUser($id)) {
-				$entry['app'] = $id;
-			}
-
-			// Set order from user defined app order
-			$entry['order'] = (int)($this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100);
-		}
-
-		$this->entries[$id] = $entry;
-
-		// Needs to be done after adding the new entry to account for the default entries containing this new entry.
-		$this->updateDefaultEntries();
-	}
-
-	private function updateDefaultEntries() {
-		$defaultEntryId = $this->getDefaultEntryIdForUser($this->userSession->getUser(), false);
-		foreach ($this->entries as $id => $entry) {
-			if ($entry['type'] === 'link') {
-				$this->entries[$id]['default'] = $id === $defaultEntryId;
-			}
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getAll(string $type = 'link'): array {
-		$this->init();
-
-		$result = $this->entries;
-		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
-				return $entry['type'] === $type;
-			});
-		}
-
-		return $this->proceedNavigation($result, $type);
-	}
-
-	/**
-	 * Sort navigation entries default app is always sorted first, then by order, name and set active flag
-	 *
-	 * @param array $list
-	 * @return array
-	 */
-	private function proceedNavigation(array $list, string $type): array {
-		uasort($list, function ($a, $b) {
-			if (($a['default'] ?? false) xor ($b['default'] ?? false)) {
-				// Always sort the default app first
-				return ($a['default'] ?? false) ? -1 : 1;
-			} elseif (isset($a['order']) && isset($b['order'])) {
-				// Sort by order
-				return ($a['order'] < $b['order']) ? -1 : 1;
-			} elseif (isset($a['order']) || isset($b['order'])) {
-				// Sort the one that has an order property first
-				return isset($a['order']) ? -1 : 1;
-			} else {
-				// Sort by name otherwise
-				return ($a['name'] < $b['name']) ? -1 : 1;
-			}
-		});
-
-		if ($type === 'all' || $type === 'link') {
-			// There might be the case that no default app was set, in this case the first app is the default app.
-			// Otherwise the default app is already the ordered first, so setting the default prop will make no difference.
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['type'] === 'link') {
-					$navEntry['default'] = true;
-					break;
-				}
-			}
-			unset($navEntry);
-		}
-
-		$activeEntry = $this->getActiveEntry();
-		if ($activeEntry !== null) {
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['id'] == $activeEntry) {
-					$navEntry['active'] = true;
-				} else {
-					$navEntry['active'] = false;
-				}
-			}
-			unset($navEntry);
-		}
-
-		return $list;
-	}
-
-
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setActiveEntry($appId) {
-		$this->activeEntry = $appId;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
-
-	private function init(bool $resolveClosures = true): void {
-		if ($resolveClosures) {
-			while ($c = array_pop($this->closureEntries)) {
-				$this->add($c());
-			}
-		}
-
-		if ($this->init) {
-			return;
-		}
-		$this->init = true;
-
-		$l = $this->l10nFac->get('lib');
-		if ($this->config->getSystemValueBool('knowledgebaseenabled', true)) {
-			$this->add([
-				'type' => 'settings',
-				'id' => 'help',
-				'order' => 99998,
-				'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
-				'name' => $l->t('Help & privacy'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			// Profile
-			$this->add([
-				'type' => 'settings',
-				'id' => 'profile',
-				'order' => 1,
-				'href' => $this->urlGenerator->linkToRoute(
-					'profile.ProfilePage.index',
-					['targetUserId' => $this->userSession->getUser()->getUID()],
-				),
-				'name' => $l->t('View profile'),
-			]);
-
-			// Accessibility settings
-			if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
-				$this->add([
-					'type' => 'settings',
-					'id' => 'accessibility_settings',
-					'order' => 2,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
-					'name' => $l->t('Appearance and accessibility'),
-					'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
-				]);
-			}
-
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 5,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Personal settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
-				]);
-
-				// Admin settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'admin_settings',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
-					'name' => $l->t('Administration settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			} else {
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			}
-
-			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if ($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'name' => $l->t('Log out'),
-					'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-				]);
-			}
-
-			if ($this->isSubadmin()) {
-				// User management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_users',
-					'order' => 6,
-					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
-					'name' => $l->t('Accounts'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
-		$this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
-
-		if ($this->userSession->isLoggedIn()) {
-			$user = $this->userSession->getUser();
-			$apps = $this->appManager->getEnabledAppsForUser($user);
-			$this->customAppOrder = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR);
-		} else {
-			$apps = $this->appManager->getEnabledApps();
-			$this->customAppOrder = [];
-		}
-
-		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
-
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['navigations']['navigation'])) {
-				continue;
-			}
-			foreach ($info['navigations']['navigation'] as $key => $nav) {
-				$nav['type'] = $nav['type'] ?? 'link';
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				// Allow settings navigation items with no route entry, all other types require one
-				if (!isset($nav['route']) && $nav['type'] !== 'settings') {
-					continue;
-				}
-				$role = $nav['@attributes']['role'] ?? 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
-				$order = $nav['order'] ?? 100;
-				$type = $nav['type'];
-				$route = !empty($nav['route']) ? $this->urlGenerator->linkToRoute($nav['route']) : '';
-				$icon = $nav['icon'] ?? null;
-				if ($icon !== null) {
-					try {
-						$icon = $this->urlGenerator->imagePath($app, $icon);
-					} catch (\RuntimeException $ex) {
-						// ignore
-					}
-				}
-				if ($icon === null) {
-					$icon = $this->appManager->getAppIcon($app);
-				}
-				if ($icon === null) {
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
-				}
-
-				$this->add(array_merge([
-					// Navigation id
-					'id' => $id,
-					// Order where this entry should be shown
-					'order' => $order,
-					// Target of the navigation entry
-					'href' => $route,
-					// The icon used for the naviation entry
-					'icon' => $icon,
-					// Type of the navigation entry ('link' vs 'settings')
-					'type' => $type,
-					// Localized name of the navigation entry
-					'name' => $l->t($nav['name']),
-				], $type === 'link' ? [
-					// App that registered this navigation entry (not necessarly the same as the id)
-					'app' => $app,
-				] : []
-				));
-			}
-		}
-	}
-
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	private function isSubadmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
-		}
-		return false;
-	}
-
-	public function setUnreadCounter(string $id, int $unreadCounter): void {
-		$this->unreadCounters[$id] = $unreadCounter;
-	}
-
-	public function get(string $id): ?array {
-		$this->init();
-		return $this->entries[$id];
-	}
-
-	public function getDefaultEntryIdForUser(?IUser $user = null, bool $withFallbacks = true): string {
-		$this->init();
-		// Disable fallbacks here, as we need to override them with the user defaults if none are configured.
-		$defaultEntryIds = $this->getDefaultEntryIds(false);
-
-		$user ??= $this->userSession->getUser();
-
-		if ($user !== null) {
-			$userDefaultEntryIds = explode(',', $this->config->getUserValue($user->getUID(), 'core', 'defaultapp'));
-			$defaultEntryIds = array_filter(array_merge($userDefaultEntryIds, $defaultEntryIds));
-			if (empty($defaultEntryIds) && $withFallbacks) {
-				/* Fallback on user defined apporder */
-				$customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags: JSON_THROW_ON_ERROR);
-				if (!empty($customOrders)) {
-					// filter only entries with app key (when added using closures or NavigationManager::add the app is not guaranteed to be set)
-					$customOrders = array_filter($customOrders, static fn ($entry) => isset($entry['app']));
-					// sort apps by order
-					usort($customOrders, static fn ($a, $b) => $a['order'] - $b['order']);
-					// set default apps to sorted apps
-					$defaultEntryIds = array_map(static fn ($entry) => $entry['app'], $customOrders);
-				}
-			}
-		}
-
-		if (empty($defaultEntryIds) && $withFallbacks) {
-			$defaultEntryIds = ['dashboard','files'];
-		}
-
-		$entryIds = array_keys($this->entries);
-
-		// Find the first app that is enabled for the current user
-		foreach ($defaultEntryIds as $defaultEntryId) {
-			if (in_array($defaultEntryId, $entryIds, true)) {
-				return $defaultEntryId;
-			}
-		}
-
-		// Set fallback to always-enabled files app
-		return $withFallbacks ? 'files' : '';
-	}
-
-	public function getDefaultEntryIds(bool $withFallbacks = true): array {
-		$this->init();
-		$storedIds = explode(',', $this->config->getSystemValueString('defaultapp', $withFallbacks ? 'dashboard,files' : ''));
-		$ids = [];
-		$entryIds = array_keys($this->entries);
-		foreach ($storedIds as $id) {
-			if (in_array($id, $entryIds, true)) {
-				$ids[] = $id;
-				break;
-			}
-		}
-		return array_filter($ids);
-	}
-
-	public function setDefaultEntryIds(array $ids): void {
-		$this->init();
-		$entryIds = array_keys($this->entries);
-
-		foreach ($ids as $id) {
-			if (!in_array($id, $entryIds, true)) {
-				$this->logger->debug('Cannot set unavailable entry as default entry', ['missing_entry' => $id]);
-				throw new InvalidArgumentException('Entry not available');
-			}
-		}
-
-		$this->config->setSystemValue('defaultapp', join(',', $ids));
-	}
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    protected $unreadCounters = [];
+
+    /** @var bool */
+    protected $init = false;
+    /** @var IAppManager|AppManager */
+    protected $appManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFac;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var Manager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
+    /** User defined app order (cached for the `add` function) */
+    private array $customAppOrder;
+    private LoggerInterface $logger;
+
+    public function __construct(
+        IAppManager $appManager,
+        IURLGenerator $urlGenerator,
+        IFactory $l10nFac,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        IConfig $config,
+        LoggerInterface $logger,
+        protected IEventDispatcher $eventDispatcher,
+    ) {
+        $this->appManager = $appManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFac = $l10nFac;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
+        $this->init(false);
+
+        $id = $entry['id'];
+
+        $entry['active'] = false;
+        $entry['unread'] = $this->unreadCounters[$id] ?? 0;
+        if (!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if (!isset($entry['classes'])) {
+            $entry['classes'] = '';
+        }
+        if (!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+
+        if ($entry['type'] === 'link') {
+            // app might not be set when using closures, in this case try to fallback to ID
+            if (!isset($entry['app']) && $this->appManager->isEnabledForUser($id)) {
+                $entry['app'] = $id;
+            }
+
+            // Set order from user defined app order
+            $entry['order'] = (int)($this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100);
+        }
+
+        $this->entries[$id] = $entry;
+
+        // Needs to be done after adding the new entry to account for the default entries containing this new entry.
+        $this->updateDefaultEntries();
+    }
+
+    private function updateDefaultEntries() {
+        $defaultEntryId = $this->getDefaultEntryIdForUser($this->userSession->getUser(), false);
+        foreach ($this->entries as $id => $entry) {
+            if ($entry['type'] === 'link') {
+                $this->entries[$id]['default'] = $id === $defaultEntryId;
+            }
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAll(string $type = 'link'): array {
+        $this->init();
+
+        $result = $this->entries;
+        if ($type !== 'all') {
+            $result = array_filter($this->entries, function ($entry) use ($type) {
+                return $entry['type'] === $type;
+            });
+        }
+
+        return $this->proceedNavigation($result, $type);
+    }
+
+    /**
+     * Sort navigation entries default app is always sorted first, then by order, name and set active flag
+     *
+     * @param array $list
+     * @return array
+     */
+    private function proceedNavigation(array $list, string $type): array {
+        uasort($list, function ($a, $b) {
+            if (($a['default'] ?? false) xor ($b['default'] ?? false)) {
+                // Always sort the default app first
+                return ($a['default'] ?? false) ? -1 : 1;
+            } elseif (isset($a['order']) && isset($b['order'])) {
+                // Sort by order
+                return ($a['order'] < $b['order']) ? -1 : 1;
+            } elseif (isset($a['order']) || isset($b['order'])) {
+                // Sort the one that has an order property first
+                return isset($a['order']) ? -1 : 1;
+            } else {
+                // Sort by name otherwise
+                return ($a['name'] < $b['name']) ? -1 : 1;
+            }
+        });
+
+        if ($type === 'all' || $type === 'link') {
+            // There might be the case that no default app was set, in this case the first app is the default app.
+            // Otherwise the default app is already the ordered first, so setting the default prop will make no difference.
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['type'] === 'link') {
+                    $navEntry['default'] = true;
+                    break;
+                }
+            }
+            unset($navEntry);
+        }
+
+        $activeEntry = $this->getActiveEntry();
+        if ($activeEntry !== null) {
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['id'] == $activeEntry) {
+                    $navEntry['active'] = true;
+                } else {
+                    $navEntry['active'] = false;
+                }
+            }
+            unset($navEntry);
+        }
+
+        return $list;
+    }
+
+
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setActiveEntry($appId) {
+        $this->activeEntry = $appId;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
+
+    private function init(bool $resolveClosures = true): void {
+        if ($resolveClosures) {
+            while ($c = array_pop($this->closureEntries)) {
+                $this->add($c());
+            }
+        }
+
+        if ($this->init) {
+            return;
+        }
+        $this->init = true;
+
+        $l = $this->l10nFac->get('lib');
+        if ($this->config->getSystemValueBool('knowledgebaseenabled', true)) {
+            $this->add([
+                'type' => 'settings',
+                'id' => 'help',
+                'order' => 99998,
+                'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
+                'name' => $l->t('Help & privacy'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            // Profile
+            $this->add([
+                'type' => 'settings',
+                'id' => 'profile',
+                'order' => 1,
+                'href' => $this->urlGenerator->linkToRoute(
+                    'profile.ProfilePage.index',
+                    ['targetUserId' => $this->userSession->getUser()->getUID()],
+                ),
+                'name' => $l->t('View profile'),
+            ]);
+
+            // Accessibility settings
+            if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'accessibility_settings',
+                    'order' => 2,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
+                    'name' => $l->t('Appearance and accessibility'),
+                    'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
+                ]);
+            }
+
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 5,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Personal settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
+                ]);
+
+                // Admin settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'admin_settings',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
+                    'name' => $l->t('Administration settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            } else {
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            }
+
+            $logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
+            if ($logoutUrl !== '') {
+                // Logout
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'logout',
+                    'order' => 99999,
+                    'href' => $logoutUrl,
+                    'name' => $l->t('Log out'),
+                    'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+                ]);
+            }
+
+            if ($this->isSubadmin()) {
+                // User management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_users',
+                    'order' => 6,
+                    'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
+                    'name' => $l->t('Accounts'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
+        $this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
+
+        if ($this->userSession->isLoggedIn()) {
+            $user = $this->userSession->getUser();
+            $apps = $this->appManager->getEnabledAppsForUser($user);
+            $this->customAppOrder = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR);
+        } else {
+            $apps = $this->appManager->getEnabledApps();
+            $this->customAppOrder = [];
+        }
+
+        foreach ($apps as $app) {
+            if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
+                continue;
+            }
+
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['navigations']['navigation'])) {
+                continue;
+            }
+            foreach ($info['navigations']['navigation'] as $key => $nav) {
+                $nav['type'] = $nav['type'] ?? 'link';
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                // Allow settings navigation items with no route entry, all other types require one
+                if (!isset($nav['route']) && $nav['type'] !== 'settings') {
+                    continue;
+                }
+                $role = $nav['@attributes']['role'] ?? 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+                $order = $nav['order'] ?? 100;
+                $type = $nav['type'];
+                $route = !empty($nav['route']) ? $this->urlGenerator->linkToRoute($nav['route']) : '';
+                $icon = $nav['icon'] ?? null;
+                if ($icon !== null) {
+                    try {
+                        $icon = $this->urlGenerator->imagePath($app, $icon);
+                    } catch (\RuntimeException $ex) {
+                        // ignore
+                    }
+                }
+                if ($icon === null) {
+                    $icon = $this->appManager->getAppIcon($app);
+                }
+                if ($icon === null) {
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
+                }
+
+                $this->add(array_merge([
+                    // Navigation id
+                    'id' => $id,
+                    // Order where this entry should be shown
+                    'order' => $order,
+                    // Target of the navigation entry
+                    'href' => $route,
+                    // The icon used for the naviation entry
+                    'icon' => $icon,
+                    // Type of the navigation entry ('link' vs 'settings')
+                    'type' => $type,
+                    // Localized name of the navigation entry
+                    'name' => $l->t($nav['name']),
+                ], $type === 'link' ? [
+                    // App that registered this navigation entry (not necessarly the same as the id)
+                    'app' => $app,
+                ] : []
+                ));
+            }
+        }
+    }
+
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    private function isSubadmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
+        }
+        return false;
+    }
+
+    public function setUnreadCounter(string $id, int $unreadCounter): void {
+        $this->unreadCounters[$id] = $unreadCounter;
+    }
+
+    public function get(string $id): ?array {
+        $this->init();
+        return $this->entries[$id];
+    }
+
+    public function getDefaultEntryIdForUser(?IUser $user = null, bool $withFallbacks = true): string {
+        $this->init();
+        // Disable fallbacks here, as we need to override them with the user defaults if none are configured.
+        $defaultEntryIds = $this->getDefaultEntryIds(false);
+
+        $user ??= $this->userSession->getUser();
+
+        if ($user !== null) {
+            $userDefaultEntryIds = explode(',', $this->config->getUserValue($user->getUID(), 'core', 'defaultapp'));
+            $defaultEntryIds = array_filter(array_merge($userDefaultEntryIds, $defaultEntryIds));
+            if (empty($defaultEntryIds) && $withFallbacks) {
+                /* Fallback on user defined apporder */
+                $customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags: JSON_THROW_ON_ERROR);
+                if (!empty($customOrders)) {
+                    // filter only entries with app key (when added using closures or NavigationManager::add the app is not guaranteed to be set)
+                    $customOrders = array_filter($customOrders, static fn ($entry) => isset($entry['app']));
+                    // sort apps by order
+                    usort($customOrders, static fn ($a, $b) => $a['order'] - $b['order']);
+                    // set default apps to sorted apps
+                    $defaultEntryIds = array_map(static fn ($entry) => $entry['app'], $customOrders);
+                }
+            }
+        }
+
+        if (empty($defaultEntryIds) && $withFallbacks) {
+            $defaultEntryIds = ['dashboard','files'];
+        }
+
+        $entryIds = array_keys($this->entries);
+
+        // Find the first app that is enabled for the current user
+        foreach ($defaultEntryIds as $defaultEntryId) {
+            if (in_array($defaultEntryId, $entryIds, true)) {
+                return $defaultEntryId;
+            }
+        }
+
+        // Set fallback to always-enabled files app
+        return $withFallbacks ? 'files' : '';
+    }
+
+    public function getDefaultEntryIds(bool $withFallbacks = true): array {
+        $this->init();
+        $storedIds = explode(',', $this->config->getSystemValueString('defaultapp', $withFallbacks ? 'dashboard,files' : ''));
+        $ids = [];
+        $entryIds = array_keys($this->entries);
+        foreach ($storedIds as $id) {
+            if (in_array($id, $entryIds, true)) {
+                $ids[] = $id;
+                break;
+            }
+        }
+        return array_filter($ids);
+    }
+
+    public function setDefaultEntryIds(array $ids): void {
+        $this->init();
+        $entryIds = array_keys($this->entries);
+
+        foreach ($ids as $id) {
+            if (!in_array($id, $entryIds, true)) {
+                $this->logger->debug('Cannot set unavailable entry as default entry', ['missing_entry' => $id]);
+                throw new InvalidArgumentException('Entry not available');
+            }
+        }
+
+        $this->config->setSystemValue('defaultapp', join(',', $ids));
+    }
 }

lib/private/URLGenerator.php

Indentation +309 added lines, -309 removed lines

@@ -24,313 +24,313 @@
  * Class to generate URLs
  */
 class URLGenerator implements IURLGenerator {
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	public $userSession;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var IRequest */
-	private $request;
-	/** @var Router */
-	private $router;
-	/** @var null|string */
-	private $baseUrl = null;
-	private ?IAppManager $appManager = null;
-	private ?INavigationManager $navigationManager = null;
-
-	public function __construct(IConfig $config,
-		IUserSession $userSession,
-		ICacheFactory $cacheFactory,
-		IRequest $request,
-		Router $router,
-	) {
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->cacheFactory = $cacheFactory;
-		$this->request = $request;
-		$this->router = $router;
-	}
-
-	private function getAppManager(): IAppManager {
-		if ($this->appManager !== null) {
-			return $this->appManager;
-		}
-		$this->appManager = \OCP\Server::get(IAppManager::class);
-		return $this->appManager;
-	}
-
-	private function getNavigationManager(): INavigationManager {
-		if ($this->navigationManager !== null) {
-			return $this->navigationManager;
-		}
-		$this->navigationManager = \OCP\Server::get(INavigationManager::class);
-		return $this->navigationManager;
-	}
-
-	/**
-	 * Creates an url using a defined route
-	 *
-	 * @param string $routeName
-	 * @param array $arguments args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns a url to the given route.
-	 */
-	public function linkToRoute(string $routeName, array $arguments = []): string {
-		return $this->router->generate($routeName, $arguments);
-	}
-
-	/**
-	 * Creates an absolute url using a defined route
-	 * @param string $routeName
-	 * @param array $arguments args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns an absolute url to the given route.
-	 */
-	public function linkToRouteAbsolute(string $routeName, array $arguments = []): string {
-		return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
-	}
-
-	public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
-		// Returns `/subfolder/index.php/ocsapp/…` with `'htaccess.IgnoreFrontController' => false` in config.php
-		// And `/subfolder/ocsapp/…` with `'htaccess.IgnoreFrontController' => true` in config.php
-		$route = $this->router->generate('ocs.' . $routeName, $arguments, false);
-
-		// Cut off `/subfolder`
-		if (\OC::$WEBROOT !== '' && str_starts_with($route, \OC::$WEBROOT)) {
-			$route = substr($route, \strlen(\OC::$WEBROOT));
-		}
-
-		if (str_starts_with($route, '/index.php/')) {
-			$route = substr($route, 10);
-		}
-
-		// Remove `ocsapp/` bit
-		$route = substr($route, 7);
-		// Prefix with ocs/v2.php endpoint
-		$route = '/ocs/v2.php' . $route;
-
-		// Turn into an absolute URL
-		return $this->getAbsoluteURL($route);
-	}
-
-	/**
-	 * Creates an url
-	 *
-	 * @param string $appName app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 *                    The value of $args will be urlencoded
-	 * @return string the url
-	 *
-	 * Returns a url to the given app and file.
-	 */
-	public function linkTo(string $appName, string $file, array $args = []): string {
-		$frontControllerActive = ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true');
-
-		if ($appName !== '') {
-			$app_path = $this->getAppManager()->getAppPath($appName);
-			// Check if the app is in the app folder
-			if (file_exists($app_path . '/' . $file)) {
-				if (str_ends_with($file, 'php')) {
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
-					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
-					}
-					$urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
-				} else {
-					$urlLinkTo = $this->getAppManager()->getAppWebPath($appName) . '/' . $file;
-				}
-			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
-			}
-		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
-			} else {
-				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
-				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
-				}
-			}
-		}
-
-		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
-		}
-
-		return $urlLinkTo;
-	}
-
-	/**
-	 * Creates path to an image
-	 *
-	 * @param string $appName app
-	 * @param string $file image name
-	 * @throws \RuntimeException If the image does not exist
-	 * @return string the url
-	 *
-	 * Returns the path to the image.
-	 */
-	public function imagePath(string $appName, string $file): string {
-		$cache = $this->cacheFactory->createDistributed('imagePath-' . md5($this->getBaseUrl()) . '-');
-		$cacheKey = $appName . '-' . $file;
-		if ($key = $cache->get($cacheKey)) {
-			return $key;
-		}
-
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		//if a theme has a png but not an svg always use the png
-		$basename = substr(basename($file), 0, -4);
-
-		try {
-			$appPath = $this->getAppManager()->getAppPath($appName);
-		} catch (AppPathNotFoundException $e) {
-			if ($appName === 'core' || $appName === '') {
-				$appName = 'core';
-				$appPath = false;
-			} else {
-				throw new RuntimeException('image not found: image: ' . $file . ' webroot: ' . \OC::$WEBROOT . ' serverroot: ' . \OC::$SERVERROOT);
-			}
-		}
-
-		// Check if the app is in the app folder
-		$path = '';
-		$themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming');
-		$themingImagePath = false;
-		if ($themingEnabled) {
-			$themingDefaults = \OC::$server->get('ThemingDefaults');
-			if ($themingDefaults instanceof ThemingDefaults) {
-				$themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
-			}
-		}
-
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		} elseif ($themingEnabled && $themingImagePath) {
-			$path = $themingImagePath;
-		} elseif ($appPath && file_exists($appPath . "/img/$file")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$file";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		}
-
-		if ($path !== '') {
-			$cache->set($cacheKey, $path);
-			return $path;
-		}
-
-		throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
-	}
-
-
-	/**
-	 * Makes an URL absolute
-	 * @param string $url the url in the Nextcloud host
-	 * @return string the absolute version of the url
-	 */
-	public function getAbsoluteURL(string $url): string {
-		$separator = str_starts_with($url, '/') ? '' : '/';
-
-		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
-		}
-		// The Nextcloud web root could already be prepended.
-		if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) {
-			$url = substr($url, \strlen(\OC::$WEBROOT));
-		}
-
-		return $this->getBaseUrl() . $separator . $url;
-	}
-
-	/**
-	 * @param string $key
-	 * @return string url to the online documentation
-	 */
-	public function linkToDocs(string $key): string {
-		$theme = \OC::$server->get('ThemingDefaults');
-		return $theme->buildDocLinkToKey($key);
-	}
-
-	/**
-	 * Returns the URL of the default page based on the system configuration
-	 * and the apps visible for the current user
-	 * @return string
-	 */
-	public function linkToDefaultPageUrl(): string {
-		// Deny the redirect if the URL contains a @
-		// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-		if (isset($_REQUEST['redirect_url']) && !str_contains($_REQUEST['redirect_url'], '@')) {
-			return $this->getAbsoluteURL(urldecode($_REQUEST['redirect_url']));
-		}
-
-		$defaultPage = $this->config->getAppValue('core', 'defaultpage');
-		if ($defaultPage) {
-			return $this->getAbsoluteURL($defaultPage);
-		}
-
-		$entryId = $this->getNavigationManager()->getDefaultEntryIdForUser();
-		$entry = $this->getNavigationManager()->get($entryId);
-		$href = (string)$entry['href'];
-		if ($href === '') {
-			throw new \InvalidArgumentException('Default navigation entry is missing href: ' . $entryId);
-		}
-
-		if (str_starts_with($href, $this->getBaseUrl())) {
-			return $href;
-		}
-
-		if (str_starts_with($href, '/index.php/') && ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true')) {
-			$href = substr($href, 10);
-		}
-
-		return $this->getAbsoluteURL($href);
-	}
-
-	/**
-	 * @return string base url of the current request
-	 */
-	public function getBaseUrl(): string {
-		// BaseUrl can be equal to 'http(s)://' during the first steps of the initial setup.
-		if ($this->baseUrl === null || $this->baseUrl === 'http://' || $this->baseUrl === 'https://') {
-			$this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
-		}
-		return $this->baseUrl;
-	}
-
-	/**
-	 * @return string webroot part of the base url
-	 */
-	public function getWebroot(): string {
-		return \OC::$WEBROOT;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IUserSession */
+    public $userSession;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var IRequest */
+    private $request;
+    /** @var Router */
+    private $router;
+    /** @var null|string */
+    private $baseUrl = null;
+    private ?IAppManager $appManager = null;
+    private ?INavigationManager $navigationManager = null;
+
+    public function __construct(IConfig $config,
+        IUserSession $userSession,
+        ICacheFactory $cacheFactory,
+        IRequest $request,
+        Router $router,
+    ) {
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->cacheFactory = $cacheFactory;
+        $this->request = $request;
+        $this->router = $router;
+    }
+
+    private function getAppManager(): IAppManager {
+        if ($this->appManager !== null) {
+            return $this->appManager;
+        }
+        $this->appManager = \OCP\Server::get(IAppManager::class);
+        return $this->appManager;
+    }
+
+    private function getNavigationManager(): INavigationManager {
+        if ($this->navigationManager !== null) {
+            return $this->navigationManager;
+        }
+        $this->navigationManager = \OCP\Server::get(INavigationManager::class);
+        return $this->navigationManager;
+    }
+
+    /**
+     * Creates an url using a defined route
+     *
+     * @param string $routeName
+     * @param array $arguments args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns a url to the given route.
+     */
+    public function linkToRoute(string $routeName, array $arguments = []): string {
+        return $this->router->generate($routeName, $arguments);
+    }
+
+    /**
+     * Creates an absolute url using a defined route
+     * @param string $routeName
+     * @param array $arguments args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns an absolute url to the given route.
+     */
+    public function linkToRouteAbsolute(string $routeName, array $arguments = []): string {
+        return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
+    }
+
+    public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
+        // Returns `/subfolder/index.php/ocsapp/…` with `'htaccess.IgnoreFrontController' => false` in config.php
+        // And `/subfolder/ocsapp/…` with `'htaccess.IgnoreFrontController' => true` in config.php
+        $route = $this->router->generate('ocs.' . $routeName, $arguments, false);
+
+        // Cut off `/subfolder`
+        if (\OC::$WEBROOT !== '' && str_starts_with($route, \OC::$WEBROOT)) {
+            $route = substr($route, \strlen(\OC::$WEBROOT));
+        }
+
+        if (str_starts_with($route, '/index.php/')) {
+            $route = substr($route, 10);
+        }
+
+        // Remove `ocsapp/` bit
+        $route = substr($route, 7);
+        // Prefix with ocs/v2.php endpoint
+        $route = '/ocs/v2.php' . $route;
+
+        // Turn into an absolute URL
+        return $this->getAbsoluteURL($route);
+    }
+
+    /**
+     * Creates an url
+     *
+     * @param string $appName app
+     * @param string $file file
+     * @param array $args array with param=>value, will be appended to the returned url
+     *                    The value of $args will be urlencoded
+     * @return string the url
+     *
+     * Returns a url to the given app and file.
+     */
+    public function linkTo(string $appName, string $file, array $args = []): string {
+        $frontControllerActive = ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true');
+
+        if ($appName !== '') {
+            $app_path = $this->getAppManager()->getAppPath($appName);
+            // Check if the app is in the app folder
+            if (file_exists($app_path . '/' . $file)) {
+                if (str_ends_with($file, 'php')) {
+                    $urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
+                    if ($frontControllerActive) {
+                        $urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
+                    }
+                    $urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
+                } else {
+                    $urlLinkTo = $this->getAppManager()->getAppWebPath($appName) . '/' . $file;
+                }
+            } else {
+                $urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
+            }
+        } else {
+            if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
+                $urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+            } else {
+                if ($frontControllerActive && $file === 'index.php') {
+                    $urlLinkTo = \OC::$WEBROOT . '/';
+                } else {
+                    $urlLinkTo = \OC::$WEBROOT . '/' . $file;
+                }
+            }
+        }
+
+        if ($args && $query = http_build_query($args, '', '&')) {
+            $urlLinkTo .= '?' . $query;
+        }
+
+        return $urlLinkTo;
+    }
+
+    /**
+     * Creates path to an image
+     *
+     * @param string $appName app
+     * @param string $file image name
+     * @throws \RuntimeException If the image does not exist
+     * @return string the url
+     *
+     * Returns the path to the image.
+     */
+    public function imagePath(string $appName, string $file): string {
+        $cache = $this->cacheFactory->createDistributed('imagePath-' . md5($this->getBaseUrl()) . '-');
+        $cacheKey = $appName . '-' . $file;
+        if ($key = $cache->get($cacheKey)) {
+            return $key;
+        }
+
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        //if a theme has a png but not an svg always use the png
+        $basename = substr(basename($file), 0, -4);
+
+        try {
+            $appPath = $this->getAppManager()->getAppPath($appName);
+        } catch (AppPathNotFoundException $e) {
+            if ($appName === 'core' || $appName === '') {
+                $appName = 'core';
+                $appPath = false;
+            } else {
+                throw new RuntimeException('image not found: image: ' . $file . ' webroot: ' . \OC::$WEBROOT . ' serverroot: ' . \OC::$SERVERROOT);
+            }
+        }
+
+        // Check if the app is in the app folder
+        $path = '';
+        $themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming');
+        $themingImagePath = false;
+        if ($themingEnabled) {
+            $themingDefaults = \OC::$server->get('ThemingDefaults');
+            if ($themingDefaults instanceof ThemingDefaults) {
+                $themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
+            }
+        }
+
+        if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
+        } elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
+        } elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
+            $path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/core/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        } elseif ($themingEnabled && $themingImagePath) {
+            $path = $themingImagePath;
+        } elseif ($appPath && file_exists($appPath . "/img/$file")) {
+            $path = $this->getAppManager()->getAppWebPath($appName) . "/img/$file";
+        } elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
+            && file_exists($appPath . "/img/$basename.png")) {
+            $path = $this->getAppManager()->getAppWebPath($appName) . "/img/$basename.png";
+        } elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
+            $path = \OC::$WEBROOT . "/$appName/img/$file";
+        } elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
+                && file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
+            $path = \OC::$WEBROOT . "/$appName/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
+            $path = \OC::$WEBROOT . "/core/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        }
+
+        if ($path !== '') {
+            $cache->set($cacheKey, $path);
+            return $path;
+        }
+
+        throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+    }
+
+
+    /**
+     * Makes an URL absolute
+     * @param string $url the url in the Nextcloud host
+     * @return string the absolute version of the url
+     */
+    public function getAbsoluteURL(string $url): string {
+        $separator = str_starts_with($url, '/') ? '' : '/';
+
+        if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
+            return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+        }
+        // The Nextcloud web root could already be prepended.
+        if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) {
+            $url = substr($url, \strlen(\OC::$WEBROOT));
+        }
+
+        return $this->getBaseUrl() . $separator . $url;
+    }
+
+    /**
+     * @param string $key
+     * @return string url to the online documentation
+     */
+    public function linkToDocs(string $key): string {
+        $theme = \OC::$server->get('ThemingDefaults');
+        return $theme->buildDocLinkToKey($key);
+    }
+
+    /**
+     * Returns the URL of the default page based on the system configuration
+     * and the apps visible for the current user
+     * @return string
+     */
+    public function linkToDefaultPageUrl(): string {
+        // Deny the redirect if the URL contains a @
+        // This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+        if (isset($_REQUEST['redirect_url']) && !str_contains($_REQUEST['redirect_url'], '@')) {
+            return $this->getAbsoluteURL(urldecode($_REQUEST['redirect_url']));
+        }
+
+        $defaultPage = $this->config->getAppValue('core', 'defaultpage');
+        if ($defaultPage) {
+            return $this->getAbsoluteURL($defaultPage);
+        }
+
+        $entryId = $this->getNavigationManager()->getDefaultEntryIdForUser();
+        $entry = $this->getNavigationManager()->get($entryId);
+        $href = (string)$entry['href'];
+        if ($href === '') {
+            throw new \InvalidArgumentException('Default navigation entry is missing href: ' . $entryId);
+        }
+
+        if (str_starts_with($href, $this->getBaseUrl())) {
+            return $href;
+        }
+
+        if (str_starts_with($href, '/index.php/') && ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true')) {
+            $href = substr($href, 10);
+        }
+
+        return $this->getAbsoluteURL($href);
+    }
+
+    /**
+     * @return string base url of the current request
+     */
+    public function getBaseUrl(): string {
+        // BaseUrl can be equal to 'http(s)://' during the first steps of the initial setup.
+        if ($this->baseUrl === null || $this->baseUrl === 'http://' || $this->baseUrl === 'https://') {
+            $this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
+        }
+        return $this->baseUrl;
+    }
+
+    /**
+     * @return string webroot part of the base url
+     */
+    public function getWebroot(): string {
+        return \OC::$WEBROOT;
+    }
 }

Spacing +52 added lines, -52 removed lines

@@ -96,7 +96,7 @@ 
 	public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
 		// Returns `/subfolder/index.php/ocsapp/…` with `'htaccess.IgnoreFrontController' => false` in config.php
 		// And `/subfolder/ocsapp/…` with `'htaccess.IgnoreFrontController' => true` in config.php
-		$route = $this->router->generate('ocs.' . $routeName, $arguments, false);
+		$route = $this->router->generate('ocs.'.$routeName, $arguments, false);
 
 		// Cut off `/subfolder`
 		if (\OC::$WEBROOT !== '' && str_starts_with($route, \OC::$WEBROOT)) {
@@ -110,7 +110,7 @@ 
 		// Remove `ocsapp/` bit
 		$route = substr($route, 7);
 		// Prefix with ocs/v2.php endpoint
-		$route = '/ocs/v2.php' . $route;
+		$route = '/ocs/v2.php'.$route;
 
 		// Turn into an absolute URL
 		return $this->getAbsoluteURL($route);
@@ -133,33 +133,33 @@ 
 		if ($appName !== '') {
 			$app_path = $this->getAppManager()->getAppPath($appName);
 			// Check if the app is in the app folder
-			if (file_exists($app_path . '/' . $file)) {
+			if (file_exists($app_path.'/'.$file)) {
 				if (str_ends_with($file, 'php')) {
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
+					$urlLinkTo = \OC::$WEBROOT.'/index.php/apps/'.$appName;
 					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
+						$urlLinkTo = \OC::$WEBROOT.'/apps/'.$appName;
 					}
-					$urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
+					$urlLinkTo .= ($file !== 'index.php') ? '/'.$file : '';
 				} else {
-					$urlLinkTo = $this->getAppManager()->getAppWebPath($appName) . '/' . $file;
+					$urlLinkTo = $this->getAppManager()->getAppWebPath($appName).'/'.$file;
 				}
 			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
+				$urlLinkTo = \OC::$WEBROOT.'/'.$appName.'/'.$file;
 			}
 		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+			if (file_exists(\OC::$SERVERROOT.'/core/'.$file)) {
+				$urlLinkTo = \OC::$WEBROOT.'/core/'.$file;
 			} else {
 				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
+					$urlLinkTo = \OC::$WEBROOT.'/';
 				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
+					$urlLinkTo = \OC::$WEBROOT.'/'.$file;
 				}
 			}
 		}
 
 		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
+			$urlLinkTo .= '?'.$query;
 		}
 
 		return $urlLinkTo;
@@ -176,8 +176,8 @@ 
 	 * Returns the path to the image.
 	 */
 	public function imagePath(string $appName, string $file): string {
-		$cache = $this->cacheFactory->createDistributed('imagePath-' . md5($this->getBaseUrl()) . '-');
-		$cacheKey = $appName . '-' . $file;
+		$cache = $this->cacheFactory->createDistributed('imagePath-'.md5($this->getBaseUrl()).'-');
+		$cacheKey = $appName.'-'.$file;
 		if ($key = $cache->get($cacheKey)) {
 			return $key;
 		}
@@ -195,7 +195,7 @@ 
 				$appName = 'core';
 				$appPath = false;
 			} else {
-				throw new RuntimeException('image not found: image: ' . $file . ' webroot: ' . \OC::$WEBROOT . ' serverroot: ' . \OC::$SERVERROOT);
+				throw new RuntimeException('image not found: image: '.$file.' webroot: '.\OC::$WEBROOT.' serverroot: '.\OC::$SERVERROOT);
 			}
 		}
 
@@ -210,38 +210,38 @@ 
 			}
 		}
 
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+		if (file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$appName/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$appName/img/$basename.png";
+		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/$appName/img/$file";
+		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/themes/$theme/$appName/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		} elseif ($themingEnabled && $themingImagePath) {
 			$path = $themingImagePath;
-		} elseif ($appPath && file_exists($appPath . "/img/$file")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$file";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+		} elseif ($appPath && file_exists($appPath."/img/$file")) {
+			$path = $this->getAppManager()->getAppWebPath($appName)."/img/$file";
+		} elseif ($appPath && !file_exists($appPath."/img/$basename.svg")
+			&& file_exists($appPath."/img/$basename.png")) {
+			$path = $this->getAppManager()->getAppWebPath($appName)."/img/$basename.png";
+		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT."/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/$appName/img/$file";
+		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT."/$appName/img/$basename.svg")
+				&& file_exists(\OC::$SERVERROOT."/$appName/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/$appName/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/core/img/$file")) {
+			$path = \OC::$WEBROOT."/core/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		}
 
 		if ($path !== '') {
@@ -249,7 +249,7 @@ 
 			return $path;
 		}
 
-		throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+		throw new RuntimeException('image not found: image:'.$file.' webroot:'.\OC::$WEBROOT.' serverroot:'.\OC::$SERVERROOT);
 	}
 
 
@@ -262,14 +262,14 @@ 
 		$separator = str_starts_with($url, '/') ? '' : '/';
 
 		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+			return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/').'/'.ltrim($url, '/');
 		}
 		// The Nextcloud web root could already be prepended.
 		if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) {
 			$url = substr($url, \strlen(\OC::$WEBROOT));
 		}
 
-		return $this->getBaseUrl() . $separator . $url;
+		return $this->getBaseUrl().$separator.$url;
 	}
 
 	/**
@@ -300,9 +300,9 @@ 
 
 		$entryId = $this->getNavigationManager()->getDefaultEntryIdForUser();
 		$entry = $this->getNavigationManager()->get($entryId);
-		$href = (string)$entry['href'];
+		$href = (string) $entry['href'];
 		if ($href === '') {
-			throw new \InvalidArgumentException('Default navigation entry is missing href: ' . $entryId);
+			throw new \InvalidArgumentException('Default navigation entry is missing href: '.$entryId);
 		}
 
 		if (str_starts_with($href, $this->getBaseUrl())) {
@@ -322,7 +322,7 @@ 
 	public function getBaseUrl(): string {
 		// BaseUrl can be equal to 'http(s)://' during the first steps of the initial setup.
 		if ($this->baseUrl === null || $this->baseUrl === 'http://' || $this->baseUrl === 'https://') {
-			$this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
+			$this->baseUrl = $this->request->getServerProtocol().'://'.$this->request->getServerHost().\OC::$WEBROOT;
 		}
 		return $this->baseUrl;
 	}