From 1a4e9cc7cfab692f567eb41c6af755a3473e8196 Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Mon, 27 Jul 2026 20:27:44 +0200 Subject: [PATCH] chore: run composer cs:fix to satisfy php-cs Formatting only, no behaviour change: blank-line fixers from php-cs-fixer 3.95.17. No non-blank lines are altered. Signed-off-by: Anna Larch --- lib/AppInfo/Application.php | 1 + lib/BackgroundJob/EmailNotification.php | 1 + lib/BackgroundJob/ExpireActivities.php | 1 + lib/Consumer.php | 1 + lib/Controller/APIv2Controller.php | 1 + lib/Controller/ActivitiesController.php | 1 + lib/Controller/FeedController.php | 1 + lib/Controller/SettingsController.php | 1 + lib/Data.php | 1 + lib/Event/LoadAdditionalScriptsEvent.php | 1 + lib/FilesHooks.php | 5 ----- lib/GroupHelper.php | 1 + lib/Listener/AddMissingIndicesListener.php | 1 - lib/Migration/Version2010Date20190416112817.php | 1 + lib/Migration/Version2011Date20201006132544.php | 1 + lib/Migration/Version2011Date20201006132545.php | 1 + lib/Migration/Version2011Date20201006132546.php | 1 + lib/Migration/Version2011Date20201006132547.php | 1 + lib/Settings/Personal.php | 1 - tests/Controller/FeedControllerTest.php | 1 - tests/CurrentUserTest.php | 1 - tests/GroupHelperTest.php | 1 - tests/MailQueueHandlerTest.php | 1 - 23 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 312aab673..aee7f9c98 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\AppInfo; use OC\DB\ConnectionAdapter; diff --git a/lib/BackgroundJob/EmailNotification.php b/lib/BackgroundJob/EmailNotification.php index 594b980f0..d19fe438d 100644 --- a/lib/BackgroundJob/EmailNotification.php +++ b/lib/BackgroundJob/EmailNotification.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\BackgroundJob; use OCA\Activity\MailQueueHandler; diff --git a/lib/BackgroundJob/ExpireActivities.php b/lib/BackgroundJob/ExpireActivities.php index f9d580198..de84d9246 100644 --- a/lib/BackgroundJob/ExpireActivities.php +++ b/lib/BackgroundJob/ExpireActivities.php @@ -6,6 +6,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\BackgroundJob; use OCA\Activity\Data; diff --git a/lib/Consumer.php b/lib/Consumer.php index 0125049dc..cbbd6d763 100644 --- a/lib/Consumer.php +++ b/lib/Consumer.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity; use OCP\Activity\ActivitySettings; diff --git a/lib/Controller/APIv2Controller.php b/lib/Controller/APIv2Controller.php index 2270bef69..904569859 100644 --- a/lib/Controller/APIv2Controller.php +++ b/lib/Controller/APIv2Controller.php @@ -6,6 +6,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\Controller; use OCA\Activity\Data; diff --git a/lib/Controller/ActivitiesController.php b/lib/Controller/ActivitiesController.php index f5be92130..bdb270ddc 100644 --- a/lib/Controller/ActivitiesController.php +++ b/lib/Controller/ActivitiesController.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\Controller; use OCA\Activity\Data; diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php index fbcf6b0c1..2357a63c6 100644 --- a/lib/Controller/FeedController.php +++ b/lib/Controller/FeedController.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\Controller; use OCA\Activity\Data; diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 02be39ec4..4d54c2f49 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity\Controller; use OCA\Activity\CurrentUser; diff --git a/lib/Data.php b/lib/Data.php index 7a58aa9df..d27a4f3bc 100644 --- a/lib/Data.php +++ b/lib/Data.php @@ -6,6 +6,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity; use Doctrine\DBAL\Platforms\MySQLPlatform; diff --git a/lib/Event/LoadAdditionalScriptsEvent.php b/lib/Event/LoadAdditionalScriptsEvent.php index 36dc90bd4..17aa6bb63 100644 --- a/lib/Event/LoadAdditionalScriptsEvent.php +++ b/lib/Event/LoadAdditionalScriptsEvent.php @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Event; use OCP\EventDispatcher\Event; diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php index df65fbe79..26f2575ca 100644 --- a/lib/FilesHooks.php +++ b/lib/FilesHooks.php @@ -301,7 +301,6 @@ public function fileMove($oldPath, $newPath) { } } - /** * Store the move hook events * @@ -328,7 +327,6 @@ public function fileMovePost($oldPath, $newPath) { $this->moveCase = false; } - /** * Renaming a file inside the same folder (a/b to a/c) * @@ -1246,7 +1244,6 @@ protected function commitActivityTransaction(bool $shouldFlush): void { $this->connection->commit(); } - /** * @param int $fileId * @@ -1275,7 +1272,6 @@ private function getAffectedUsersFromCachedMounts(int $fileId): array { }, ARRAY_FILTER_USE_KEY); } - /** * returns an array of users that have confirmed no access to fileId * @@ -1400,7 +1396,6 @@ private function getUnrelatedUsers(int $fileId, array $cachedMounts): array { } } - // now that we have a list of eventuals filtered users, we confirm they have no access to the file $filteredUsers = []; foreach ($usersToCheck as $userId) { diff --git a/lib/GroupHelper.php b/lib/GroupHelper.php index fbbf817e7..c89402137 100644 --- a/lib/GroupHelper.php +++ b/lib/GroupHelper.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OCA\Activity; use OCP\Activity\Exceptions\UnknownActivityException; diff --git a/lib/Listener/AddMissingIndicesListener.php b/lib/Listener/AddMissingIndicesListener.php index aa2008466..757466d38 100644 --- a/lib/Listener/AddMissingIndicesListener.php +++ b/lib/Listener/AddMissingIndicesListener.php @@ -17,7 +17,6 @@ */ class AddMissingIndicesListener implements IEventListener { #[\Override] - public function handle(Event $event): void { if (!($event instanceof AddMissingIndicesEvent)) { return; diff --git a/lib/Migration/Version2010Date20190416112817.php b/lib/Migration/Version2010Date20190416112817.php index 5413fda18..e039faa48 100644 --- a/lib/Migration/Version2010Date20190416112817.php +++ b/lib/Migration/Version2010Date20190416112817.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Migration; use Closure; diff --git a/lib/Migration/Version2011Date20201006132544.php b/lib/Migration/Version2011Date20201006132544.php index 5fa52acf9..fed6b1368 100644 --- a/lib/Migration/Version2011Date20201006132544.php +++ b/lib/Migration/Version2011Date20201006132544.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Migration; use Closure; diff --git a/lib/Migration/Version2011Date20201006132545.php b/lib/Migration/Version2011Date20201006132545.php index 0d4bfbc37..13ce41688 100644 --- a/lib/Migration/Version2011Date20201006132545.php +++ b/lib/Migration/Version2011Date20201006132545.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Migration; use Closure; diff --git a/lib/Migration/Version2011Date20201006132546.php b/lib/Migration/Version2011Date20201006132546.php index f75eb572c..68940e7fb 100644 --- a/lib/Migration/Version2011Date20201006132546.php +++ b/lib/Migration/Version2011Date20201006132546.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Migration; use Closure; diff --git a/lib/Migration/Version2011Date20201006132547.php b/lib/Migration/Version2011Date20201006132547.php index 0fe1c7b99..61a91ec98 100644 --- a/lib/Migration/Version2011Date20201006132547.php +++ b/lib/Migration/Version2011Date20201006132547.php @@ -5,6 +5,7 @@ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ + namespace OCA\Activity\Migration; use Closure; diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php index 12d11d83e..ccc9fcd04 100644 --- a/lib/Settings/Personal.php +++ b/lib/Settings/Personal.php @@ -127,7 +127,6 @@ public function getForm(): TemplateResponse { $this->initialState->provideInitialState('methods', $methods); $this->initialState->provideInitialState('activity_digest_enabled', $this->userSettings->getUserSetting($this->userId, 'setting', 'activity_digest')); - return new TemplateResponse('activity', 'settings/personal', [ 'setting' => 'personal', 'activityGroups' => $activityGroups, diff --git a/tests/Controller/FeedControllerTest.php b/tests/Controller/FeedControllerTest.php index da963ada3..2a4394016 100644 --- a/tests/Controller/FeedControllerTest.php +++ b/tests/Controller/FeedControllerTest.php @@ -83,7 +83,6 @@ protected function setUp(): void { ); } - public static function showData(): array { return [ ['application/rss+xml', 'application/rss+xml'], diff --git a/tests/CurrentUserTest.php b/tests/CurrentUserTest.php index 28a28ce6a..db447a55f 100644 --- a/tests/CurrentUserTest.php +++ b/tests/CurrentUserTest.php @@ -151,7 +151,6 @@ protected function getShareMock(array $share): IShare|Exception|null { } [$type, $shareWith] = $share; - $share = $this->createMock(IShare::class); $share->expects($this->once()) ->method('getShareType') diff --git a/tests/GroupHelperTest.php b/tests/GroupHelperTest.php index 1f4a53219..a5280b05e 100644 --- a/tests/GroupHelperTest.php +++ b/tests/GroupHelperTest.php @@ -176,7 +176,6 @@ public function testGetEventFromArray(array $activity): void { $this->assertSame($event, $instance); } - protected function createEvent(array $data): IEvent { /** @var IEvent|MockObject $event */ $event = $this->createMock(IEvent::class); diff --git a/tests/MailQueueHandlerTest.php b/tests/MailQueueHandlerTest.php index 437d8c0bb..c1f45f684 100644 --- a/tests/MailQueueHandlerTest.php +++ b/tests/MailQueueHandlerTest.php @@ -76,7 +76,6 @@ class MailQueueHandlerTest extends TestCase { protected UserSettings&MockObject $userSettings; protected IEmailValidator&MockObject $emailValidator; - protected function setUp(): void { parent::setUp();