diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 7dab0db899..71b50051c4 100644 --- a/lib/AppInfo/Application.php +++ b/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); }); diff --git a/lib/Controller/AccountsController.php b/lib/Controller/AccountsController.php index 47411722d3..974b0d89df 100644 --- a/lib/Controller/AccountsController.php +++ b/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; diff --git a/lib/Controller/AliasesController.php b/lib/Controller/AliasesController.php index 641ef0e7b7..ccdf08d47a 100644 --- a/lib/Controller/AliasesController.php +++ b/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; } /** diff --git a/lib/Controller/AvatarsController.php b/lib/Controller/AvatarsController.php index 431600bfb9..f90daa9de8 100644 --- a/lib/Controller/AvatarsController.php +++ b/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; } /** diff --git a/lib/Controller/ContactIntegrationController.php b/lib/Controller/ContactIntegrationController.php index 7f4dccecc6..9847f4f6d3 100644 --- a/lib/Controller/ContactIntegrationController.php +++ b/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; } /** diff --git a/lib/Controller/DraftsController.php b/lib/Controller/DraftsController.php index a7351f8bde..f1a98cee76 100644 --- a/lib/Controller/DraftsController.php +++ b/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; diff --git a/lib/Controller/GoogleIntegrationController.php b/lib/Controller/GoogleIntegrationController.php index b61536e6f5..fca3cd1394 100644 --- a/lib/Controller/GoogleIntegrationController.php +++ b/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; diff --git a/lib/Controller/LocalAttachmentsController.php b/lib/Controller/LocalAttachmentsController.php index f4223404e5..f2ec33607d 100644 --- a/lib/Controller/LocalAttachmentsController.php +++ b/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; } /** diff --git a/lib/Controller/MailboxesController.php b/lib/Controller/MailboxesController.php index 825550a3d0..d391f2dee6 100644 --- a/lib/Controller/MailboxesController.php +++ b/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; } diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php index c462c91f03..84ebc9fab8 100755 --- a/lib/Controller/MessagesController.php +++ b/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; diff --git a/lib/Controller/MicrosoftIntegrationController.php b/lib/Controller/MicrosoftIntegrationController.php index c62bfaf7df..526b1bb523 100644 --- a/lib/Controller/MicrosoftIntegrationController.php +++ b/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; diff --git a/lib/Controller/OutboxController.php b/lib/Controller/OutboxController.php index 57e459c11e..f73c2551f6 100644 --- a/lib/Controller/OutboxController.php +++ b/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; diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index f5c32384c6..9c1f3ea6f0 100644 --- a/lib/Controller/PageController.php +++ b/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; diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php index e6ef3bd6d9..b2a3328322 100644 --- a/lib/Controller/PreferencesController.php +++ b/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; } /** diff --git a/lib/Controller/SieveController.php b/lib/Controller/SieveController.php index 300689014a..e38988cccc 100644 --- a/lib/Controller/SieveController.php +++ b/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; diff --git a/lib/Controller/TagsController.php b/lib/Controller/TagsController.php index c63cb4b235..78485d82c1 100644 --- a/lib/Controller/TagsController.php +++ b/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; } diff --git a/lib/Controller/ThreadController.php b/lib/Controller/ThreadController.php index 9265a5f62f..96aa68977f 100755 --- a/lib/Controller/ThreadController.php +++ b/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; diff --git a/lib/Controller/TrustedSendersController.php b/lib/Controller/TrustedSendersController.php index 047a66d9b7..9fa30fdeec 100644 --- a/lib/Controller/TrustedSendersController.php +++ b/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; } diff --git a/tests/Unit/Controller/SieveControllerTest.php b/tests/Unit/Controller/SieveControllerTest.php index 7402aa7287..c084c716ab 100644 --- a/tests/Unit/Controller/SieveControllerTest.php +++ b/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(); diff --git a/tests/Unit/Controller/TagsControllerTest.php b/tests/Unit/Controller/TagsControllerTest.php index 79e8e35f65..2718073a1f 100644 --- a/tests/Unit/Controller/TagsControllerTest.php +++ b/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(); diff --git a/tests/Unit/Controller/TrustedSendersControllerTest.php b/tests/Unit/Controller/TrustedSendersControllerTest.php index 6a51f2debc..89a581fe95 100644 --- a/tests/Unit/Controller/TrustedSendersControllerTest.php +++ b/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();