refactor(server): Register alias when needed

And remove useless service registration

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

config/config.sample.php

@@ -1659,15 +1659,6 @@
 	 */
 	'comments.managerFactory' => '\OC\Comments\ManagerFactory',
 
-	/**
-	 * Replaces the default System Tags Manager Factory. This can be utilized if an
-	 * own or 3rd-party SystemTagsManager should be used that – for instance – uses the
-	 * filesystem instead of the database to keep the tags.
-	 *
-	 * Defaults to ``\OC\SystemTag\ManagerFactory``
-	 */
-	'systemtags.managerFactory' => '\OC\SystemTag\ManagerFactory',
-
 	/**
 	 * Maintenance
 	 *

lib/private/Activity/EventMerger.php

@@ -10,14 +10,15 @@
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\IL10N;
+use OCP\L10N\IFactory;
 
 class EventMerger implements IEventMerger {
-	/**
-	 * @param IL10N $l10n
-	 */
+	private readonly IL10N $l10n;
+
 	public function __construct(
-		protected IL10N $l10n,
+		IFactory $factory,
 	) {
+		$this->l10n = $factory->get('lib');
 	}
 
 	/**

lib/private/App/AppStore/Bundles/BundleFetcher.php

@@ -8,11 +8,14 @@
 namespace OC\App\AppStore\Bundles;
 
 use OCP\IL10N;
+use OCP\L10N\IFactory;
 
 class BundleFetcher {
+	private IL10N $l10n;
 	public function __construct(
-		private IL10N $l10n,
+		IFactory $factory,
 	) {
+		$this->l10n = $factory->get('lib');
 	}
 
 	/**

lib/private/Diagnostics/QueryLogger.php

@@ -8,6 +8,7 @@
 
 namespace OC\Diagnostics;
 
+use OC\SystemConfig;
 use OCP\Cache\CappedMemoryCache;
 use OCP\Diagnostics\IQueryLogger;
 
@@ -20,7 +21,11 @@ class QueryLogger implements IQueryLogger {
 	/**
 	 * QueryLogger constructor.
 	 */
-	public function __construct() {
+	public function __construct(SystemConfig $config) {
+		if ($config->getValue('debug', false)) {
+			// In debug mode, module is being activated by default
+			$this->activate();
+		}
 		$this->queries = new CappedMemoryCache(1024);
 	}