fix: make core application bootstrapable by coordinator

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/base.php

@@ -785,7 +785,7 @@ public static function init(): void {
 		if ($systemConfig->getValue('installed', false)) {
 			$appManager->loadApp('settings');
 			/* Build core application to make sure that listeners are registered */
-			Server::get(\OC\Core\Application::class);
+			$bootstrapCoordinator->runLazyRegistration('core');
 		}
 
 		//make sure temporary files are cleaned up

lib/private/AppFramework/Bootstrap/Coordinator.php

@@ -9,6 +9,7 @@
 
 namespace OC\AppFramework\Bootstrap;
 
+use OC\Core\Application;
 use OC\Support\CrashReport\Registry;
 use OC_App;
 use OCP\App\AppPathNotFoundException;
@@ -20,6 +21,7 @@
 use OCP\Diagnostics\IEventLogger;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IServerContainer;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
 use function class_exists;
@@ -69,27 +71,32 @@ private function registerApps(array $appIds): void {
 			 */
 			try {
 				$path = $this->appManager->getAppPath($appId);
+				OC_App::registerAutoloading($appId, $path);
 			} catch (AppPathNotFoundException) {
 				// Ignore
 				continue;
 			}
-			OC_App::registerAutoloading($appId, $path);
 			$this->eventLogger->end("bootstrap:register_app:$appId:autoloader");
 
 			/*
 			 * Next we check if there is an application class, and it implements
 			 * the \OCP\AppFramework\Bootstrap\IBootstrap interface
 			 */
-			$appNameSpace = App::buildAppNamespace($appId);
-			$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+			if ($appId === 'core') {
+				$applicationClassName = Application::class;
+			} else {
+				$appNameSpace = App::buildAppNamespace($appId);
+				$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+			}
+
 			try {
 				if (class_exists($applicationClassName) && is_a($applicationClassName, IBootstrap::class, true)) {
 					$this->eventLogger->start("bootstrap:register_app:$appId:application", "Load `Application` instance for $appId");
 					try {
 						/** @var IBootstrap&App $application */
 						$application = $this->serverContainer->query($applicationClassName);
 						$apps[$appId] = $application;
-					} catch (QueryException $e) {
+					} catch (ContainerExceptionInterface $e) {
 						// Weird, but ok
 						$this->eventLogger->end("bootstrap:register_app:$appId");
 						continue;

lib/private/URLGenerator.php

@@ -189,14 +189,14 @@ public function imagePath(string $appName, string $file): string {
 		$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);
+				$appPath = $this->getAppManager()->getAppPath($appName);
 			}
+		} catch (AppPathNotFoundException $e) {
+			throw new RuntimeException('image not found: image: ' . $file . ' webroot: ' . \OC::$WEBROOT . ' serverroot: ' . \OC::$SERVERROOT);
 		}
 
 		// Check if the app is in the app folder

lib/private/legacy/OC_App.php

@@ -316,6 +316,8 @@ public static function getAppPath(string $appId, bool $refreshAppPath = false) {
 		$appId = self::cleanAppId($appId);
 		if ($appId === '') {
 			return false;
+		} elseif ($appId === 'core') {
+			return __DIR__ . '/../../../core';
 		}
 
 		if (($dir = self::findAppInDirectories($appId, $refreshAppPath)) != false) {