fix: Lazy load IURLGenerator from AppManager to avoid installation crash

Signed-off-by: Côme Chilliet <[email protected]>

lib/private/App/AppManager.php

@@ -98,15 +98,19 @@ class AppManager implements IAppManager {
 	private array $loadedApps = [];
 
 	private ?AppConfig $appConfig = null;
+	private ?IURLGenerator $urlGenerator = null;
 
+	/**
+	 * Be extremely careful when injecting classes here. The AppManager is used by the installer,
+	 * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
+	 */
 	public function __construct(
 		private IUserSession $userSession,
 		private IConfig $config,
 		private IGroupManager $groupManager,
 		private ICacheFactory $memCacheFactory,
 		private IEventDispatcher $dispatcher,
 		private LoggerInterface $logger,
-		private IURLGenerator $urlGenerator,
 	) {
 	}
 
@@ -115,7 +119,7 @@ public function getAppIcon(string $appId, bool $dark = false): ?string {
 		$icon = null;
 		foreach ($possibleIcons as $iconName) {
 			try {
-				$icon = $this->urlGenerator->imagePath($appId, $iconName);
+				$icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
 				break;
 			} catch (\RuntimeException $e) {
 				// ignore
@@ -135,6 +139,17 @@ private function getAppConfig(): AppConfig {
 		return $this->appConfig;
 	}
 
+	private function getUrlGenerator(): IURLGenerator {
+		if ($this->urlGenerator !== null) {
+			return $this->urlGenerator;
+		}
+		if (!$this->config->getSystemValueBool('installed', false)) {
+			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+		}
+		$this->urlGenerator = \OCP\Server::get(IURLGenerator::class);
+		return $this->urlGenerator;
+	}
+
 	/**
 	 * @return string[] $appId => $enabled
 	 */

lib/private/Server.php

@@ -897,7 +897,6 @@ public function __construct($webRoot, \OC\Config $config) {
 				$c->get(ICacheFactory::class),
 				$c->get(IEventDispatcher::class),
 				$c->get(LoggerInterface::class),
-				$c->get(IURLGenerator::class),
 			);
 		});
 		/** @deprecated 19.0.0 */

tests/lib/App/AppManagerTest.php

@@ -99,7 +99,7 @@ protected function getAppConfig() {
 	/** @var LoggerInterface|MockObject */
 	protected $logger;
 
-	protected IURLGenerator|MockObject $urlGenerator;
+	protected IURLGenerator&MockObject $urlGenerator;
 
 	/** @var IAppManager */
 	protected $manager;
@@ -118,6 +118,7 @@ protected function setUp(): void {
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 
 		$this->overwriteService(AppConfig::class, $this->appConfig);
+		$this->overwriteService(IURLGenerator::class, $this->urlGenerator);
 
 		$this->cacheFactory->expects($this->any())
 			->method('createDistributed')
@@ -136,7 +137,6 @@ protected function setUp(): void {
 			$this->cacheFactory,
 			$this->eventDispatcher,
 			$this->logger,
-			$this->urlGenerator,
 		);
 	}
 
@@ -279,7 +279,6 @@ public function testEnableAppForGroups() {
 				$this->cacheFactory,
 				$this->eventDispatcher,
 				$this->logger,
-				$this->urlGenerator,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -333,7 +332,6 @@ public function testEnableAppForGroupsAllowedTypes(array $appInfo) {
 				$this->cacheFactory,
 				$this->eventDispatcher,
 				$this->logger,
-				$this->urlGenerator,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -395,7 +393,6 @@ public function testEnableAppForGroupsForbiddenTypes($type) {
 				$this->cacheFactory,
 				$this->eventDispatcher,
 				$this->logger,
-				$this->urlGenerator,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -598,7 +595,6 @@ public function testGetAppsNeedingUpgrade() {
 				$this->cacheFactory,
 				$this->eventDispatcher,
 				$this->logger,
-				$this->urlGenerator,
 			])
 			->onlyMethods(['getAppInfo'])
 			->getMock();
@@ -657,7 +653,6 @@ public function testGetIncompatibleApps() {
 				$this->cacheFactory,
 				$this->eventDispatcher,
 				$this->logger,
-				$this->urlGenerator,
 			])
 			->onlyMethods(['getAppInfo'])
 			->getMock();