apply new coding standard

Signed-off-by: dartcafe <[email protected]>

lib/Activity/PollChanges.php

@@ -18,7 +18,7 @@
 class PollChanges implements IFilter {
 	public function __construct(
 		protected IL10N $l10n,
-		protected IURLGenerator $urlGenerator
+		protected IURLGenerator $urlGenerator,
 	) {
 	}
 

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 {

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();
 	}

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();
 	}

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();
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

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);
 	}

lib/Dashboard/PollWidget.php

@@ -19,7 +19,7 @@ class PollWidget implements IWidget {
 	 */
 	public function __construct(
 		private IL10N $l10n,
-		private IURLGenerator $urlGenerator
+		private IURLGenerator $urlGenerator,
 	) {
 	}
 

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))

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 {

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))

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');
 

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);
 	}

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));
 			}
 

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))

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;

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;

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;

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;

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;

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;

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;

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;

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;

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';

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;

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;

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;

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;