diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 247a140223d..9ecd43e8c70 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -477,6 +477,7 @@ return array( 'OCP\\Files\\IMimeTypeDetector' => $baseDir . '/lib/public/Files/IMimeTypeDetector.php', 'OCP\\Files\\IMimeTypeLoader' => $baseDir . '/lib/public/Files/IMimeTypeLoader.php', 'OCP\\Files\\IRootFolder' => $baseDir . '/lib/public/Files/IRootFolder.php', + 'OCP\\Files\\ISetupManager' => $baseDir . '/lib/public/Files/ISetupManager.php', 'OCP\\Files\\InvalidCharacterInPathException' => $baseDir . '/lib/public/Files/InvalidCharacterInPathException.php', 'OCP\\Files\\InvalidContentException' => $baseDir . '/lib/public/Files/InvalidContentException.php', 'OCP\\Files\\InvalidDirectoryException' => $baseDir . '/lib/public/Files/InvalidDirectoryException.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 9f3d6c2c3dd..ca4e1fa53de 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -518,6 +518,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Files\\IMimeTypeDetector' => __DIR__ . '/../../..' . '/lib/public/Files/IMimeTypeDetector.php', 'OCP\\Files\\IMimeTypeLoader' => __DIR__ . '/../../..' . '/lib/public/Files/IMimeTypeLoader.php', 'OCP\\Files\\IRootFolder' => __DIR__ . '/../../..' . '/lib/public/Files/IRootFolder.php', + 'OCP\\Files\\ISetupManager' => __DIR__ . '/../../..' . '/lib/public/Files/ISetupManager.php', 'OCP\\Files\\InvalidCharacterInPathException' => __DIR__ . '/../../..' . '/lib/public/Files/InvalidCharacterInPathException.php', 'OCP\\Files\\InvalidContentException' => __DIR__ . '/../../..' . '/lib/public/Files/InvalidContentException.php', 'OCP\\Files\\InvalidDirectoryException' => __DIR__ . '/../../..' . '/lib/public/Files/InvalidDirectoryException.php', diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index 393a6a7de0f..a39a1d11b1b 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -1,11 +1,12 @@ setupBuiltinWrappersDone) { return; } @@ -256,9 +257,7 @@ class SetupManager { $updatingProviders = false; } - /** - * Setup the full filesystem for the specified user - */ + #[Override] public function setupForUser(IUser $user): void { if ($this->isSetupComplete($user)) { return; @@ -711,7 +710,8 @@ class SetupManager { $this->eventLogger->end('fs:setup:user:providers'); } - public function tearDown() { + #[Override] + public function tearDown(): void { $this->setupUsers = []; $this->setupUsersComplete = []; $this->setupUserMountProviders = []; diff --git a/lib/private/Server.php b/lib/private/Server.php index 04db3eea842..a14ff622647 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -287,6 +287,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class); $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class); + $this->registerAlias(\OCP\Files\ISetupManager::class, \OC\Files\SetupManager::class); $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class); $this->registerAlias(ITemplateManager::class, TemplateManager::class); diff --git a/lib/public/Files/ISetupManager.php b/lib/public/Files/ISetupManager.php new file mode 100644 index 00000000000..6567fea30cb --- /dev/null +++ b/lib/public/Files/ISetupManager.php @@ -0,0 +1,33 @@ +