refactor: Cleanup files app bootstrap

CarlSchwan · CarlSchwan · commit 16cd07249ddb · 2026-04-22T14:03:06.000+02:00
- Register event listener in the register method
- Remove hook for injecting max_chunk_size in app config and move
  that code directly in JSConfigHelper
- Remove getUserFolder deprecated API usage

Signed-off-by: Carl Schwan &lt;carlschwan@kde.org&gt;
diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php
@@ -17,7 +17,6 @@
     'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
     'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
     'OCA\\Files\\AdvancedCapabilities' => $baseDir . '/../lib/AdvancedCapabilities.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
     'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
     'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php
@@ -32,7 +32,6 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
         'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
         'OCA\\Files\\AdvancedCapabilities' => __DIR__ . '/..' . '/../lib/AdvancedCapabilities.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
         'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
         'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
diff --git a/apps/files/lib/App.php b/apps/files/lib/App.php
diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
@@ -8,7 +8,6 @@
  */
 namespace OCA\Files\AppInfo;
 
-use Closure;
 use OCA\Files\AdvancedCapabilities;
 use OCA\Files\Capabilities;
 use OCA\Files\Collaboration\Resources\Listener;
@@ -49,11 +48,12 @@
 use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
-use OCP\IServerContainer;
 use OCP\ITagManager;
 use OCP\IUserSession;
+use OCP\Share\Events\ShareCreatedEvent;
+use OCP\Share\Events\ShareDeletedEvent;
+use OCP\Share\Events\ShareDeletedFromSelfEvent;
 use OCP\Share\IManager as IShareManager;
-use OCP\Util;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -68,9 +68,12 @@ public function register(IRegistrationContext $context): void {
 		/**
 		 * Controllers
 		 */
-		$context->registerService('APIController', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+		$context->registerService(APIController::class, function (ContainerInterface $c): ApiController {
+			/** @var IUserSession $userSession */
+			$userSession = $c->get(IUserSession::class);
+
+			/** @var IRootFolder $rootFolder */
+			$rootFolder = $c->get(IRootFolder::class);
 
 			return new ApiController(
 				$c->get('AppName'),
@@ -80,7 +83,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(IPreview::class),
 				$c->get(IShareManager::class),
 				$c->get(IConfig::class),
-				$server->getUserFolder(),
+				$rootFolder->getUserFolder($userSession->getUser()->getUID()),
 				$c->get(UserConfig::class),
 				$c->get(ViewConfig::class),
 				$c->get(IL10N::class),
@@ -92,15 +95,18 @@ public function register(IRegistrationContext $context): void {
 		/**
 		 * Services
 		 */
-		$context->registerService(TagService::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+		$context->registerService(TagService::class, function (ContainerInterface $c): TagService {
+			/** @var IUserSession $userSession */
+			$userSession = $c->get(IUserSession::class);
+
+			/** @var IRootFolder $rootFolder */
+			$rootFolder = $c->get(IRootFolder::class);
 
 			return new TagService(
-				$c->get(IUserSession::class),
+				$userSession,
 				$c->get(IActivityManager::class),
 				$c->get(ITagManager::class)->load(self::APP_ID),
-				$server->getUserFolder(),
+				$rootFolder->getUserFolder($userSession->getUser()->getUID()),
 			);
 		});
 
@@ -121,6 +127,12 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(LoadSearchPlugins::class, LoadSearchPluginsListener::class);
 		$context->registerEventListener(NodeAddedToFavorite::class, NodeAddedToFavoriteListener::class);
 		$context->registerEventListener(NodeRemovedFromFavorite::class, NodeRemovedFromFavoriteListener::class);
+
+
+		$context->registerEventListener(ShareCreatedEvent::class, Listener::class);
+		$context->registerEventListener(ShareDeletedEvent::class, Listener::class);
+		$context->registerEventListener(ShareDeletedFromSelfEvent::class, Listener::class);
+
 		$context->registerSearchProvider(FilesSearchProvider::class);
 
 		$context->registerNotifierService(Notifier::class);
@@ -131,16 +143,10 @@ public function register(IRegistrationContext $context): void {
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
-		$context->injectFn([Listener::class, 'register']);
-		$this->registerHooks();
+		$context->injectFn($this->registerCollaboration(...));
 	}
 
 	private function registerCollaboration(IProviderManager $providerManager): void {
 		$providerManager->registerResourceProvider(ResourceProvider::class);
 	}
-
-	private function registerHooks(): void {
-		Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
-	}
 }
diff --git a/apps/files/lib/Collaboration/Resources/Listener.php b/apps/files/lib/Collaboration/Resources/Listener.php
@@ -9,25 +9,29 @@
 namespace OCA\Files\Collaboration\Resources;
 
 use OCP\Collaboration\Resources\IManager;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Server;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Events\ShareDeletedEvent;
 use OCP\Share\Events\ShareDeletedFromSelfEvent;
 
-class Listener {
-	public static function register(IEventDispatcher $dispatcher): void {
-		$dispatcher->addListener(ShareCreatedEvent::class, [self::class, 'shareModification']);
-		$dispatcher->addListener(ShareDeletedEvent::class, [self::class, 'shareModification']);
-		$dispatcher->addListener(ShareDeletedFromSelfEvent::class, [self::class, 'shareModification']);
+/**
+ * @template-implements IEventListener<ShareCreatedEvent|ShareDeletedEvent|ShareDeletedFromSelfEvent>
+ */
+class Listener implements IEventListener {
+	public function __construct(
+		readonly protected IManager $resourceManager,
+		readonly protected ResourceProvider $resourceProvider,
+	) {
 	}
 
-	public static function shareModification(): void {
-		/** @var IManager $resourceManager */
-		$resourceManager = Server::get(IManager::class);
-		/** @var ResourceProvider $resourceProvider */
-		$resourceProvider = Server::get(ResourceProvider::class);
+	public function handle(Event $event): void {
+		if ($event instanceof ShareDeletedFromSelfEvent || $event instanceof ShareDeletedEvent || $event instanceof ShareCreatedEvent) {
+			$this->shareModification();
+		}
+	}
 
-		$resourceManager->invalidateAccessCacheForProvider($resourceProvider);
+	public function shareModification(): void {
+		$this->resourceManager->invalidateAccessCacheForProvider($this->resourceProvider);
 	}
 }
diff --git a/apps/files_sharing/lib/Listener/LoadAdditionalListener.php b/apps/files_sharing/lib/Listener/LoadAdditionalListener.php
@@ -28,7 +28,7 @@ public function handle(Event $event): void {
 		Util::addStyle(Application::APP_ID, 'icons');
 
 		$shareManager = Server::get(IManager::class);
-		if ($shareManager->shareApiEnabled() && class_exists('\OCA\Files\App')) {
+		if ($shareManager->shareApiEnabled()) {
 			Util::addInitScript(Application::APP_ID, 'init');
 		}
 	}
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -1201,17 +1201,6 @@
       <code><![CDATA[$this->fileIsEncrypted]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="apps/files/lib/AppInfo/Application.php">
-    <DeprecatedInterface>
-      <code><![CDATA[$server]]></code>
-      <code><![CDATA[$server]]></code>
-    </DeprecatedInterface>
-    <DeprecatedMethod>
-      <code><![CDATA[Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig')]]></code>
-      <code><![CDATA[getUserFolder]]></code>
-      <code><![CDATA[getUserFolder]]></code>
-    </DeprecatedMethod>
-  </file>
   <file src="apps/files/lib/BackgroundJob/ScanFiles.php">
     <DeprecatedClass>
       <code><![CDATA[\OC_Util::tearDownFS()]]></code>
@@ -2083,7 +2072,6 @@
   <file src="apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php">
     <DeprecatedMethod>
       <code><![CDATA[hasAnnotation]]></code>
-      <code><![CDATA[hasAnnotation]]></code>
     </DeprecatedMethod>
     <InvalidReturnType>
       <code><![CDATA[Response]]></code>
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
@@ -12,6 +12,7 @@
 use OC\CapabilitiesManager;
 use OC\Core\AppInfo\ConfigLexicon;
 use OC\Files\FilenameValidator;
+use OCA\Files\Service\ChunkedUploadConfig;
 use OCA\Provisioning_API\Controller\AUserDataOCSController;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
@@ -256,7 +257,10 @@ public function getConfig(): string {
 					'defaultRemoteExpireDateEnabled' => $defaultRemoteExpireDateEnabled,
 					'defaultRemoteExpireDate' => $defaultRemoteExpireDate,
 					'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced,
-				]
+				],
+				'files' => [
+					'max_chunk_size' => ChunkedUploadConfig::getMaxChunkSize(),
+				],
 			]),
 			'_theme' => json_encode([
 				'entity' => $this->defaults->getEntity(),
@@ -287,9 +291,6 @@ public function getConfig(): string {
 		$this->initialStateService->provideInitialState('core', 'config', $config);
 		$this->initialStateService->provideInitialState('core', 'capabilities', $capabilities);
 
-		// Allow hooks to modify the output values
-		\OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);
-
 		$result = '';
 
 		// Echo it

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function handle(Event $event): void {`
`28`	`28`	`Util::addStyle(Application::APP_ID, 'icons');`
`29`	`29`
`30`	`30`	`$shareManager = Server::get(IManager::class);`
`31`		`- if ($shareManager->shareApiEnabled() && class_exists('\OCA\Files\App')) {`
	`31`	`+ if ($shareManager->shareApiEnabled()) {`
`32`	`32`	`Util::addInitScript(Application::APP_ID, 'init');`
`33`	`33`	`}`
`34`	`34`	`}`