Merge pull request #6339 from nextcloud/dependabot/composer/nextcloud…

…/coding-standard-1.3.1
nextcloud · Sep 26, 2024 · a3724d6 · a3724d6
2 parents bd6475c + 439c2b4
commit a3724d6
Show file tree

Hide file tree

Showing 45 changed files with 126 additions and 77 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -100,7 +100,7 @@ public function __construct(
 		StackMapper $stackMapper,
 		AclMapper $aclMapper,
 		IFactory $l10nFactory,
-		?string $userId
+		?string $userId,
 	) {
 		$this->manager = $manager;
 		$this->permissionService = $permissionsService;
@@ -484,7 +484,7 @@ private function findObjectForEntity($objectType, $entity) {
 					$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 @@ private function findObjectForEntity($objectType, $entity) {
 					$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
@@ -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
@@ -15,7 +15,7 @@
 
 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
@@ -82,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		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 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		if ($boardId) {
 			$this->boardService->transferBoardOwnership($boardId, $newOwner, $remapAssignment);
-			$output->writeln('<info>Board ' . $board->getTitle() . ' from '. $board->getOwner() ." transferred to $newOwner completed</info>");
+			$output->writeln('<info>Board ' . $board->getTitle() . ' from ' . $board->getOwner() . " transferred to $newOwner completed</info>");
 			return 0;
 		}
 

diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php
@@ -21,7 +21,8 @@
 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
@@ -20,7 +20,7 @@ public function __construct(
 		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
@@ -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
@@ -31,7 +31,7 @@ public function __construct(
 		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
@@ -45,7 +45,7 @@ public function __construct(
 		IManager $notificationManager,
 		ICacheFactory $cacheFactory,
 		$databaseType = 'sqlite3',
-		$database4ByteSupport = true
+		$database4ByteSupport = true,
 	) {
 		parent::__construct($db, 'deck_cards', Card::class);
 		$this->labelMapper = $labelMapper;
@@ -402,7 +402,7 @@ private function extendQueryByFilter(IQueryBuilder $qb, SearchQuery $query) {
 		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
@@ -24,7 +24,7 @@ public function __construct(
 		IDBConnection $db,
 		ICacheFactory $cacheFactory,
 		IRequest $request,
-		?string $userId
+		?string $userId,
 	) {
 		$this->db = $db;
 		$this->cache = $cacheFactory->createDistributed('deck_changes');
@@ -43,7 +43,7 @@ public function boardChanged($boardId) {
 	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 @@ public function cardChanged($cardId, $updateCard = true) {
 	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 @@ public function checkEtag($type, $id) {
 	}
 
 	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
@@ -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
@@ -38,7 +38,7 @@ public function __construct(
 		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
@@ -20,13 +20,13 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$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
@@ -58,7 +58,7 @@ public function __construct(
 		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
@@ -36,7 +36,7 @@ public function __construct(
 		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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -76,7 +76,7 @@ public function __construct(
 		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
@@ -58,7 +58,7 @@ public function __construct(
 		$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
@@ -89,7 +89,7 @@ public function __construct(
 		IDBConnection $connection,
 		BoardServiceValidator $boardServiceValidator,
 		SessionMapper $sessionMapper,
-		?string $userId
+		?string $userId,
 	) {
 		$this->boardMapper = $boardMapper;
 		$this->stackMapper = $stackMapper;