diff --git a/composer.lock b/composer.lock index df0aa874d..168963772 100644 --- a/composer.lock +++ b/composer.lock @@ -338,6 +338,52 @@ ], "time": "2022-12-30T00:15:36+00:00" }, + { + "name": "kubawerlos/php-cs-fixer-custom-fixers", + "version": "v3.22.0", + "source": { + "type": "git", + "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", + "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/8701394f0c7cd450ac4fa577d24589122c1d5d5e", + "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e", + "shasum": "" + }, + "require": { + "ext-filter": "*", + "ext-tokenizer": "*", + "friendsofphp/php-cs-fixer": "^3.61.1", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6.4 || ^10.5.29" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpCsFixerCustomFixers\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kuba Werłos", + "email": "werlos@gmail.com" + } + ], + "description": "A set of custom fixers for PHP CS Fixer", + "support": { + "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.22.0" + }, + "time": "2024-08-16T20:44:35+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -399,19 +445,20 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.2.3", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da" + "reference": "e88acb0df6217b808d1632286ddfec9267a102e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da", - "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/e88acb0df6217b808d1632286ddfec9267a102e4", + "reference": "e88acb0df6217b808d1632286ddfec9267a102e4", "shasum": "" }, "require": { + "kubawerlos/php-cs-fixer-custom-fixers": "^3.22", "php": "^7.3|^8.0", "php-cs-fixer/shim": "^3.17" }, @@ -434,9 +481,9 @@ "description": "Nextcloud coding standards for the php cs fixer", "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.3" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.3.1" }, - "time": "2024-08-23T14:32:32+00:00" + "time": "2024-09-19T09:07:10+00:00" }, { "name": "nextcloud/ocp", @@ -661,16 +708,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.62.0", + "version": "v3.64.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae" + "reference": "81ccfd24baf3a10810dab1152c403981a790b837" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/81ccfd24baf3a10810dab1152c403981a790b837", + "reference": "81ccfd24baf3a10810dab1152c403981a790b837", "shasum": "" }, "require": { @@ -707,9 +754,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.62.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.64.0" }, - "time": "2024-08-07T17:03:46+00:00" + "time": "2024-08-30T23:10:11+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index 56931c79c..e81c2aff8 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -100,7 +100,7 @@ class ActivityManager { StackMapper $stackMapper, AclMapper $aclMapper, IFactory $l10nFactory, - ?string $userId + ?string $userId, ) { $this->manager = $manager; $this->permissionService = $permissionsService; @@ -484,7 +484,7 @@ class ActivityManager { $objectId = $entity->getObjectId(); break; default: - throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); + throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); } return $this->cardMapper->find($objectId); } @@ -499,11 +499,11 @@ class ActivityManager { $objectId = $entity->getBoardId(); break; default: - throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); + throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); } return $this->boardMapper->find($objectId); } - throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); + throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); } private function findDetailsForStack($stackId) { diff --git a/lib/Activity/Filter.php b/lib/Activity/Filter.php index 182bc910c..981dda5fd 100644 --- a/lib/Activity/Filter.php +++ b/lib/Activity/Filter.php @@ -15,7 +15,7 @@ class Filter implements \OCP\Activity\IFilter { public function __construct( IL10N $l10n, - IURLGenerator $urlGenerator + IURLGenerator $urlGenerator, ) { $this->l10n = $l10n; $this->urlGenerator = $urlGenerator; diff --git a/lib/Command/BoardImport.php b/lib/Command/BoardImport.php index a0ddfb030..14cbfe2f9 100644 --- a/lib/Command/BoardImport.php +++ b/lib/Command/BoardImport.php @@ -15,7 +15,7 @@ use Symfony\Component\Console\Output\OutputInterface; class BoardImport extends Command { public function __construct( - private BoardImportCommandService $boardImportCommandService + private BoardImportCommandService $boardImportCommandService, ) { parent::__construct(); } diff --git a/lib/Command/TransferOwnership.php b/lib/Command/TransferOwnership.php index 392be112f..3a2fa6ae2 100644 --- a/lib/Command/TransferOwnership.php +++ b/lib/Command/TransferOwnership.php @@ -82,7 +82,7 @@ final class TransferOwnership extends Command { } if ($boardId) { - $output->writeln('Transfer board ' . $board->getTitle() . ' from '. $board->getOwner() ." to $newOwner"); + $output->writeln('Transfer board ' . $board->getTitle() . ' from ' . $board->getOwner() . " to $newOwner"); } else { $output->writeln("Transfer all boards from $owner to $newOwner"); } @@ -94,7 +94,7 @@ final class TransferOwnership extends Command { if ($boardId) { $this->boardService->transferBoardOwnership($boardId, $newOwner, $remapAssignment); - $output->writeln('Board ' . $board->getTitle() . ' from '. $board->getOwner() ." transferred to $newOwner completed"); + $output->writeln('Board ' . $board->getTitle() . ' from ' . $board->getOwner() . " transferred to $newOwner completed"); return 0; } diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php index 0823ab212..50f926148 100644 --- a/lib/Controller/SessionController.php +++ b/lib/Controller/SessionController.php @@ -21,7 +21,8 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; class SessionController extends OCSController { - public function __construct($appName, + public function __construct( + $appName, IRequest $request, private SessionService $sessionService, private PermissionService $permissionService, diff --git a/lib/Cron/ScheduledNotifications.php b/lib/Cron/ScheduledNotifications.php index 2c445399f..71d635b27 100644 --- a/lib/Cron/ScheduledNotifications.php +++ b/lib/Cron/ScheduledNotifications.php @@ -20,7 +20,7 @@ class ScheduledNotifications extends Job { ITimeFactory $time, protected CardMapper $cardMapper, protected NotificationHelper $notificationHelper, - protected LoggerInterface $logger + protected LoggerInterface $logger, ) { parent::__construct($time); } diff --git a/lib/DAV/DeckCalendarBackend.php b/lib/DAV/DeckCalendarBackend.php index 5b6821fb1..a83c7f9ed 100644 --- a/lib/DAV/DeckCalendarBackend.php +++ b/lib/DAV/DeckCalendarBackend.php @@ -32,7 +32,7 @@ class DeckCalendarBackend { public function __construct( BoardService $boardService, StackService $stackService, CardService $cardService, PermissionService $permissionService, - BoardMapper $boardMapper + BoardMapper $boardMapper, ) { $this->boardService = $boardService; $this->stackService = $stackService; diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php index 85a398fca..69ccc8708 100644 --- a/lib/Db/BoardMapper.php +++ b/lib/Db/BoardMapper.php @@ -31,7 +31,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper { private IUserManager $userManager, private IGroupManager $groupManager, private CirclesService $circlesService, - private LoggerInterface $logger + private LoggerInterface $logger, ) { parent::__construct($db, 'deck_boards', Board::class); diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php index f0d16b56b..1a584a65d 100644 --- a/lib/Db/CardMapper.php +++ b/lib/Db/CardMapper.php @@ -45,7 +45,7 @@ class CardMapper extends QBMapper implements IPermissionMapper { IManager $notificationManager, ICacheFactory $cacheFactory, $databaseType = 'sqlite3', - $database4ByteSupport = true + $database4ByteSupport = true, ) { parent::__construct($db, 'deck_cards', Card::class); $this->labelMapper = $labelMapper; @@ -402,7 +402,7 @@ class CardMapper extends QBMapper implements IPermissionMapper { if (count($query->getTag())) { foreach ($query->getTag() as $index => $tag) { $qb->innerJoin('c', 'deck_assigned_labels', 'al' . $index, $qb->expr()->eq('c.id', 'al' . $index . '.card_id')); - $qb->innerJoin('al'. $index, 'deck_labels', 'l' . $index, $qb->expr()->eq('al' . $index . '.label_id', 'l' . $index . '.id')); + $qb->innerJoin('al' . $index, 'deck_labels', 'l' . $index, $qb->expr()->eq('al' . $index . '.label_id', 'l' . $index . '.id')); $qb->andWhere($qb->expr()->iLike('l' . $index . '.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($tag->getValue()) . '%', IQueryBuilder::PARAM_STR))); } } diff --git a/lib/Db/ChangeHelper.php b/lib/Db/ChangeHelper.php index 1be2d9350..d3d1ee646 100644 --- a/lib/Db/ChangeHelper.php +++ b/lib/Db/ChangeHelper.php @@ -24,7 +24,7 @@ class ChangeHelper { IDBConnection $db, ICacheFactory $cacheFactory, IRequest $request, - ?string $userId + ?string $userId, ) { $this->db = $db; $this->cache = $cacheFactory->createDistributed('deck_changes'); @@ -43,7 +43,7 @@ class ChangeHelper { public function cardChanged($cardId, $updateCard = true) { $time = time(); $etag = md5($time . microtime()); - $this->cache->set(self::TYPE_CARD . '-' .$cardId, $etag); + $this->cache->set(self::TYPE_CARD . '-' . $cardId, $etag); if ($updateCard) { $sql = 'UPDATE `*PREFIX*deck_cards` SET `last_modified` = ?, `last_editor` = ? WHERE `id` = ?'; $this->db->executeUpdate($sql, [time(), $this->userId, $cardId]); @@ -60,7 +60,7 @@ class ChangeHelper { public function stackChanged($stackId, $updateBoard = true) { $time = time(); $etag = md5($time . microtime()); - $this->cache->set(self::TYPE_CARD . '-' .$stackId, $etag); + $this->cache->set(self::TYPE_CARD . '-' . $stackId, $etag); if ($updateBoard) { $sql = 'UPDATE `*PREFIX*deck_stacks` SET `last_modified` = ? WHERE `id` = ?'; $this->db->executeUpdate($sql, [time(), $stackId]); @@ -76,7 +76,7 @@ class ChangeHelper { } public function getEtag($type, $id) { - $entry = $this->cache->get($type . '-' .$id); + $entry = $this->cache->get($type . '-' . $id); if ($entry === 'null') { return ''; } diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php index 79d782190..1db884c08 100644 --- a/lib/Db/StackMapper.php +++ b/lib/Db/StackMapper.php @@ -24,7 +24,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper { public function __construct( IDBConnection $db, CardMapper $cardMapper, - ICacheFactory $cacheFactory + ICacheFactory $cacheFactory, ) { parent::__construct($db, 'deck_stacks', Stack::class); $this->cardMapper = $cardMapper; diff --git a/lib/Listeners/LiveUpdateListener.php b/lib/Listeners/LiveUpdateListener.php index ad951ee2d..2b3550734 100644 --- a/lib/Listeners/LiveUpdateListener.php +++ b/lib/Listeners/LiveUpdateListener.php @@ -38,7 +38,7 @@ class LiveUpdateListener implements IEventListener { IRequest $request, LoggerInterface $logger, SessionService $sessionService, - StackMapper $stackMapper + StackMapper $stackMapper, ) { try { $this->queue = $container->get(IQueue::class); diff --git a/lib/Migration/Version11000Date20240222115515.php b/lib/Migration/Version11000Date20240222115515.php index bef482128..caea7b114 100644 --- a/lib/Migration/Version11000Date20240222115515.php +++ b/lib/Migration/Version11000Date20240222115515.php @@ -20,13 +20,13 @@ class Version11000Date20240222115515 extends SimpleMigrationStep { $returnValue = null; $assignedUsersTable = $schema->getTable('deck_assigned_users'); - if($assignedUsersTable->hasIndex('deck_assigned_users_idx_c')) { + if ($assignedUsersTable->hasIndex('deck_assigned_users_idx_c')) { $assignedUsersTable->dropIndex('deck_assigned_users_idx_c'); $returnValue = $schema; } $boardAclTable = $schema->getTable('deck_board_acl'); - if($boardAclTable->hasIndex('deck_board_acl_idx_i')) { + if ($boardAclTable->hasIndex('deck_board_acl_idx_i')) { $boardAclTable->dropIndex('deck_board_acl_idx_i'); $returnValue = $schema; } diff --git a/lib/Notification/NotificationHelper.php b/lib/Notification/NotificationHelper.php index 6d37b3820..bba2dcf30 100644 --- a/lib/Notification/NotificationHelper.php +++ b/lib/Notification/NotificationHelper.php @@ -58,7 +58,7 @@ class NotificationHelper { IConfig $config, IManager $notificationManager, IGroupManager $groupManager, - $userId + $userId, ) { $this->cardMapper = $cardMapper; $this->boardMapper = $boardMapper; diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index d002c8e0b..24c0ddeea 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -36,7 +36,7 @@ class Notifier implements INotifier { IUserManager $userManager, CardMapper $cardMapper, StackMapper $stackMapper, - BoardMapper $boardMapper + BoardMapper $boardMapper, ) { $this->l10nFactory = $l10nFactory; $this->url = $url; diff --git a/lib/Provider/DeckProvider.php b/lib/Provider/DeckProvider.php index 744d6264e..cda55c4db 100644 --- a/lib/Provider/DeckProvider.php +++ b/lib/Provider/DeckProvider.php @@ -47,7 +47,7 @@ class DeckProvider implements IFullTextSearchProvider { * @param FullTextSearchService $fullTextSearchService */ public function __construct( - IL10N $l10n, IUrlGenerator $urlGenerator, FullTextSearchService $fullTextSearchService + IL10N $l10n, IUrlGenerator $urlGenerator, FullTextSearchService $fullTextSearchService, ) { $this->l10n = $l10n; $this->urlGenerator = $urlGenerator; diff --git a/lib/Reference/CreateCardReferenceProvider.php b/lib/Reference/CreateCardReferenceProvider.php index 4685fc170..ce3d9c5d3 100644 --- a/lib/Reference/CreateCardReferenceProvider.php +++ b/lib/Reference/CreateCardReferenceProvider.php @@ -17,7 +17,8 @@ class CreateCardReferenceProvider extends ADiscoverableReferenceProvider { public function __construct( private IL10N $l10n, private IURLGenerator $urlGenerator, - private ?string $userId) { + private ?string $userId, + ) { } /** diff --git a/lib/Search/CardCommentProvider.php b/lib/Search/CardCommentProvider.php index 9aedf05f6..75235ed9b 100644 --- a/lib/Search/CardCommentProvider.php +++ b/lib/Search/CardCommentProvider.php @@ -25,7 +25,7 @@ class CardCommentProvider implements IProvider { public function __construct( SearchService $searchService, - IL10N $l10n + IL10N $l10n, ) { $this->searchService = $searchService; $this->l10n = $l10n; diff --git a/lib/Search/DeckProvider.php b/lib/Search/DeckProvider.php index d03a99059..03ba5bd13 100644 --- a/lib/Search/DeckProvider.php +++ b/lib/Search/DeckProvider.php @@ -27,7 +27,7 @@ class DeckProvider implements IProvider { public function __construct( SearchService $searchService, IURLGenerator $urlGenerator, - IL10N $l10n + IL10N $l10n, ) { $this->l10n = $l10n; $this->searchService = $searchService; diff --git a/lib/Service/AssignmentService.php b/lib/Service/AssignmentService.php index 0684012fe..8fcf63880 100644 --- a/lib/Service/AssignmentService.php +++ b/lib/Service/AssignmentService.php @@ -76,7 +76,7 @@ class AssignmentService { ChangeHelper $changeHelper, IEventDispatcher $eventDispatcher, AssignmentServiceValidator $assignmentServiceValidator, - $userId + $userId, ) { $this->assignmentServiceValidator = $assignmentServiceValidator; $this->permissionService = $permissionService; diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php index 9d84806e7..423693dfd 100644 --- a/lib/Service/AttachmentService.php +++ b/lib/Service/AttachmentService.php @@ -58,7 +58,7 @@ class AttachmentService { $userId, IL10N $l10n, ActivityManager $activityManager, - AttachmentServiceValidator $attachmentServiceValidator + AttachmentServiceValidator $attachmentServiceValidator, ) { $this->attachmentMapper = $attachmentMapper; $this->cardMapper = $cardMapper; diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index 23e2a82ee..99ec9f9d9 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -89,7 +89,7 @@ class BoardService { IDBConnection $connection, BoardServiceValidator $boardServiceValidator, SessionMapper $sessionMapper, - ?string $userId + ?string $userId, ) { $this->boardMapper = $boardMapper; $this->stackMapper = $stackMapper; diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php index 1c5e91aa3..2367632e0 100644 --- a/lib/Service/CardService.php +++ b/lib/Service/CardService.php @@ -77,7 +77,7 @@ class CardService { LoggerInterface $logger, IRequest $request, CardServiceValidator $cardServiceValidator, - ?string $userId + ?string $userId, ) { $this->cardMapper = $cardMapper; $this->stackMapper = $stackMapper; @@ -356,11 +356,11 @@ class CardService { $card = $this->cardMapper->update($card); $oldBoardId = $this->stackMapper->findBoardId($changes->getBefore()->getStackId()); $boardId = $this->cardMapper->findBoardId($card->getId()); - if($boardId !== $oldBoardId) { + if ($boardId !== $oldBoardId) { $stack = $this->stackMapper->find($card->getStackId()); $board = $this->boardService->find($this->cardMapper->findBoardId($card->getId())); $boardLabels = $board->getLabels() ?? []; - foreach($card->getLabels() as $cardLabel) { + foreach ($card->getLabels() as $cardLabel) { $this->removeLabel($card->getId(), $cardLabel->getId()); $label = $this->labelMapper->find($cardLabel->getId()); $filteredLabels = array_values(array_filter($boardLabels, fn ($item) => $item->getTitle() === $label->getTitle())); diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index 33022e38a..7daed6b63 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -29,7 +29,7 @@ class ConfigService { public function __construct( IConfig $config, - IGroupManager $groupManager + IGroupManager $groupManager, ) { $this->groupManager = $groupManager; $this->config = $config; diff --git a/lib/Service/DefaultBoardService.php b/lib/Service/DefaultBoardService.php index bca70dba8..ba5446758 100644 --- a/lib/Service/DefaultBoardService.php +++ b/lib/Service/DefaultBoardService.php @@ -27,7 +27,7 @@ class DefaultBoardService { BoardService $boardService, StackService $stackService, CardService $cardService, - IConfig $config + IConfig $config, ) { $this->boardService = $boardService; $this->stackService = $stackService; diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php index 77466a8c0..5f93c7ecb 100644 --- a/lib/Service/FileService.php +++ b/lib/Service/FileService.php @@ -33,7 +33,7 @@ class FileService implements IAttachmentService { private IRootFolder $rootFolder, private IConfig $config, private AttachmentMapper $attachmentMapper, - private IMimeTypeDetector $mimeTypeDetector + private IMimeTypeDetector $mimeTypeDetector, ) { } diff --git a/lib/Service/FilesAppService.php b/lib/Service/FilesAppService.php index 430b92d8a..ecd7cb7e0 100644 --- a/lib/Service/FilesAppService.php +++ b/lib/Service/FilesAppService.php @@ -55,7 +55,7 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService { CardMapper $cardMapper, LoggerInterface $logger, IDBConnection $connection, - ?string $userId + ?string $userId, ) { $this->request = $request; $this->l10n = $l10n; diff --git a/lib/Service/FullTextSearchService.php b/lib/Service/FullTextSearchService.php index 7dda1c0dc..66e4bdb5f 100644 --- a/lib/Service/FullTextSearchService.php +++ b/lib/Service/FullTextSearchService.php @@ -39,7 +39,7 @@ class FullTextSearchService { private $cardMapper; public function __construct( - BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper + BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper, ) { $this->boardMapper = $boardMapper; $this->stackMapper = $stackMapper; diff --git a/lib/Service/Importer/BoardImportService.php b/lib/Service/Importer/BoardImportService.php index d22f78c87..71caef311 100644 --- a/lib/Service/Importer/BoardImportService.php +++ b/lib/Service/Importer/BoardImportService.php @@ -70,7 +70,7 @@ class BoardImportService { private CardMapper $cardMapper, private ICommentsManager $commentsManager, private IEventDispatcher $eventDispatcher, - private LoggerInterface $logger + private LoggerInterface $logger, ) { $this->board = new Board(); $this->disableCommentsEvents(); @@ -364,7 +364,7 @@ class BoardImportService { $this->getImportSystem()->updateCardAssignment($cardId, (string)$assignment->getId(), $assignment); $this->addOutput('Assignment ' . $assignment->getParticipant() . ' added'); } catch (NotFoundException $e) { - $this->addError('No origin or mapping found for card "' . $cardId . '" and ' . $assignment->getTypeString() .' assignment "' . $assignment->getParticipant(), $e); + $this->addError('No origin or mapping found for card "' . $cardId . '" and ' . $assignment->getTypeString() . ' assignment "' . $assignment->getParticipant(), $e); } } } diff --git a/lib/Service/Importer/Systems/TrelloApiService.php b/lib/Service/Importer/Systems/TrelloApiService.php index 8bdb6302c..ef956b383 100644 --- a/lib/Service/Importer/Systems/TrelloApiService.php +++ b/lib/Service/Importer/Systems/TrelloApiService.php @@ -31,7 +31,7 @@ class TrelloApiService extends TrelloJsonService { IURLGenerator $urlGenerator, IL10N $l10n, LoggerInterface $logger, - IClientService $httpClientService + IClientService $httpClientService, ) { parent::__construct($userManager, $urlGenerator, $l10n); $this->logger = $logger; diff --git a/lib/Service/Importer/Systems/TrelloJsonService.php b/lib/Service/Importer/Systems/TrelloJsonService.php index d9b255eb9..dd7df93d2 100644 --- a/lib/Service/Importer/Systems/TrelloJsonService.php +++ b/lib/Service/Importer/Systems/TrelloJsonService.php @@ -37,7 +37,7 @@ class TrelloJsonService extends ABoardImportService { public function __construct( IUserManager $userManager, IURLGenerator $urlGenerator, - IL10N $l10n + IL10N $l10n, ) { $this->userManager = $userManager; $this->urlGenerator = $urlGenerator; diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php index ab9d96a77..de354f18d 100644 --- a/lib/Service/LabelService.php +++ b/lib/Service/LabelService.php @@ -32,7 +32,7 @@ class LabelService { PermissionService $permissionService, BoardService $boardService, ChangeHelper $changeHelper, - LabelServiceValidator $labelServiceValidator + LabelServiceValidator $labelServiceValidator, ) { $this->labelMapper = $labelMapper; $this->permissionService = $permissionService; diff --git a/lib/Service/OverviewService.php b/lib/Service/OverviewService.php index 872ff6fd1..1764dca07 100644 --- a/lib/Service/OverviewService.php +++ b/lib/Service/OverviewService.php @@ -36,7 +36,7 @@ class OverviewService { AssignmentMapper $assignedUsersMapper, IUserManager $userManager, ICommentsManager $commentsManager, - AttachmentService $attachmentService + AttachmentService $attachmentService, ) { $this->cardService = $cardService; $this->boardMapper = $boardMapper; diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index 3f2fcb61d..e8bf4116f 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -40,7 +40,7 @@ class PermissionService { private IGroupManager $groupManager, private IManager $shareManager, private IConfig $config, - private ?string $userId + private ?string $userId, ) { $this->boardCache = new CappedMemoryCache(); $this->permissionCache = new CappedMemoryCache(); diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php index ef71c4f9f..9a30b75c7 100644 --- a/lib/Service/SearchService.php +++ b/lib/Service/SearchService.php @@ -46,7 +46,7 @@ class SearchService { FilterStringParser $filterStringParser, IUserManager $userManager, IL10N $l10n, - IURLGenerator $urlGenerator + IURLGenerator $urlGenerator, ) { $this->boardService = $boardService; $this->cardMapper = $cardMapper; diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php index bc9f62a54..0f4c76f38 100644 --- a/lib/Service/SessionService.php +++ b/lib/Service/SessionService.php @@ -33,7 +33,7 @@ class SessionService { ISecureRandom $secureRandom, ITimeFactory $timeFactory, $userId, - IEventDispatcher $eventDispatcher + IEventDispatcher $eventDispatcher, ) { $this->sessionMapper = $sessionMapper; $this->secureRandom = $secureRandom; diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php index 4a2025e30..2adb1b04e 100644 --- a/lib/Service/StackService.php +++ b/lib/Service/StackService.php @@ -56,7 +56,7 @@ class StackService { ChangeHelper $changeHelper, LoggerInterface $logger, IEventDispatcher $eventDispatcher, - StackServiceValidator $stackServiceValidator + StackServiceValidator $stackServiceValidator, ) { $this->stackMapper = $stackMapper; $this->boardMapper = $boardMapper; diff --git a/lib/Sharing/DeckShareProvider.php b/lib/Sharing/DeckShareProvider.php index c882caadb..864cf68ea 100644 --- a/lib/Sharing/DeckShareProvider.php +++ b/lib/Sharing/DeckShareProvider.php @@ -69,7 +69,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider { IL10N $l, ITimeFactory $timeFactory, IMimeTypeLoader $mimeTypeLoader, - ?string $userId + ?string $userId, ) { $this->dbConnection = $connection; $this->shareManager = $shareManager; @@ -174,7 +174,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider { string $target, int $permissions, string $token, - ?\DateTime $expirationDate + ?\DateTime $expirationDate, ): int { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert('share') diff --git a/lib/Teams/DeckTeamResourceProvider.php b/lib/Teams/DeckTeamResourceProvider.php index f1e5b0b55..19e5670d5 100644 --- a/lib/Teams/DeckTeamResourceProvider.php +++ b/lib/Teams/DeckTeamResourceProvider.php @@ -59,6 +59,6 @@ class DeckTeamResourceProvider implements \OCP\Teams\ITeamResourceProvider { } public function getBoardBulletIcon(Board $board): string { - return ''; + return ''; } } diff --git a/lib/Validators/BaseValidator.php b/lib/Validators/BaseValidator.php index 8c1d0c1c6..d63885ac3 100644 --- a/lib/Validators/BaseValidator.php +++ b/lib/Validators/BaseValidator.php @@ -45,7 +45,7 @@ abstract class BaseValidator { } else { if (!$this->{$rule}($value)) { throw new BadRequestException( - $field . ' must be provided and must be '. str_replace('_', ' ', $rule)); + $field . ' must be provided and must be ' . str_replace('_', ' ', $rule)); } } } @@ -154,10 +154,10 @@ abstract class BaseValidator { protected function getErrorMessage($rule, $field, $parameter = null): string { if (in_array($rule, ['max', 'min'])) { return $rule === 'max' - ? $field . ' cannot be longer than '. $parameter . ' characters ' - : $field . ' must be at least '. $parameter . ' characters long '; + ? $field . ' cannot be longer than ' . $parameter . ' characters ' + : $field . ' must be at least ' . $parameter . ' characters long '; } - return $field . ' must be provided and must be '. str_replace('_', ' ', $rule); + return $field . ' must be provided and must be ' . str_replace('_', ' ', $rule); } } diff --git a/tests/integration/features/bootstrap/BoardContext.php b/tests/integration/features/bootstrap/BoardContext.php index 1e4043742..084486ba4 100644 --- a/tests/integration/features/bootstrap/BoardContext.php +++ b/tests/integration/features/bootstrap/BoardContext.php @@ -71,7 +71,7 @@ class BoardContext implements Context { break; } } - Assert::assertNotNull($id, 'Could not find board named '.$boardName); + Assert::assertNotNull($id, 'Could not find board named ' . $boardName); } else { $id = $this->board['id']; } @@ -259,7 +259,7 @@ class BoardContext implements Context { } private function assignToCard($participant, $type) { - $this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] .'/assign', [ + $this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] . '/assign', [ 'userId' => $participant, 'type' => $type ]); @@ -274,7 +274,7 @@ class BoardContext implements Context { return $label['title'] === $tag; }); $label = array_shift($filteredLabels); - $this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] .'/label/' . $label['id']); + $this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] . '/label/' . $label['id']); $this->requestContext->getResponse()->getBody()->seek(0); } diff --git a/tests/integration/features/bootstrap/CommentContext.php b/tests/integration/features/bootstrap/CommentContext.php index 92bc9a347..ed4c09d4f 100644 --- a/tests/integration/features/bootstrap/CommentContext.php +++ b/tests/integration/features/bootstrap/CommentContext.php @@ -45,7 +45,7 @@ class CommentContext implements Context { */ public function updateACommentWithContentOnTheCard($content) { $card = $this->boardContext->getLastUsedCard(); - $this->requestContext->sendOCSRequest('PUT', '/apps/deck/api/v1.0/cards/' . $card['id'] . '/comments/'. $this->lastComment['id'], [ + $this->requestContext->sendOCSRequest('PUT', '/apps/deck/api/v1.0/cards/' . $card['id'] . '/comments/' . $this->lastComment['id'], [ 'message' => $content, 'parentId' => null ]); @@ -56,7 +56,7 @@ class CommentContext implements Context { */ public function deleteTheCommentOnTheCard() { $card = $this->boardContext->getLastUsedCard(); - $this->requestContext->sendOCSRequest('DELETE', '/apps/deck/api/v1.0/cards/' . $card['id'] . '/comments/'. $this->lastComment['id']); + $this->requestContext->sendOCSRequest('DELETE', '/apps/deck/api/v1.0/cards/' . $card['id'] . '/comments/' . $this->lastComment['id']); } } diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php index 21ee1f271..1de36a57e 100644 --- a/tests/unit/Activity/ActivityManagerTest.php +++ b/tests/unit/Activity/ActivityManagerTest.php @@ -103,13 +103,13 @@ class ActivityManagerTest extends TestCase { if ($format !== '') { $this->assertStringContainsString('{user}', $format); } else { - self::addWarning('No activity string found for '. $constant); + self::addWarning('No activity string found for ' . $constant); } $format = $this->activityManager->getActivityFormat('cz', $value, [], true); if ($format !== '') { $this->assertStringStartsWith('You', $format); } else { - self::addWarning('No own activity string found for '. $constant); + self::addWarning('No own activity string found for ' . $constant); } } } diff --git a/tests/unit/Notification/NotifierTest.php b/tests/unit/Notification/NotifierTest.php index 229948216..944f66453 100644 --- a/tests/unit/Notification/NotifierTest.php +++ b/tests/unit/Notification/NotifierTest.php @@ -220,7 +220,7 @@ class NotifierTest extends \Test\TestCase { ->with('otheruser') ->willReturn($user); - $expectedMessage = 'The card "Card title" on "Board title" has been assigned to you by '.$dn.'.'; + $expectedMessage = 'The card "Card title" on "Board title" has been assigned to you by ' . $dn . '.'; $notification->expects($this->once()) ->method('setParsedSubject') ->with($expectedMessage); @@ -304,7 +304,7 @@ class NotifierTest extends \Test\TestCase { ->with('otheruser') ->willReturn($user); - $expectedMessage = 'The board "Board title" has been shared with you by '.$dn.'.'; + $expectedMessage = 'The board "Board title" has been shared with you by ' . $dn . '.'; $notification->expects($this->once()) ->method('setParsedSubject') ->with($expectedMessage);