refactor: inject $userId instead of $UserId

lib/AppInfo/Application.php

@@ -106,7 +106,7 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerService('userFolder', static function (ContainerInterface $c) {
 			$userContainer = $c->get(IServerContainer::class);
-			$uid = $c->get('UserId');
+			$uid = $c->get('userId');
 
 			return $userContainer->getUserFolder($uid);
 		});

lib/Controller/AccountsController.php

@@ -57,7 +57,7 @@ public function __construct(
 		string $appName,
 		IRequest $request,
 		AccountService $accountService,
-		$UserId,
+		$userId,
 		LoggerInterface $logger,
 		IL10N $l10n,
 		AliasesService $aliasesService,
@@ -72,7 +72,7 @@ public function __construct(
 	) {
 		parent::__construct($appName, $request);
 		$this->accountService = $accountService;
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->logger = $logger;
 		$this->l10n = $l10n;
 		$this->aliasesService = $aliasesService;

lib/Controller/AliasesController.php

@@ -27,10 +27,10 @@ class AliasesController extends Controller {
 	public function __construct(string $appName,
 		IRequest $request,
 		AliasesService $aliasesService,
-		string $UserId) {
+		string $userId) {
 		parent::__construct($appName, $request);
 		$this->aliasService = $aliasesService;
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 	}
 
 	/**

lib/Controller/AvatarsController.php

@@ -27,11 +27,11 @@ class AvatarsController extends Controller {
 	public function __construct(string $appName,
 		IRequest $request,
 		IAvatarService $avatarService,
-		string $UserId) {
+		string $userId) {
 		parent::__construct($appName, $request);
 
 		$this->avatarService = $avatarService;
-		$this->uid = $UserId;
+		$this->uid = $userId;
 	}
 
 	/**

lib/Controller/ContactIntegrationController.php

@@ -30,12 +30,12 @@ public function __construct(string $appName,
 		IRequest $request,
 		ContactIntegrationService $service,
 		ICacheFactory $cacheFactory,
-		string $UserId) {
+		string $userId) {
 		parent::__construct($appName, $request);
 
 		$this->service = $service;
 		$this->cache = $cacheFactory->createLocal('mail.contacts');
-		$this->uid = $UserId;
+		$this->uid = $userId;
 	}
 
 	/**

lib/Controller/DraftsController.php

@@ -33,14 +33,14 @@ class DraftsController extends Controller {
 
 
 	public function __construct(string $appName,
-		$UserId,
+		$userId,
 		IRequest $request,
 		DraftsService $service,
 		AccountService $accountService,
 		ITimeFactory $timeFactory,
 		SmimeService $smimeService) {
 		parent::__construct($appName, $request);
-		$this->userId = $UserId;
+		$this->userId = $userId;
 		$this->service = $service;
 		$this->accountService = $accountService;
 		$this->timeFactory = $timeFactory;

lib/Controller/GoogleIntegrationController.php

@@ -38,13 +38,13 @@ class GoogleIntegrationController extends Controller {
 
 
 	public function __construct(IRequest $request,
-		?string $UserId,
+		?string $userId,
 		GoogleIntegration $googleIntegration,
 		AccountService $accountService,
 		LoggerInterface $logger,
 		MailboxSync $mailboxSync) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->userId = $UserId;
+		$this->userId = $userId;
 		$this->googleIntegration = $googleIntegration;
 		$this->accountService = $accountService;
 		$this->logger = $logger;

lib/Controller/LocalAttachmentsController.php

@@ -31,10 +31,10 @@ class LocalAttachmentsController extends Controller {
 	 * @param string $UserId
 	 */
 	public function __construct(string $appName, IRequest $request,
-		IAttachmentService $attachmentService, $UserId) {
+		IAttachmentService $attachmentService, $userId) {
 		parent::__construct($appName, $request);
 		$this->attachmentService = $attachmentService;
-		$this->userId = $UserId;
+		$this->userId = $userId;
 	}
 
 	/**

lib/Controller/MailboxesController.php

@@ -43,7 +43,7 @@ public function __construct(
 		string $appName,
 		IRequest $request,
 		AccountService $accountService,
-		?string $UserId,
+		?string $userId,
 		IMailManager $mailManager,
 		SyncService $syncService,
 		private readonly IConfig $config,
@@ -52,7 +52,7 @@ public function __construct(
 		parent::__construct($appName, $request);
 
 		$this->accountService = $accountService;
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->mailManager = $mailManager;
 		$this->syncService = $syncService;
 	}

lib/Controller/MessagesController.php

@@ -83,7 +83,7 @@ public function __construct(
 		IMailManager $mailManager,
 		IMailSearch $mailSearch,
 		ItineraryService $itineraryService,
-		?string $UserId,
+		?string $userId,
 		$userFolder,
 		LoggerInterface $logger,
 		IL10N $l10n,
@@ -105,7 +105,7 @@ public function __construct(
 		$this->mailManager = $mailManager;
 		$this->mailSearch = $mailSearch;
 		$this->itineraryService = $itineraryService;
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->userFolder = $userFolder;
 		$this->logger = $logger;
 		$this->l10n = $l10n;

lib/Controller/MicrosoftIntegrationController.php

@@ -31,12 +31,12 @@ class MicrosoftIntegrationController extends Controller {
 	private LoggerInterface $logger;
 
 	public function __construct(IRequest $request,
-		?string $UserId,
+		?string $userId,
 		AccountService $accountService,
 		MicrosoftIntegration $microsoftIntegration,
 		LoggerInterface $logger) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->userId = $UserId;
+		$this->userId = $userId;
 		$this->accountService = $accountService;
 		$this->microsoftIntegration = $microsoftIntegration;
 		$this->logger = $logger;

lib/Controller/OutboxController.php

@@ -31,13 +31,13 @@ class OutboxController extends Controller {
 	private SmimeService $smimeService;
 
 	public function __construct(string $appName,
-		$UserId,
+		$userId,
 		IRequest $request,
 		OutboxService $service,
 		AccountService $accountService,
 		SmimeService $smimeService) {
 		parent::__construct($appName, $request);
-		$this->userId = $UserId;
+		$this->userId = $userId;
 		$this->service = $service;
 		$this->accountService = $accountService;
 		$this->smimeService = $smimeService;

lib/Controller/PageController.php

@@ -83,7 +83,7 @@ public function __construct(
 		IConfig $config,
 		AccountService $accountService,
 		AliasesService $aliasesService,
-		?string $UserId,
+		?string $userId,
 		IUserSession $userSession,
 		IUserPreferences $preferences,
 		IMailManager $mailManager,
@@ -109,7 +109,7 @@ public function __construct(
 		$this->config = $config;
 		$this->accountService = $accountService;
 		$this->aliasesService = $aliasesService;
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->userSession = $userSession;
 		$this->preferences = $preferences;
 		$this->mailManager = $mailManager;

lib/Controller/PreferencesController.php

@@ -27,11 +27,11 @@ class PreferencesController extends Controller {
 	 * @param IUserPreferences $userPreference
 	 * @param string $UserId
 	 */
-	public function __construct(IRequest $request, IUserPreferences $userPreference, string $UserId) {
+	public function __construct(IRequest $request, IUserPreferences $userPreference, string $userId) {
 		parent::__construct('mail', $request);
 
 		$this->userPreference = $userPreference;
-		$this->userId = $UserId;
+		$this->userId = $userId;
 	}
 
 	/**

lib/Controller/SieveController.php

@@ -39,7 +39,7 @@ class SieveController extends Controller {
 
 	public function __construct(
 		IRequest $request,
-		string $UserId,
+		string $userId,
 		MailAccountMapper $mailAccountMapper,
 		SieveClientFactory $sieveClientFactory,
 		ICrypto $crypto,
@@ -48,7 +48,7 @@ public function __construct(
 		private SieveService $sieveService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->mailAccountMapper = $mailAccountMapper;
 		$this->sieveClientFactory = $sieveClientFactory;
 		$this->crypto = $crypto;

lib/Controller/TagsController.php

@@ -30,12 +30,12 @@ class TagsController extends Controller {
 
 
 	public function __construct(IRequest $request,
-		string $UserId,
+		string $userId,
 		IMailManager $mailManager,
 		AccountService $accountService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->mailManager = $mailManager;
 		$this->accountService = $accountService;
 	}

lib/Controller/ThreadController.php

@@ -36,14 +36,14 @@ class ThreadController extends Controller {
 
 	public function __construct(string $appName,
 		IRequest $request,
-		string $UserId,
+		string $userId,
 		AccountService $accountService,
 		IMailManager $mailManager,
 		SnoozeService $snoozeService,
 		AiIntegrationsService $aiIntergrationsService,
 		LoggerInterface $logger) {
 		parent::__construct($appName, $request);
-		$this->currentUserId = $UserId;
+		$this->currentUserId = $userId;
 		$this->accountService = $accountService;
 		$this->mailManager = $mailManager;
 		$this->snoozeService = $snoozeService;

lib/Controller/TrustedSendersController.php

@@ -24,11 +24,11 @@ class TrustedSendersController extends Controller {
 	private ITrustedSenderService $trustedSenderService;
 
 	public function __construct(IRequest $request,
-		?string $UserId,
+		?string $userId,
 		ITrustedSenderService $trustedSenderService) {
 		parent::__construct(Application::APP_ID, $request);
 
-		$this->uid = $UserId;
+		$this->uid = $userId;
 		$this->trustedSenderService = $trustedSenderService;
 	}
 

tests/Unit/Controller/SieveControllerTest.php

@@ -40,7 +40,7 @@ protected function setUp(): void {
 			SieveController::class,
 			[
 				'hostValidator' => $this->remoteHostValidator,
-				'UserId' => '1',
+				'userId' => '1',
 			]
 		);
 		$this->sieveController = $this->serviceMock->getService();

tests/Unit/Controller/TagsControllerTest.php

@@ -29,7 +29,7 @@ protected function setUp(): void {
 		parent::setUp();
 		$this->serviceMock = $this->createServiceMock(
 			TagsController::class,
-			['UserId' => '1']
+			['userId' => '1']
 		);
 		$this->mailManager = $this->serviceMock->getParameter('mailManager');
 		$this->tagsController = $this->serviceMock->getService();

tests/Unit/Controller/TrustedSendersControllerTest.php

@@ -16,7 +16,7 @@
 class TrustedSendersControllerTest extends TestCase {
 	public function testSetTrustedNullUser(): void {
 		$serviceMock = $this->createServiceMock(TrustedSendersController::class, [
-			'UserId' => null,
+			'userId' => null,
 		]);
 
 		$response = $serviceMock->getService()->setTrusted('sender@example.com', 'individual');
@@ -26,7 +26,7 @@ public function testSetTrustedNullUser(): void {
 
 	public function testRemoveTrustNullUser(): void {
 		$serviceMock = $this->createServiceMock(TrustedSendersController::class, [
-			'UserId' => null,
+			'userId' => null,
 		]);
 
 		$response = $serviceMock->getService()->removeTrust('sender@example.com', 'individual');
@@ -36,7 +36,7 @@ public function testRemoveTrustNullUser(): void {
 
 	public function testListNullUser(): void {
 		$serviceMock = $this->createServiceMock(TrustedSendersController::class, [
-			'UserId' => null,
+			'userId' => null,
 		]);
 
 		$response = $serviceMock->getService()->list();