From 45be7ada4d279cf4b36837e86ad76a5e71e24859 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Sat, 28 Sep 2024 16:07:49 +0200 Subject: [PATCH] apply new coding standard Signed-off-by: dartcafe --- lib/Activity/PollChanges.php | 2 +- lib/Command/Command.php | 2 +- lib/Command/Db/Purge.php | 2 +- lib/Command/Poll/TransferOwnership.php | 2 +- lib/Command/Share/TShareCommand.php | 2 +- lib/Controller/BaseApiController.php | 2 +- lib/Controller/CommentApiController.php | 2 +- lib/Controller/CommentController.php | 2 +- lib/Controller/OptionApiController.php | 2 +- lib/Controller/PollApiController.php | 2 +- lib/Controller/PublicController.php | 2 +- lib/Controller/SettingsController.php | 2 +- lib/Controller/ShareApiController.php | 2 +- lib/Controller/SubscriptionController.php | 2 +- lib/Controller/SystemController.php | 2 +- lib/Controller/VoteApiController.php | 2 +- lib/Controller/WatchController.php | 2 +- lib/Dashboard/PollWidget.php | 2 +- lib/Db/CommentMapper.php | 2 +- lib/Db/IndexManager.php | 2 +- lib/Db/OptionMapper.php | 2 +- lib/Db/PollMapper.php | 14 ++++++------- lib/Db/QBMapperWithUser.php | 2 +- lib/Db/TableManager.php | 4 ++-- lib/Db/VoteMapper.php | 2 +- lib/Event/CommentAddEvent.php | 2 +- lib/Event/CommentDeleteEvent.php | 2 +- lib/Event/OptionConfirmedEvent.php | 2 +- lib/Event/OptionDeletedEvent.php | 2 +- lib/Event/OptionUnconfirmedEvent.php | 2 +- lib/Event/OptionUpdatedEvent.php | 2 +- lib/Event/PollArchivedEvent.php | 2 +- lib/Event/PollCreatedEvent.php | 2 +- lib/Event/PollDeletedEvent.php | 2 +- lib/Event/PollEvent.php | 2 +- lib/Event/PollExpiredEvent.php | 2 +- lib/Event/PollOptionReorderedEvent.php | 2 +- lib/Event/PollOwnerChangeEvent.php | 2 +- lib/Event/PollRestoredEvent.php | 2 +- lib/Event/PollTakeoverEvent.php | 2 +- lib/Event/PollUpdatedEvent.php | 2 +- lib/Event/ShareChangedDisplayNameEvent.php | 2 +- lib/Event/ShareChangedEmailEvent.php | 2 +- lib/Event/ShareChangedLabelEvent.php | 2 +- ...hareChangedRegistrationConstraintEvent.php | 2 +- lib/Event/ShareCreateEvent.php | 2 +- lib/Event/ShareDeletedEvent.php | 2 +- lib/Event/ShareLockedEvent.php | 2 +- lib/Event/ShareRegistrationEvent.php | 2 +- lib/Event/ShareTypeChangedEvent.php | 2 +- lib/Event/VoteEvent.php | 2 +- lib/Event/VoteSetEvent.php | 2 +- lib/Exceptions/CirclesNotEnabledException.php | 2 +- .../ContactsNotEnabledExceptions.php | 2 +- lib/Exceptions/DuplicateEntryException.php | 2 +- lib/Exceptions/EmptyTitleException.php | 2 +- lib/Exceptions/Exception.php | 2 +- lib/Exceptions/ForbiddenException.php | 2 +- .../InsufficientAttributesException.php | 2 +- lib/Exceptions/InvalidAccessException.php | 2 +- lib/Exceptions/InvalidClassException.php | 2 +- lib/Exceptions/InvalidEmailAddress.php | 2 +- lib/Exceptions/InvalidPollTypeException.php | 2 +- lib/Exceptions/InvalidShareTypeException.php | 2 +- .../InvalidShowResultsException.php | 2 +- lib/Exceptions/InvalidUsernameException.php | 2 +- lib/Exceptions/NoDeadLineException.php | 2 +- lib/Exceptions/NoEmailAddress.php | 2 +- lib/Exceptions/NoUpdatesException.php | 2 +- lib/Exceptions/NotAuthorizedException.php | 2 +- lib/Exceptions/NotFoundException.php | 2 +- lib/Exceptions/OCPEventException.php | 2 +- lib/Exceptions/ShareNotFoundException.php | 2 +- lib/Exceptions/TooShortException.php | 2 +- lib/Exceptions/UserNotFoundException.php | 2 +- lib/Exceptions/VoteLimitExceededException.php | 2 +- lib/Filter/ActivityFilter.php | 2 +- lib/Model/CalendarEvent.php | 2 +- lib/Model/Group/Circle.php | 2 +- lib/Model/Group/ContactGroup.php | 2 +- lib/Model/Group/Group.php | 2 +- lib/Model/Mail/ConfirmationMail.php | 2 +- lib/Model/Mail/MailBase.php | 6 +++--- lib/Model/Mail/NotificationMail.php | 2 +- lib/Model/Mail/ReminderMail.php | 2 +- lib/Model/Settings/AppSettings.php | 1 - lib/Model/User/Email.php | 2 +- lib/Model/User/GenericUser.php | 2 +- lib/Model/User/User.php | 2 +- lib/Service/MailService.php | 2 +- lib/Service/SettingsService.php | 4 +++- lib/Service/ShareService.php | 20 +++++++++---------- lib/Settings/ActivitySettings.php | 4 +++- lib/Settings/AdminSection.php | 5 ++++- lib/Settings/PersonalSection.php | 5 ++++- lib/UserSession.php | 1 - 96 files changed, 122 insertions(+), 114 deletions(-) diff --git a/lib/Activity/PollChanges.php b/lib/Activity/PollChanges.php index e61caf2f7..6ee52561e 100644 --- a/lib/Activity/PollChanges.php +++ b/lib/Activity/PollChanges.php @@ -18,7 +18,7 @@ class PollChanges implements IFilter { public function __construct( protected IL10N $l10n, - protected IURLGenerator $urlGenerator + protected IURLGenerator $urlGenerator, ) { } diff --git a/lib/Command/Command.php b/lib/Command/Command.php index 28cd06218..2cd1928ca 100644 --- a/lib/Command/Command.php +++ b/lib/Command/Command.php @@ -32,7 +32,7 @@ class Command extends \Symfony\Component\Console\Command\Command { public function __construct( ) { parent::__construct(); - $this->question = new ConfirmationQuestion('Continue (y/n)? ['. ($this->defaultContinueAnswer ? 'y' : 'n') . '] ', $this->defaultContinueAnswer); + $this->question = new ConfirmationQuestion('Continue (y/n)? [' . ($this->defaultContinueAnswer ? 'y' : 'n') . '] ', $this->defaultContinueAnswer); } protected function configure(): void { diff --git a/lib/Command/Db/Purge.php b/lib/Command/Db/Purge.php index 8e3bc9895..4dbcba7f4 100644 --- a/lib/Command/Db/Purge.php +++ b/lib/Command/Db/Purge.php @@ -29,7 +29,7 @@ class Purge extends Command { public function __construct( private IDBConnection $connection, - private TableManager $tableManager + private TableManager $tableManager, ) { parent::__construct(); } diff --git a/lib/Command/Poll/TransferOwnership.php b/lib/Command/Poll/TransferOwnership.php index 055022c5a..6ce313c68 100644 --- a/lib/Command/Poll/TransferOwnership.php +++ b/lib/Command/Poll/TransferOwnership.php @@ -25,7 +25,7 @@ class TransferOwnership extends Command { public function __construct( private IUserManager $userManager, - private PollService $pollService + private PollService $pollService, ) { parent::__construct(); } diff --git a/lib/Command/Share/TShareCommand.php b/lib/Command/Share/TShareCommand.php index 0f825ab6a..7a0d7a1e8 100644 --- a/lib/Command/Share/TShareCommand.php +++ b/lib/Command/Share/TShareCommand.php @@ -23,7 +23,7 @@ public function __construct( private ShareMapper $shareMapper, private ShareService $shareService, private IUserManager $userManager, - private IGroupManager $groupManager + private IGroupManager $groupManager, ) { parent::__construct(); } diff --git a/lib/Controller/BaseApiController.php b/lib/Controller/BaseApiController.php index bee2bf734..f9b7bf79d 100644 --- a/lib/Controller/BaseApiController.php +++ b/lib/Controller/BaseApiController.php @@ -26,7 +26,7 @@ public function __construct( IRequest $request, string $corsMethods = 'PUT, POST, GET, DELETE', string $corsAllowedHeaders = 'Authorization, Content-Type, Accept', - int $corsMaxAge = 1728000 + int $corsMaxAge = 1728000, ) { parent::__construct($appName, $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge); } diff --git a/lib/Controller/CommentApiController.php b/lib/Controller/CommentApiController.php index 1803416f5..a07302fcc 100644 --- a/lib/Controller/CommentApiController.php +++ b/lib/Controller/CommentApiController.php @@ -22,7 +22,7 @@ class CommentApiController extends BaseApiController { public function __construct( string $appName, IRequest $request, - private CommentService $commentService + private CommentService $commentService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/CommentController.php b/lib/Controller/CommentController.php index 0e94e3d16..30c0dfecc 100644 --- a/lib/Controller/CommentController.php +++ b/lib/Controller/CommentController.php @@ -20,7 +20,7 @@ class CommentController extends BaseController { public function __construct( string $appName, IRequest $request, - private CommentService $commentService + private CommentService $commentService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/OptionApiController.php b/lib/Controller/OptionApiController.php index effd46f2d..ac7c8885c 100644 --- a/lib/Controller/OptionApiController.php +++ b/lib/Controller/OptionApiController.php @@ -22,7 +22,7 @@ class OptionApiController extends BaseApiController { public function __construct( string $appName, IRequest $request, - private OptionService $optionService + private OptionService $optionService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/PollApiController.php b/lib/Controller/PollApiController.php index a2f0ced21..d2f3404ad 100644 --- a/lib/Controller/PollApiController.php +++ b/lib/Controller/PollApiController.php @@ -28,7 +28,7 @@ public function __construct( string $appName, IRequest $request, private Acl $acl, - private PollService $pollService + private PollService $pollService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php index 8d74bfaf9..595b08744 100644 --- a/lib/Controller/PublicController.php +++ b/lib/Controller/PublicController.php @@ -50,7 +50,7 @@ public function __construct( private SubscriptionService $subscriptionService, private SystemService $systemService, private VoteService $voteService, - private WatchService $watchService + private WatchService $watchService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 4441dd52b..2318daa67 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -21,7 +21,7 @@ class SettingsController extends BaseController { public function __construct( string $appName, IRequest $request, - private SettingsService $settingsService + private SettingsService $settingsService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/ShareApiController.php b/lib/Controller/ShareApiController.php index d3018a1c0..3b7b8987d 100644 --- a/lib/Controller/ShareApiController.php +++ b/lib/Controller/ShareApiController.php @@ -24,7 +24,7 @@ public function __construct( string $appName, IRequest $request, private MailService $mailService, - private ShareService $shareService + private ShareService $shareService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/SubscriptionController.php b/lib/Controller/SubscriptionController.php index db080195a..bd7d3db39 100644 --- a/lib/Controller/SubscriptionController.php +++ b/lib/Controller/SubscriptionController.php @@ -20,7 +20,7 @@ class SubscriptionController extends BaseController { public function __construct( string $appName, IRequest $request, - private SubscriptionService $subscriptionService + private SubscriptionService $subscriptionService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php index 9366f73f1..1091e7276 100644 --- a/lib/Controller/SystemController.php +++ b/lib/Controller/SystemController.php @@ -21,7 +21,7 @@ class SystemController extends BaseController { public function __construct( string $appName, IRequest $request, - private SystemService $systemService + private SystemService $systemService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/VoteApiController.php b/lib/Controller/VoteApiController.php index f71da1fd1..ddbed8b72 100644 --- a/lib/Controller/VoteApiController.php +++ b/lib/Controller/VoteApiController.php @@ -25,7 +25,7 @@ class VoteApiController extends BaseApiController { public function __construct( string $appName, IRequest $request, - private VoteService $voteService + private VoteService $voteService, ) { parent::__construct($appName, $request); } diff --git a/lib/Controller/WatchController.php b/lib/Controller/WatchController.php index 07abfa853..2c57d9ec8 100644 --- a/lib/Controller/WatchController.php +++ b/lib/Controller/WatchController.php @@ -21,7 +21,7 @@ class WatchController extends BaseController { public function __construct( string $appName, IRequest $request, - private WatchService $watchService + private WatchService $watchService, ) { parent::__construct($appName, $request); } diff --git a/lib/Dashboard/PollWidget.php b/lib/Dashboard/PollWidget.php index 85cc0844f..a013147f9 100644 --- a/lib/Dashboard/PollWidget.php +++ b/lib/Dashboard/PollWidget.php @@ -19,7 +19,7 @@ class PollWidget implements IWidget { */ public function __construct( private IL10N $l10n, - private IURLGenerator $urlGenerator + private IURLGenerator $urlGenerator, ) { } diff --git a/lib/Db/CommentMapper.php b/lib/Db/CommentMapper.php index f22887435..c248ae52a 100644 --- a/lib/Db/CommentMapper.php +++ b/lib/Db/CommentMapper.php @@ -53,7 +53,7 @@ public function findByPoll(int $pollId, bool $getDeleted = false): array { /** * @return void */ - public function renameUserId(string $userId, string $replacementId, int|null $pollId = null): void { + public function renameUserId(string $userId, string $replacementId, ?int $pollId = null): void { $query = $this->db->getQueryBuilder(); $query->update($this->getTableName(), self::TABLE) ->set('user_id', $query->createNamedParameter($replacementId)) diff --git a/lib/Db/IndexManager.php b/lib/Db/IndexManager.php index 07902883a..c36a505d8 100644 --- a/lib/Db/IndexManager.php +++ b/lib/Db/IndexManager.php @@ -257,7 +257,7 @@ public function removeGenericIndicesFromTable(string $tableName): array { * * @return null|string */ - public function removeNamedIndexFromTable(string $tableName, string $indexName): string|null { + public function removeNamedIndexFromTable(string $tableName, string $indexName): ?string { $tableName = $this->dbPrefix . $tableName; $message = null; try { diff --git a/lib/Db/OptionMapper.php b/lib/Db/OptionMapper.php index a4e72573c..91c03338c 100644 --- a/lib/Db/OptionMapper.php +++ b/lib/Db/OptionMapper.php @@ -128,7 +128,7 @@ public function findOptionsWithDuration(): array { return $this->findEntities($qb); } - public function renameUserId(string $userId, string $replacementName, int|null $pollId = null): void { + public function renameUserId(string $userId, string $replacementName, ?int $pollId = null): void { $query = $this->db->getQueryBuilder(); $query->update($this->getTableName()) ->set('owner', $query->createNamedParameter($replacementName)) diff --git a/lib/Db/PollMapper.php b/lib/Db/PollMapper.php index b378f8356..99c15a2a4 100644 --- a/lib/Db/PollMapper.php +++ b/lib/Db/PollMapper.php @@ -211,7 +211,7 @@ protected function joinUserRole(IQueryBuilder &$qb, string $fromAlias, string $c $qb->selectAlias($joinAlias . '.locked', 'is_current_user_locked') ->addGroupBy($joinAlias . '.locked'); - $qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.token, '. $emptyString . ') AS share_token')) + $qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.token, ' . $emptyString . ') AS share_token')) ->addGroupBy($joinAlias . '.token'); $qb->leftJoin( @@ -234,19 +234,19 @@ protected function joinGroupShares(IQueryBuilder &$qb, string $fromAlias): void $joinAlias = 'group_shares'; if ($this->db->getDatabasePlatform() instanceof PostgreSQLPlatform) { - $qb->addSelect($qb->createFunction('string_agg(distinct ' . $joinAlias . '.user_id, \''. self::CONCAT_SEPARATOR . '\') AS group_shares')); + $qb->addSelect($qb->createFunction('string_agg(distinct ' . $joinAlias . '.user_id, \'' . self::CONCAT_SEPARATOR . '\') AS group_shares')); } elseif ($this->db->getDatabasePlatform() instanceof OraclePlatform) { - $qb->addSelect($qb->createFunction('listagg(distinct ' . $joinAlias . '.user_id, \''. self::CONCAT_SEPARATOR . '\') WITHIN GROUP (ORDER BY ' . $joinAlias . '.user_id) AS group_shares')); + $qb->addSelect($qb->createFunction('listagg(distinct ' . $joinAlias . '.user_id, \'' . self::CONCAT_SEPARATOR . '\') WITHIN GROUP (ORDER BY ' . $joinAlias . '.user_id) AS group_shares')); } elseif ($this->db->getDatabasePlatform() instanceof SqlitePlatform) { - $qb->addSelect($qb->createFunction('group_concat(replace(distinct ' . $joinAlias . '.user_id ,\'\',\'\'), \''. self::CONCAT_SEPARATOR . '\') AS group_shares')); + $qb->addSelect($qb->createFunction('group_concat(replace(distinct ' . $joinAlias . '.user_id ,\'\',\'\'), \'' . self::CONCAT_SEPARATOR . '\') AS group_shares')); } elseif ($this->db->getDatabasePlatform() instanceof MySQLPlatform) { - $qb->addSelect($qb->createFunction('group_concat(distinct ' . $joinAlias . '.user_id SEPARATOR \''. self::CONCAT_SEPARATOR . '\') AS group_shares')); + $qb->addSelect($qb->createFunction('group_concat(distinct ' . $joinAlias . '.user_id SEPARATOR \'' . self::CONCAT_SEPARATOR . '\') AS group_shares')); } else { - $qb->addSelect($qb->createFunction('group_concat(distinct ' . $joinAlias . '.user_id SEPARATOR \''. self::CONCAT_SEPARATOR . '\') AS group_shares')); + $qb->addSelect($qb->createFunction('group_concat(distinct ' . $joinAlias . '.user_id SEPARATOR \'' . self::CONCAT_SEPARATOR . '\') AS group_shares')); } $qb->leftJoin( @@ -274,7 +274,7 @@ protected function joinOptionsForMaxDate(IQueryBuilder &$qb, string $fromAlias): $zero = $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT); $saveMin = $qb->createNamedParameter(time(), IQueryBuilder::PARAM_INT); - $qb->addSelect($qb->createFunction('coalesce(MAX(' . $joinAlias . '.timestamp), '. $zero . ') AS max_date')) + $qb->addSelect($qb->createFunction('coalesce(MAX(' . $joinAlias . '.timestamp), ' . $zero . ') AS max_date')) ->addSelect($qb->createFunction('coalesce(MIN(' . $joinAlias . '.timestamp), ' . $saveMin . ') AS min_date')); $qb->selectAlias($qb->func()->count($joinAlias . '.id'), 'count_options'); diff --git a/lib/Db/QBMapperWithUser.php b/lib/Db/QBMapperWithUser.php index 1c4bc3313..fa1c84851 100644 --- a/lib/Db/QBMapperWithUser.php +++ b/lib/Db/QBMapperWithUser.php @@ -25,7 +25,7 @@ abstract class QBMapperWithUser extends QBMapper { public function __construct( IDBConnection $db, string $tableName, - ?string $entityClass = null + ?string $entityClass = null, ) { parent::__construct($db, $tableName, $entityClass); } diff --git a/lib/Db/TableManager.php b/lib/Db/TableManager.php index 6002fcd7c..ecb770cbf 100644 --- a/lib/Db/TableManager.php +++ b/lib/Db/TableManager.php @@ -101,7 +101,7 @@ public function purgeTables(): array { ->setParameter('appid', AppConstants::APP_ID) ->executeStatement(); - $this->logger->info('Removed all app config records from '. $this->dbPrefix . 'appconfig'); + $this->logger->info('Removed all app config records from ' . $this->dbPrefix . 'appconfig'); $messages[] = 'Removed all app config records from ' . $this->dbPrefix . 'appconfig'; $messages[] = 'Done.'; $messages[] = ''; @@ -273,7 +273,7 @@ public function deleteAllDuplicates(?IOutput $output = null): array { $count = $this->deleteDuplicates($tableName, $index['columns']); if ($count) { - $messages[] = 'Removed '. $count. ' duplicate records from ' . $this->dbPrefix . $tableName; + $messages[] = 'Removed ' . $count . ' duplicate records from ' . $this->dbPrefix . $tableName; $this->logger->info(end($messages)); } diff --git a/lib/Db/VoteMapper.php b/lib/Db/VoteMapper.php index 5b231a898..7c57af80d 100644 --- a/lib/Db/VoteMapper.php +++ b/lib/Db/VoteMapper.php @@ -115,7 +115,7 @@ public function deleteByPollAndUserId(int $pollId, string $userId): void { $qb->executeStatement(); } - public function renameUserId(string $userId, string $replacementId, int|null $pollId = null): void { + public function renameUserId(string $userId, string $replacementId, ?int $pollId = null): void { $query = $this->db->getQueryBuilder(); $query->update($this->getTableName()) ->set('user_id', $query->createNamedParameter($replacementId)) diff --git a/lib/Event/CommentAddEvent.php b/lib/Event/CommentAddEvent.php index 2b5d030d3..ffdfde796 100644 --- a/lib/Event/CommentAddEvent.php +++ b/lib/Event/CommentAddEvent.php @@ -10,7 +10,7 @@ class CommentAddEvent extends CommentEvent { public function __construct( - protected Comment $comment + protected Comment $comment, ) { parent::__construct($comment); $this->eventId = self::ADD; diff --git a/lib/Event/CommentDeleteEvent.php b/lib/Event/CommentDeleteEvent.php index f0fe2d47d..c73895f5f 100644 --- a/lib/Event/CommentDeleteEvent.php +++ b/lib/Event/CommentDeleteEvent.php @@ -10,7 +10,7 @@ class CommentDeleteEvent extends CommentEvent { public function __construct( - protected Comment $comment + protected Comment $comment, ) { parent::__construct($comment); $this->log = false; diff --git a/lib/Event/OptionConfirmedEvent.php b/lib/Event/OptionConfirmedEvent.php index fea0bd81f..ae461cd06 100644 --- a/lib/Event/OptionConfirmedEvent.php +++ b/lib/Event/OptionConfirmedEvent.php @@ -10,7 +10,7 @@ class OptionConfirmedEvent extends OptionEvent { public function __construct( - protected Option $option + protected Option $option, ) { parent::__construct($option); $this->eventId = self::CONFIRM; diff --git a/lib/Event/OptionDeletedEvent.php b/lib/Event/OptionDeletedEvent.php index 40c8ed574..42ee74d0a 100644 --- a/lib/Event/OptionDeletedEvent.php +++ b/lib/Event/OptionDeletedEvent.php @@ -10,7 +10,7 @@ class OptionDeletedEvent extends OptionEvent { public function __construct( - protected Option $option + protected Option $option, ) { parent::__construct($option); $this->eventId = $option->getDeleted() ? self::DELETE : self::RESTORE; diff --git a/lib/Event/OptionUnconfirmedEvent.php b/lib/Event/OptionUnconfirmedEvent.php index debe3086c..bbc32088e 100644 --- a/lib/Event/OptionUnconfirmedEvent.php +++ b/lib/Event/OptionUnconfirmedEvent.php @@ -10,7 +10,7 @@ class OptionUnconfirmedEvent extends OptionEvent { public function __construct( - protected Option $option + protected Option $option, ) { parent::__construct($option); $this->eventId = self::UNCONFIRM; diff --git a/lib/Event/OptionUpdatedEvent.php b/lib/Event/OptionUpdatedEvent.php index 84fdef69e..65d76a8a5 100644 --- a/lib/Event/OptionUpdatedEvent.php +++ b/lib/Event/OptionUpdatedEvent.php @@ -10,7 +10,7 @@ class OptionUpdatedEvent extends OptionEvent { public function __construct( - protected Option $option + protected Option $option, ) { parent::__construct($option); $this->eventId = self::UPDATE; diff --git a/lib/Event/PollArchivedEvent.php b/lib/Event/PollArchivedEvent.php index 158209ebb..28d0731f4 100644 --- a/lib/Event/PollArchivedEvent.php +++ b/lib/Event/PollArchivedEvent.php @@ -11,7 +11,7 @@ class PollArchivedEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::DELETE; diff --git a/lib/Event/PollCreatedEvent.php b/lib/Event/PollCreatedEvent.php index 9738a691e..2d68ce5d5 100644 --- a/lib/Event/PollCreatedEvent.php +++ b/lib/Event/PollCreatedEvent.php @@ -10,7 +10,7 @@ class PollCreatedEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::ADD; diff --git a/lib/Event/PollDeletedEvent.php b/lib/Event/PollDeletedEvent.php index 2e1596c74..e45736206 100644 --- a/lib/Event/PollDeletedEvent.php +++ b/lib/Event/PollDeletedEvent.php @@ -12,7 +12,7 @@ class PollDeletedEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::DELETE; diff --git a/lib/Event/PollEvent.php b/lib/Event/PollEvent.php index 0a9b94650..1a29c3730 100644 --- a/lib/Event/PollEvent.php +++ b/lib/Event/PollEvent.php @@ -20,7 +20,7 @@ abstract class PollEvent extends BaseEvent { public const OPTION_REORDER = 'poll_option_reorder'; public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->activityObjectType = 'poll'; diff --git a/lib/Event/PollExpiredEvent.php b/lib/Event/PollExpiredEvent.php index 8e628742c..6e84ddb8a 100644 --- a/lib/Event/PollExpiredEvent.php +++ b/lib/Event/PollExpiredEvent.php @@ -13,7 +13,7 @@ class PollExpiredEvent extends PollEvent { * @psalm-suppress PossiblyUnusedMethod */ public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::EXPIRE; diff --git a/lib/Event/PollOptionReorderedEvent.php b/lib/Event/PollOptionReorderedEvent.php index 20da464fb..16c0a84f2 100644 --- a/lib/Event/PollOptionReorderedEvent.php +++ b/lib/Event/PollOptionReorderedEvent.php @@ -10,7 +10,7 @@ class PollOptionReorderedEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->log = false; diff --git a/lib/Event/PollOwnerChangeEvent.php b/lib/Event/PollOwnerChangeEvent.php index f74df990f..2e74624bd 100644 --- a/lib/Event/PollOwnerChangeEvent.php +++ b/lib/Event/PollOwnerChangeEvent.php @@ -10,7 +10,7 @@ class PollOwnerChangeEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::OWNER_CHANGE; diff --git a/lib/Event/PollRestoredEvent.php b/lib/Event/PollRestoredEvent.php index 5f07d2533..19d772958 100644 --- a/lib/Event/PollRestoredEvent.php +++ b/lib/Event/PollRestoredEvent.php @@ -10,7 +10,7 @@ class PollRestoredEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::RESTORE; diff --git a/lib/Event/PollTakeoverEvent.php b/lib/Event/PollTakeoverEvent.php index 26dadb1bb..d48f212c2 100644 --- a/lib/Event/PollTakeoverEvent.php +++ b/lib/Event/PollTakeoverEvent.php @@ -11,7 +11,7 @@ class PollTakeoverEvent extends PollOwnerChangeEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); } diff --git a/lib/Event/PollUpdatedEvent.php b/lib/Event/PollUpdatedEvent.php index d61d04a39..86cd18924 100644 --- a/lib/Event/PollUpdatedEvent.php +++ b/lib/Event/PollUpdatedEvent.php @@ -10,7 +10,7 @@ class PollUpdatedEvent extends PollEvent { public function __construct( - protected Poll $poll + protected Poll $poll, ) { parent::__construct($poll); $this->eventId = self::UPDATE; diff --git a/lib/Event/ShareChangedDisplayNameEvent.php b/lib/Event/ShareChangedDisplayNameEvent.php index 196c09c7e..d9b9fa45f 100644 --- a/lib/Event/ShareChangedDisplayNameEvent.php +++ b/lib/Event/ShareChangedDisplayNameEvent.php @@ -10,7 +10,7 @@ class ShareChangedDisplayNameEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::CHANGE_DISPLAY_NAME; diff --git a/lib/Event/ShareChangedEmailEvent.php b/lib/Event/ShareChangedEmailEvent.php index cf00c2ea6..023cc01b9 100644 --- a/lib/Event/ShareChangedEmailEvent.php +++ b/lib/Event/ShareChangedEmailEvent.php @@ -10,7 +10,7 @@ class ShareChangedEmailEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::CHANGE_EMAIL; diff --git a/lib/Event/ShareChangedLabelEvent.php b/lib/Event/ShareChangedLabelEvent.php index bfe42f218..83321cf74 100644 --- a/lib/Event/ShareChangedLabelEvent.php +++ b/lib/Event/ShareChangedLabelEvent.php @@ -10,7 +10,7 @@ class ShareChangedLabelEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::CHANGE_LABEL; diff --git a/lib/Event/ShareChangedRegistrationConstraintEvent.php b/lib/Event/ShareChangedRegistrationConstraintEvent.php index 0be170f28..e936b35db 100644 --- a/lib/Event/ShareChangedRegistrationConstraintEvent.php +++ b/lib/Event/ShareChangedRegistrationConstraintEvent.php @@ -10,7 +10,7 @@ class ShareChangedRegistrationConstraintEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::CHANGE_REG_CONSTR; diff --git a/lib/Event/ShareCreateEvent.php b/lib/Event/ShareCreateEvent.php index 0435cc931..80623b30f 100644 --- a/lib/Event/ShareCreateEvent.php +++ b/lib/Event/ShareCreateEvent.php @@ -10,7 +10,7 @@ class ShareCreateEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::ADD; diff --git a/lib/Event/ShareDeletedEvent.php b/lib/Event/ShareDeletedEvent.php index 26d0f894b..7b3743c11 100644 --- a/lib/Event/ShareDeletedEvent.php +++ b/lib/Event/ShareDeletedEvent.php @@ -10,7 +10,7 @@ class ShareDeletedEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = $share->getDeleted() ? self::DELETE : self::RESTORE; diff --git a/lib/Event/ShareLockedEvent.php b/lib/Event/ShareLockedEvent.php index 09ce46105..0e2eb3f8b 100644 --- a/lib/Event/ShareLockedEvent.php +++ b/lib/Event/ShareLockedEvent.php @@ -10,7 +10,7 @@ class ShareLockedEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = $share->getLocked() ? self::UNLOCKED : self::LOCKED; diff --git a/lib/Event/ShareRegistrationEvent.php b/lib/Event/ShareRegistrationEvent.php index 1a6835c5b..907a34b87 100644 --- a/lib/Event/ShareRegistrationEvent.php +++ b/lib/Event/ShareRegistrationEvent.php @@ -10,7 +10,7 @@ class ShareRegistrationEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::REGISTRATION; diff --git a/lib/Event/ShareTypeChangedEvent.php b/lib/Event/ShareTypeChangedEvent.php index 10e986398..abb1f96c0 100644 --- a/lib/Event/ShareTypeChangedEvent.php +++ b/lib/Event/ShareTypeChangedEvent.php @@ -10,7 +10,7 @@ class ShareTypeChangedEvent extends ShareEvent { public function __construct( - protected Share $share + protected Share $share, ) { parent::__construct($share); $this->eventId = self::CHANGE_TYPE; diff --git a/lib/Event/VoteEvent.php b/lib/Event/VoteEvent.php index 09a2c9fe4..0ab357013 100644 --- a/lib/Event/VoteEvent.php +++ b/lib/Event/VoteEvent.php @@ -15,7 +15,7 @@ abstract class VoteEvent extends BaseEvent { public const SET = 'vote_set'; public function __construct( - protected Vote $vote + protected Vote $vote, ) { parent::__construct($vote); $this->activityObjectType = 'poll'; diff --git a/lib/Event/VoteSetEvent.php b/lib/Event/VoteSetEvent.php index a1e3b1551..975bfa11a 100644 --- a/lib/Event/VoteSetEvent.php +++ b/lib/Event/VoteSetEvent.php @@ -11,7 +11,7 @@ class VoteSetEvent extends VoteEvent { public function __construct( protected Vote $vote, - protected bool $log = true + protected bool $log = true, ) { parent::__construct($vote); $this->log = $log; diff --git a/lib/Exceptions/CirclesNotEnabledException.php b/lib/Exceptions/CirclesNotEnabledException.php index 7848d86c0..22290b16b 100644 --- a/lib/Exceptions/CirclesNotEnabledException.php +++ b/lib/Exceptions/CirclesNotEnabledException.php @@ -12,7 +12,7 @@ class CirclesNotEnabledException extends Exception { public function __construct( - string $e = 'Circles is not enabled for this user' + string $e = 'Circles is not enabled for this user', ) { parent::__construct($e, Http::STATUS_NOT_FOUND); } diff --git a/lib/Exceptions/ContactsNotEnabledExceptions.php b/lib/Exceptions/ContactsNotEnabledExceptions.php index 406995dff..b731ffc77 100644 --- a/lib/Exceptions/ContactsNotEnabledExceptions.php +++ b/lib/Exceptions/ContactsNotEnabledExceptions.php @@ -12,7 +12,7 @@ class ContactsNotEnabledExceptions extends Exception { public function __construct( - string $e = 'Contacts is not enabled' + string $e = 'Contacts is not enabled', ) { parent::__construct($e, Http::STATUS_NOT_FOUND); } diff --git a/lib/Exceptions/DuplicateEntryException.php b/lib/Exceptions/DuplicateEntryException.php index 4a7623a73..a62f32230 100644 --- a/lib/Exceptions/DuplicateEntryException.php +++ b/lib/Exceptions/DuplicateEntryException.php @@ -12,7 +12,7 @@ class DuplicateEntryException extends Exception { public function __construct( - string $e = 'Duplicate Entry' + string $e = 'Duplicate Entry', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/EmptyTitleException.php b/lib/Exceptions/EmptyTitleException.php index 2837ef8a3..525122f13 100644 --- a/lib/Exceptions/EmptyTitleException.php +++ b/lib/Exceptions/EmptyTitleException.php @@ -12,7 +12,7 @@ class EmptyTitleException extends Exception { public function __construct( - string $e = 'Poll title must not be empty' + string $e = 'Poll title must not be empty', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/Exception.php b/lib/Exceptions/Exception.php index 41b1c2532..ec98711e1 100644 --- a/lib/Exceptions/Exception.php +++ b/lib/Exceptions/Exception.php @@ -13,7 +13,7 @@ class Exception extends \Exception { public function __construct( string $e = 'Unexpected error', - protected int $status = Http::STATUS_INTERNAL_SERVER_ERROR + protected int $status = Http::STATUS_INTERNAL_SERVER_ERROR, ) { parent::__construct($e); } diff --git a/lib/Exceptions/ForbiddenException.php b/lib/Exceptions/ForbiddenException.php index 7b4725286..f61c34602 100644 --- a/lib/Exceptions/ForbiddenException.php +++ b/lib/Exceptions/ForbiddenException.php @@ -12,7 +12,7 @@ class ForbiddenException extends Exception { public function __construct( - string $e = 'Forbidden' + string $e = 'Forbidden', ) { parent::__construct($e, Http::STATUS_FORBIDDEN); } diff --git a/lib/Exceptions/InsufficientAttributesException.php b/lib/Exceptions/InsufficientAttributesException.php index a9b997675..98eb17d8e 100644 --- a/lib/Exceptions/InsufficientAttributesException.php +++ b/lib/Exceptions/InsufficientAttributesException.php @@ -12,7 +12,7 @@ class InsufficientAttributesException extends Exception { public function __construct( - string $e = 'Attribut constraints not met' + string $e = 'Attribut constraints not met', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidAccessException.php b/lib/Exceptions/InvalidAccessException.php index 537c8801a..2313a7ba6 100644 --- a/lib/Exceptions/InvalidAccessException.php +++ b/lib/Exceptions/InvalidAccessException.php @@ -12,7 +12,7 @@ class InvalidAccessException extends Exception { public function __construct( - string $e = 'Invalid access value' + string $e = 'Invalid access value', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidClassException.php b/lib/Exceptions/InvalidClassException.php index 1c6637f9b..291e4936f 100644 --- a/lib/Exceptions/InvalidClassException.php +++ b/lib/Exceptions/InvalidClassException.php @@ -12,7 +12,7 @@ class InvalidClassException extends Exception { public function __construct( - string $e = 'Invalid class value' + string $e = 'Invalid class value', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidEmailAddress.php b/lib/Exceptions/InvalidEmailAddress.php index 8487af258..8b0c9f063 100644 --- a/lib/Exceptions/InvalidEmailAddress.php +++ b/lib/Exceptions/InvalidEmailAddress.php @@ -12,7 +12,7 @@ class InvalidEmailAddress extends Exception { public function __construct( - string $e = 'Invalid email address' + string $e = 'Invalid email address', ) { parent::__construct($e, Http::STATUS_FORBIDDEN); } diff --git a/lib/Exceptions/InvalidPollTypeException.php b/lib/Exceptions/InvalidPollTypeException.php index b9004d503..80a5b6956 100644 --- a/lib/Exceptions/InvalidPollTypeException.php +++ b/lib/Exceptions/InvalidPollTypeException.php @@ -12,7 +12,7 @@ class InvalidPollTypeException extends Exception { public function __construct( - string $e = 'Invalid pollType value' + string $e = 'Invalid pollType value', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidShareTypeException.php b/lib/Exceptions/InvalidShareTypeException.php index 1dff7efac..18145ccfd 100644 --- a/lib/Exceptions/InvalidShareTypeException.php +++ b/lib/Exceptions/InvalidShareTypeException.php @@ -12,7 +12,7 @@ class InvalidShareTypeException extends Exception { public function __construct( - string $e = 'Invalid share type' + string $e = 'Invalid share type', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidShowResultsException.php b/lib/Exceptions/InvalidShowResultsException.php index c708035b4..cce8fe065 100644 --- a/lib/Exceptions/InvalidShowResultsException.php +++ b/lib/Exceptions/InvalidShowResultsException.php @@ -12,7 +12,7 @@ class InvalidShowResultsException extends Exception { public function __construct( - string $e = 'Invalid showResults value' + string $e = 'Invalid showResults value', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/InvalidUsernameException.php b/lib/Exceptions/InvalidUsernameException.php index d41fcaa81..20c24e2bd 100644 --- a/lib/Exceptions/InvalidUsernameException.php +++ b/lib/Exceptions/InvalidUsernameException.php @@ -12,7 +12,7 @@ class InvalidUsernameException extends Exception { public function __construct( - string $e = 'Username not allowed' + string $e = 'Username not allowed', ) { parent::__construct($e, Http::STATUS_FORBIDDEN); } diff --git a/lib/Exceptions/NoDeadLineException.php b/lib/Exceptions/NoDeadLineException.php index 4f7246467..4ab422f3b 100644 --- a/lib/Exceptions/NoDeadLineException.php +++ b/lib/Exceptions/NoDeadLineException.php @@ -12,7 +12,7 @@ class NoDeadLineException extends Exception { public function __construct( - string $e = 'No deadline calculated' + string $e = 'No deadline calculated', ) { parent::__construct($e, Http::STATUS_OK); } diff --git a/lib/Exceptions/NoEmailAddress.php b/lib/Exceptions/NoEmailAddress.php index 517f397c9..10ac5bed6 100644 --- a/lib/Exceptions/NoEmailAddress.php +++ b/lib/Exceptions/NoEmailAddress.php @@ -12,7 +12,7 @@ class NoEmailAddress extends Exception { public function __construct( - string $e = 'No email address found' + string $e = 'No email address found', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Exceptions/NoUpdatesException.php b/lib/Exceptions/NoUpdatesException.php index b3c16e39a..8027a9bae 100644 --- a/lib/Exceptions/NoUpdatesException.php +++ b/lib/Exceptions/NoUpdatesException.php @@ -12,7 +12,7 @@ class NoUpdatesException extends Exception { public function __construct( - string $e = 'No updates' + string $e = 'No updates', ) { parent::__construct($e, Http::STATUS_NOT_MODIFIED); } diff --git a/lib/Exceptions/NotAuthorizedException.php b/lib/Exceptions/NotAuthorizedException.php index 07a717cc3..253c65306 100644 --- a/lib/Exceptions/NotAuthorizedException.php +++ b/lib/Exceptions/NotAuthorizedException.php @@ -12,7 +12,7 @@ class NotAuthorizedException extends Exception { public function __construct( - string $e = 'Unauthorized or not found' + string $e = 'Unauthorized or not found', ) { parent::__construct($e, Http::STATUS_UNAUTHORIZED); } diff --git a/lib/Exceptions/NotFoundException.php b/lib/Exceptions/NotFoundException.php index 98191d8bc..e877f7f97 100644 --- a/lib/Exceptions/NotFoundException.php +++ b/lib/Exceptions/NotFoundException.php @@ -12,7 +12,7 @@ class NotFoundException extends Exception { public function __construct( - string $e = 'Not found' + string $e = 'Not found', ) { parent::__construct($e, Http::STATUS_NOT_FOUND); } diff --git a/lib/Exceptions/OCPEventException.php b/lib/Exceptions/OCPEventException.php index 8b46cde8a..01ab3215c 100644 --- a/lib/Exceptions/OCPEventException.php +++ b/lib/Exceptions/OCPEventException.php @@ -12,7 +12,7 @@ class OCPEventException extends Exception { public function __construct( - string $e = 'OCP namespace event' + string $e = 'OCP namespace event', ) { parent::__construct($e, Http::STATUS_OK); } diff --git a/lib/Exceptions/ShareNotFoundException.php b/lib/Exceptions/ShareNotFoundException.php index 5c1acecb7..262ab9fa5 100644 --- a/lib/Exceptions/ShareNotFoundException.php +++ b/lib/Exceptions/ShareNotFoundException.php @@ -10,7 +10,7 @@ class ShareNotFoundException extends NotFoundException { public function __construct( - string $e = 'Share not found' + string $e = 'Share not found', ) { parent::__construct($e); } diff --git a/lib/Exceptions/TooShortException.php b/lib/Exceptions/TooShortException.php index 32c8c1556..dcc3422d3 100644 --- a/lib/Exceptions/TooShortException.php +++ b/lib/Exceptions/TooShortException.php @@ -12,7 +12,7 @@ class TooShortException extends Exception { public function __construct( - string $e = 'String too short' + string $e = 'String too short', ) { parent::__construct($e, Http::STATUS_FORBIDDEN); } diff --git a/lib/Exceptions/UserNotFoundException.php b/lib/Exceptions/UserNotFoundException.php index 023e950f1..6e506795e 100644 --- a/lib/Exceptions/UserNotFoundException.php +++ b/lib/Exceptions/UserNotFoundException.php @@ -10,7 +10,7 @@ class UserNotFoundException extends NotFoundException { public function __construct( - string $e = 'User not found' + string $e = 'User not found', ) { parent::__construct($e); } diff --git a/lib/Exceptions/VoteLimitExceededException.php b/lib/Exceptions/VoteLimitExceededException.php index 522792076..6fd69cb5c 100644 --- a/lib/Exceptions/VoteLimitExceededException.php +++ b/lib/Exceptions/VoteLimitExceededException.php @@ -12,7 +12,7 @@ class VoteLimitExceededException extends Exception { public function __construct( - string $e = 'Vote limit exceeded' + string $e = 'Vote limit exceeded', ) { parent::__construct($e, Http::STATUS_CONFLICT); } diff --git a/lib/Filter/ActivityFilter.php b/lib/Filter/ActivityFilter.php index 66951be93..b6b3d99ac 100644 --- a/lib/Filter/ActivityFilter.php +++ b/lib/Filter/ActivityFilter.php @@ -50,7 +50,7 @@ class ActivityFilter implements \OCP\Activity\IFilter { public function __construct( IL10N $l10n, - IURLGenerator $urlGenerator + IURLGenerator $urlGenerator, ) { $this->l10n = $l10n; $this->urlGenerator = $urlGenerator; diff --git a/lib/Model/CalendarEvent.php b/lib/Model/CalendarEvent.php index 07e39b1ff..e7f9b5b87 100644 --- a/lib/Model/CalendarEvent.php +++ b/lib/Model/CalendarEvent.php @@ -31,7 +31,7 @@ public function __construct( protected ICalendar $calendar, protected ?DateTimeImmutable $filterFrom = null, protected ?DateTimeImmutable $filterTo = null, - protected ?DateTimeZone $timezone = null + protected ?DateTimeZone $timezone = null, ) { $this->event = $this->iCal['objects'][0]; $this->hasRRule = isset($this->event['RRULE']); diff --git a/lib/Model/Group/Circle.php b/lib/Model/Group/Circle.php index e9274512f..337143dd3 100644 --- a/lib/Model/Group/Circle.php +++ b/lib/Model/Group/Circle.php @@ -27,7 +27,7 @@ class Circle extends UserBase { private CirclesCircle $circle; public function __construct( - string $id + string $id, ) { parent::__construct($id, self::TYPE); $this->icon = self::ICON; diff --git a/lib/Model/Group/ContactGroup.php b/lib/Model/Group/ContactGroup.php index 08a4a1a54..8acf5dd01 100644 --- a/lib/Model/Group/ContactGroup.php +++ b/lib/Model/Group/ContactGroup.php @@ -19,7 +19,7 @@ class ContactGroup extends UserBase { public const ICON = 'icon-group'; public function __construct( - string $id + string $id, ) { parent::__construct($id, self::TYPE); $this->icon = self::ICON; diff --git a/lib/Model/Group/Group.php b/lib/Model/Group/Group.php index 4b281d6a2..02b951c5b 100644 --- a/lib/Model/Group/Group.php +++ b/lib/Model/Group/Group.php @@ -21,7 +21,7 @@ class Group extends UserBase { private IGroup $group; public function __construct( - string $id + string $id, ) { parent::__construct($id, self::TYPE); $this->icon = self::ICON; diff --git a/lib/Model/Mail/ConfirmationMail.php b/lib/Model/Mail/ConfirmationMail.php index c4cad7a2f..ad5d326ff 100644 --- a/lib/Model/Mail/ConfirmationMail.php +++ b/lib/Model/Mail/ConfirmationMail.php @@ -21,7 +21,7 @@ class ConfirmationMail extends MailBase { public function __construct( string $recipientId, - int $pollId + int $pollId, ) { parent::__construct($recipientId, $pollId); $this->confirmedOptions = $this->optionMapper->findConfirmed($pollId); diff --git a/lib/Model/Mail/MailBase.php b/lib/Model/Mail/MailBase.php index 3f6e0e3fe..db77fc780 100644 --- a/lib/Model/Mail/MailBase.php +++ b/lib/Model/Mail/MailBase.php @@ -46,7 +46,7 @@ abstract class MailBase { public function __construct( protected string $recipientId, protected int $pollId, - protected string $url = '' + protected string $url = '', ) { $this->setup(); } @@ -157,14 +157,14 @@ protected function getLegalLinks(): string { $legal = ''; if ($this->appSettings->getUseImprintUrl()) { - $legal = '' . $this->l10n->t('Legal Notice') . ''; + $legal = '' . $this->l10n->t('Legal Notice') . ''; } if ($this->appSettings->getUsePrivacyUrl()) { if ($this->appSettings->getUseImprintUrl()) { $legal = $legal . ' | '; } - $legal = $legal . '' . $this->l10n->t('Privacy Policy') . ''; + $legal = $legal . '' . $this->l10n->t('Privacy Policy') . ''; } return $legal; } diff --git a/lib/Model/Mail/NotificationMail.php b/lib/Model/Mail/NotificationMail.php index 8fc01bdfe..ccb7de5c9 100644 --- a/lib/Model/Mail/NotificationMail.php +++ b/lib/Model/Mail/NotificationMail.php @@ -22,7 +22,7 @@ class NotificationMail extends MailBase { protected const TEMPLATE_CLASS = AppConstants::APP_ID . '.Notification'; public function __construct( - protected Subscription $subscription + protected Subscription $subscription, ) { parent::__construct($subscription->getUserId(), $subscription->getPollId()); } diff --git a/lib/Model/Mail/ReminderMail.php b/lib/Model/Mail/ReminderMail.php index 21d32477f..d65387029 100644 --- a/lib/Model/Mail/ReminderMail.php +++ b/lib/Model/Mail/ReminderMail.php @@ -29,7 +29,7 @@ class ReminderMail extends MailBase { public function __construct( protected string $recipientId, - protected int $pollId + protected int $pollId, ) { parent::__construct($recipientId, $pollId); $this->deadline = $this->poll->getDeadline(); diff --git a/lib/Model/Settings/AppSettings.php b/lib/Model/Settings/AppSettings.php index 629a35574..b87ef1421 100644 --- a/lib/Model/Settings/AppSettings.php +++ b/lib/Model/Settings/AppSettings.php @@ -49,7 +49,6 @@ class AppSettings implements JsonSerializable { public function __construct( private IConfig $config, private UserSession $userSession, - ) { } diff --git a/lib/Model/User/Email.php b/lib/Model/User/Email.php index 85b7f7dfd..7746f7927 100644 --- a/lib/Model/User/Email.php +++ b/lib/Model/User/Email.php @@ -19,7 +19,7 @@ public function __construct( string $id, string $displayName = '', string $emailAddress = '', - string $languageCode = '' + string $languageCode = '', ) { parent::__construct($id, self::TYPE, languageCode: $languageCode); $this->icon = self::ICON; diff --git a/lib/Model/User/GenericUser.php b/lib/Model/User/GenericUser.php index d545da5ce..aea68be39 100644 --- a/lib/Model/User/GenericUser.php +++ b/lib/Model/User/GenericUser.php @@ -23,7 +23,7 @@ public function __construct( string $emailAddress = '', string $languageCode = '', string $localeCode = '', - string $timeZoneName = '' + string $timeZoneName = '', ) { parent::__construct($id, $type, $displayName, $emailAddress, $languageCode, $localeCode, $timeZoneName); diff --git a/lib/Model/User/User.php b/lib/Model/User/User.php index 8092ba550..52682bb6d 100644 --- a/lib/Model/User/User.php +++ b/lib/Model/User/User.php @@ -27,7 +27,7 @@ class User extends UserBase { public function __construct( string $id, - string $type = self::TYPE + string $type = self::TYPE, ) { parent::__construct($id, $type); $this->icon = self::ICON; diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php index 3a56f414b..a869a6e65 100644 --- a/lib/Service/MailService.php +++ b/lib/Service/MailService.php @@ -174,7 +174,7 @@ public function sendNotifications(): void { } } - public function sendInvitation(Share $share, ?SentResult &$sentResult = null): SentResult|null { + public function sendInvitation(Share $share, ?SentResult &$sentResult = null): ?SentResult { foreach ($this->userMapper->getUserFromShare($share)->getMembers() as $recipient) { $invitation = new InvitationMail($recipient->getId(), $share); diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php index db4a02d8e..bb6e81c0d 100644 --- a/lib/Service/SettingsService.php +++ b/lib/Service/SettingsService.php @@ -15,7 +15,9 @@ class SettingsService { /** * @psalm-suppress PossiblyUnusedMethod */ - public function __construct(private AppSettings $appSettings) { + public function __construct( + private AppSettings $appSettings, + ) { } /** diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php index cab9b0de9..df4ab5838 100644 --- a/lib/Service/ShareService.php +++ b/lib/Service/ShareService.php @@ -297,11 +297,11 @@ public function deleteEmailAddress(Share $share): Share { * @param string|null $language */ private function convertPersonalPublicShareToExternalShare( - string|null $userId = null, - string|null $displayName = null, - string|null $emailAddress = null, - string|null $timeZone = null, - string|null $language = null, + ?string $userId = null, + ?string $displayName = null, + ?string $emailAddress = null, + ?string $timeZone = null, + ?string $language = null, ): void { // paranoia double check @@ -361,7 +361,7 @@ public function register( string $publicShareToken, string $displayName, string $emailAddress = '', - string $timeZone = '' + string $timeZone = '', ): Share { $this->share = $this->get($publicShareToken); $displayName = $this->systemService->validatePublicUsername($displayName, share: $this->share); @@ -454,7 +454,7 @@ private function lock(Share $share, bool $unlock = false): Share { return $share; } - public function sendAllInvitations(int $pollId): SentResult|null { + public function sendAllInvitations(int $pollId): ?SentResult { $sentResult = new SentResult(); // first resolve group shares @@ -514,7 +514,7 @@ private function resolveGroup(Share $share): array { * @param Share $share * @param SentResult $sentResult to collect results */ - public function sendInvitation(Share $share, ?SentResult &$sentResult = null): SentResult|null { + public function sendInvitation(Share $share, ?SentResult &$sentResult = null): ?SentResult { if (in_array($share->getType(), [Share::TYPE_USER, Share::TYPE_ADMIN], true)) { $this->notificationService->sendInvitation($share->getPollId(), $share->getUserId()); } elseif ($share->getType() === Share::TYPE_GROUP) { @@ -557,7 +557,7 @@ public function add( string $type, string $userId = '', string $displayName = '', - string $emailAddress = '' + string $emailAddress = '', ): Share { $this->pollMapper->find($pollId)->request(Poll::PERMISSION_POLL_EDIT); @@ -634,7 +634,7 @@ private function createNewShare( int $pollId, UserBase $userGroup, bool $preventInvitation = false, - string $timeZone = '' + string $timeZone = '', ): Share { $preventInvitation = $userGroup->getType() === UserBase::TYPE_PUBLIC ?: $preventInvitation; diff --git a/lib/Settings/ActivitySettings.php b/lib/Settings/ActivitySettings.php index 2704caa4b..12f480529 100644 --- a/lib/Settings/ActivitySettings.php +++ b/lib/Settings/ActivitySettings.php @@ -18,7 +18,9 @@ class ActivitySettings implements ISetting { /** * @psalm-suppress PossiblyUnusedMethod */ - public function __construct(protected IL10N $l10n) { + public function __construct( + protected IL10N $l10n, + ) { } public function getIdentifier() : string { diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php index a38b35e1a..9c8761b0d 100644 --- a/lib/Settings/AdminSection.php +++ b/lib/Settings/AdminSection.php @@ -17,7 +17,10 @@ * @psalm-suppress UnusedClass */ class AdminSection implements IIconSection { - public function __construct(private IL10N $l10n, private IURLGenerator $urlGenerator) { + public function __construct( + private IL10N $l10n, + private IURLGenerator $urlGenerator, + ) { } public function getID(): string { diff --git a/lib/Settings/PersonalSection.php b/lib/Settings/PersonalSection.php index 73f4604ae..46dec7815 100644 --- a/lib/Settings/PersonalSection.php +++ b/lib/Settings/PersonalSection.php @@ -17,7 +17,10 @@ * @psalm-suppress UnusedClass */ class PersonalSection implements IIconSection { - public function __construct(private IL10N $l10n, private IURLGenerator $urlGenerator) { + public function __construct( + private IL10N $l10n, + private IURLGenerator $urlGenerator, + ) { } public function getID(): string { diff --git a/lib/UserSession.php b/lib/UserSession.php index 79775b0f6..d9ef5534f 100644 --- a/lib/UserSession.php +++ b/lib/UserSession.php @@ -43,7 +43,6 @@ public function __construct( protected UserMapper $userMapper, protected ShareMapper $shareMapper, protected Share $share, - ) { }