From c32ac2870c4032adf01ac34cf101d6ccbe3e894d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 28 May 2025 14:58:38 +0200 Subject: [PATCH 1/5] fix: use shared_by user in share mail if initiator is not set Signed-off-by: Robin Appelman --- lib/Listeners/Files/ShareCreatedSendMail.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/Listeners/Files/ShareCreatedSendMail.php b/lib/Listeners/Files/ShareCreatedSendMail.php index c205df367..20827c493 100644 --- a/lib/Listeners/Files/ShareCreatedSendMail.php +++ b/lib/Listeners/Files/ShareCreatedSendMail.php @@ -32,6 +32,7 @@ use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; +use OCP\IUserManager; /** @template-implements IEventListener */ class ShareCreatedSendMail implements IEventListener { @@ -56,6 +57,8 @@ class ShareCreatedSendMail implements IEventListener { /** @var ContactService */ private $contactService; + /** @var IUserManager */ + private $userManager; public function __construct( ShareWrapperService $shareWrapperService, @@ -64,6 +67,7 @@ public function __construct( SendMailService $sendMailService, ContactService $contactService, ConfigService $configService, + IUserManager $userManager, ) { $this->shareWrapperService = $shareWrapperService; $this->shareTokenService = $shareTokenService; @@ -71,6 +75,7 @@ public function __construct( $this->sendMailService = $sendMailService; $this->contactService = $contactService; $this->configService = $configService; + $this->userManager = $userManager; $this->setup('app', Application::APP_ID); } @@ -127,6 +132,8 @@ public function handle(Event $event): void { if (!is_null($share)) { if ($share->hasInitiator()) { $author = $share->getInitiator()->getDisplayName(); + } elseif ($user = $this->userManager->get($share->getSharedBy())) { + $author = $user->getDisplayName(); } else { $author = 'someone'; } From 5839733571e543b9a2e3312b22cb9b994a93a459 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 28 May 2025 15:06:24 +0200 Subject: [PATCH 2/5] chore(tests): Cleanup bootstrap.php to be forward-compatible Signed-off-by: Robin Appelman --- tests/bootstrap.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 5c461d186..07f08e6ed 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -6,13 +6,19 @@ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -define('PHPUNIT_RUN', 1); + +use OCP\App\IAppManager; +use OCP\Server; + +if (!defined('PHPUNIT_RUN')) { + define('PHPUNIT_RUN', 1); +} require_once __DIR__ . '/../../../lib/base.php'; require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/../../../tests/autoload.php'; -\OC_App::loadApp('circles'); +Server::get(IAppManager::class)->loadApp('circles'); OC_Hook::clear(); From fdba1e7e63da1078cf584bc94a2f99a59f56db01 Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Fri, 4 Jul 2025 17:26:51 +0200 Subject: [PATCH 3/5] fix(circles): wrong class type causing autoloader exception Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- lib/Service/SyncService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Service/SyncService.php b/lib/Service/SyncService.php index 5de118a4f..e10ef3287 100644 --- a/lib/Service/SyncService.php +++ b/lib/Service/SyncService.php @@ -79,7 +79,7 @@ class SyncService { /** @var FederatedUserService */ private $federatedUserService; - /** @var federatedEventService */ + /** @var FederatedEventService */ private $federatedEventService; /** @var CircleService */ @@ -103,7 +103,7 @@ class SyncService { * @param CircleRequest $circleRequest * @param MemberRequest $memberRequest * @param FederatedUserService $federatedUserService - * @param federatedEventService $federatedEventService + * @param FederatedEventService $federatedEventService * @param CircleService $circleService * @param MembershipService $membershipService * @param OutputService $outputService @@ -115,7 +115,7 @@ public function __construct( CircleRequest $circleRequest, MemberRequest $memberRequest, FederatedUserService $federatedUserService, - federatedEventService $federatedEventService, + FederatedEventService $federatedEventService, CircleService $circleService, MembershipService $membershipService, OutputService $outputService, From ce7278d970282f92bdc99d10340c96b81daa0bc6 Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:19:18 +0200 Subject: [PATCH 4/5] fix(ci): use psalm with 1 thread Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- .github/workflows/psalm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index e9258903b..0b89569c9 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -41,4 +41,4 @@ jobs: run: composer i - name: Run coding standards check - run: composer run psalm + run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github From 3aa58b7bd4afbff09181ce767d2465f73768c70f Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:10:31 +0200 Subject: [PATCH 5/5] fix(ci): remove wrong baseline-entry for SyncService Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- tests/psalm-baseline.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 24c0b3ca5..6def66372 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -240,12 +240,6 @@ - - - - - -