From 4fd6ad51ccb931b21668dabc92e05ad577946477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20P=C3=A9rez=20Arnaud?= Date: Fri, 19 Jun 2026 12:51:07 +0200 Subject: [PATCH] fix(federatedfilesharing): use DI in migration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Enrique Pérez Arnaud --- .../Version1012Date20260306120000.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/federatedfilesharing/lib/Migration/Version1012Date20260306120000.php b/apps/federatedfilesharing/lib/Migration/Version1012Date20260306120000.php index d34f05427ae04..5e92f8c04d581 100644 --- a/apps/federatedfilesharing/lib/Migration/Version1012Date20260306120000.php +++ b/apps/federatedfilesharing/lib/Migration/Version1012Date20260306120000.php @@ -19,7 +19,6 @@ use OCP\IUserManager; use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; -use OCP\Server; use OCP\Share\IShare; /** @@ -36,6 +35,13 @@ * oc_authtoken are silently repaired. */ class Version1012Date20260306120000 extends SimpleMigrationStep { + public function __construct( + private readonly IDBConnection $db, + private readonly PublicKeyTokenProvider $tokenProvider, + private readonly IUserManager $userManager, + ) { + } + #[\Override] public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { return null; @@ -43,11 +49,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt #[\Override] public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void { - $db = Server::get(IDBConnection::class); - $tokenProvider = Server::get(PublicKeyTokenProvider::class); - $userManager = Server::get(IUserManager::class); - - $qb = $db->getQueryBuilder(); + $qb = $this->db->getQueryBuilder(); $result = $qb->select('id', 'token', 'uid_initiator') ->from('share') ->where($qb->expr()->in( @@ -78,18 +80,18 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array // Long token — check if it's already in oc_authtoken. try { - $tokenProvider->getToken($token); + $this->tokenProvider->getToken($token); $skipped++; continue; } catch (InvalidTokenException) { // Not registered yet — fall through to create it. } - $user = $userManager->get($uid); + $user = $this->userManager->get($uid); $name = $user?->getDisplayName() ?? $uid; try { - $tokenProvider->generateToken( + $this->tokenProvider->generateToken( $token, $uid, $uid,