Merge pull request #3681 from nextcloud/dep/next/updates

Dep/next/updates
nextcloud · Aug 31, 2024 · 5754fef · 5754fef
2 parents c5e6560 + df84ac4
commit 5754fef
Show file tree

Hide file tree

Showing 32 changed files with 756 additions and 776 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Command/Share/Add.php b/lib/Command/Share/Add.php
@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $userIds
 	 * @psalm-suppress UnusedMethod
 	 */
@@ -95,7 +95,7 @@ private function inviteUsers(Poll $poll, array $userIds): void {
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $groupIds
 	 * @psalm-suppress UnusedMethod
 	 */
@@ -111,7 +111,7 @@ private function inviteGroups(Poll $poll, array $groupIds): void {
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $emails
 	 * @psalm-suppress UnusedMethod
 	 */

diff --git a/lib/Command/Share/Remove.php b/lib/Command/Share/Remove.php
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $userIds
 	 * @psalm-suppress UnusedMethod
 	 */
@@ -93,7 +93,7 @@ private function removeUsers(Poll $poll, array $userIds): void {
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $groupIds
 	 * @psalm-suppress UnusedMethod
 	 */
@@ -106,7 +106,7 @@ private function removeGroups(Poll $poll, array $groupIds): void {
 	}
 
 	/**
-	 * @param Poll     $poll
+	 * @param Poll $poll
 	 * @param string[] $emails
 	 * @psalm-suppress UnusedMethod
 	 */

diff --git a/lib/Db/EntityWithUser.php b/lib/Db/EntityWithUser.php
@@ -51,7 +51,7 @@ public function getAnonymizeLevel(): string {
 		}
 
 		// Anonymize if poll's anonymize setting is true
-		if ((bool) $this->anonymized) {
+		if ((bool)$this->anonymized) {
 			return self::ANON_FULL;
 		}
 

diff --git a/lib/Db/Option.php b/lib/Db/Option.php
@@ -132,7 +132,7 @@ private function getVotes(): array {
 		];
 	}
 
-	public function getOwnerUser(): UserBase | null {
+	public function getOwnerUser(): UserBase|null {
 		if ($this->getOwner() === '') {
 			return null;
 		}
@@ -279,7 +279,7 @@ public function getDateStringLocalized(DateTimeZone $timeZone, IL10N $l10n): str
 
 		// If duration is zero, the option represents a moment with day and time
 		if ($this->getDuration() === 0) {
-			return (string) $l10n->l('datetime', $mutableFrom);
+			return (string)$l10n->l('datetime', $mutableFrom);
 		}
 
 		$dateTimeFrom = $l10n->l('datetime', $mutableFrom);
@@ -293,15 +293,15 @@ public function getDateStringLocalized(DateTimeZone $timeZone, IL10N $l10n): str
 			$dateTimeTo = $l10n->l('date', $mutableTo->sub($dayLongSecond));
 			// if start and end day are identiacal, just return the start day
 			if ($dateTimeFrom === $dateTimeTo) {
-				return (string) $dateTimeFrom;
+				return (string)$dateTimeFrom;
 			}
 		}
 
 		if ($sameDay) {
 			$dateTimeTo = $l10n->l('time', $mutableTo);
 		}
 
-		return (string) $dateTimeFrom . ' - ' . (string) $dateTimeTo;
+		return (string)$dateTimeFrom . ' - ' . (string)$dateTimeTo;
 	}
 
 	/**

diff --git a/lib/Db/OptionMapper.php b/lib/Db/OptionMapper.php
@@ -151,7 +151,7 @@ public function purgeDeletedOptions(int $offset): void {
 	/**
 	 * Build the enhanced query with joined tables
 	 * @param bool $hideResults Whether poll results are defined as beeing hidden
-	 *             injects the poll permission allowdSeeResults into the query
+	 *                          injects the poll permission allowdSeeResults into the query
 	 */
 	protected function buildQuery(bool $hideResults = false): IQueryBuilder {
 		$currentUserId = $this->userSession->getCurrentUserId();