2 files changed, 23 insertions, 11 deletions

diff --git a/lib/private/AppFramework/Bootstrap/Coordinator.php b/lib/private/AppFramework/Bootstrap/Coordinator.php
index 4e613703dec..a31dd6a05e1 100644
--- a/lib/private/AppFramework/Bootstrap/Coordinator.php
+++ b/lib/private/AppFramework/Bootstrap/Coordinator.php
@@ -20,6 +20,7 @@ use OCP\Dashboard\IManager;
 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;
@@ -45,7 +46,13 @@ class Coordinator {
 	}
 
 	public function runInitialRegistration(): void {
-		$this->registerApps(OC_App::getEnabledApps());
+		$apps = OC_App::getEnabledApps();
+		if (!empty($apps)) {
+			// make sure to also register the core app
+			$apps = ['core', ...$apps];
+		}
+
+		$this->registerApps($apps);
 	}
 
 	public function runLazyRegistration(string $appId): void {
@@ -69,19 +76,24 @@ class Coordinator {
 			 */
 			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);
+			if ($appId === 'core') {
+				$appNameSpace = 'OC\\Core';
+			} 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");
@@ -89,7 +101,7 @@ class Coordinator {
 						/** @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;
@@ -172,7 +184,7 @@ class Coordinator {
 	public function isBootable(string $appId) {
 		$appNameSpace = App::buildAppNamespace($appId);
 		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
-		return class_exists($applicationClassName) &&
-			in_array(IBootstrap::class, class_implements($applicationClassName), true);
+		return class_exists($applicationClassName)
+			&& in_array(IBootstrap::class, class_implements($applicationClassName), true);
 	}
 }
diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
index c3b829825c2..94250aad37b 100644
--- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php
+++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace OC\AppFramework\Bootstrap;
 
 use Closure;
-use NCU\Config\Lexicon\IConfigLexicon;
 use OC\Config\Lexicon\CoreConfigLexicon;
 use OC\Support\CrashReport\Registry;
 use OCP\AppFramework\App;
@@ -23,6 +22,7 @@ use OCP\Calendar\Resource\IBackend as IResourceBackend;
 use OCP\Calendar\Room\IBackend as IRoomBackend;
 use OCP\Capabilities\ICapability;
 use OCP\Collaboration\Reference\IReferenceProvider;
+use OCP\Config\Lexicon\ILexicon;
 use OCP\Dashboard\IManager;
 use OCP\Dashboard\IWidget;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -157,7 +157,7 @@ class RegistrationContext {
 
 	/** @var ServiceRegistration<\OCP\Files\Conversion\IConversionProvider>[] */
 	private array $fileConversionProviders = [];
-	
+
 	/** @var ServiceRegistration<IMailProvider>[] */
 	private $mailProviders = [];
 
@@ -652,7 +652,7 @@ class RegistrationContext {
 	}
 
 	/**
-	 * @psalm-param class-string<IConfigLexicon> $configLexiconClass
+	 * @psalm-param class-string<ILexicon> $configLexiconClass
 	 */
 	public function registerConfigLexicon(string $appId, string $configLexiconClass): void {
 		$this->configLexiconClasses[$appId] = $configLexiconClass;
@@ -1023,9 +1023,9 @@ class RegistrationContext {
 	 *
 	 * @param string $appId
 	 *
-	 * @return IConfigLexicon|null
+	 * @return ILexicon|null
 	 */
-	public function getConfigLexicon(string $appId): ?IConfigLexicon {
+	public function getConfigLexicon(string $appId): ?ILexicon {
 		if (!array_key_exists($appId, $this->configLexiconClasses)) {
 			return null;
 		}