Merge pull request #3715 from nextcloud/maintenance/next

Maintenance
nextcloud · Sep 28, 2024 · 2676031 · 2676031
2 parents 81aade8 + 35bb6ae
commit 2676031
Show file tree

Hide file tree

Showing 55 changed files with 1,866 additions and 792 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -8,9 +8,11 @@
 require_once 'vendor/autoload.php';
 
 use Nextcloud\CodingStandard\Config;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
 $config = new Config();
 $config
+	->setParallelConfig(ParallelConfigFactory::detect())
 	->getFinder()
 	->ignoreVCSIgnored(true)
 	->notPath('build')

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@
 app_name=polls
 
 project_dir=.
-build_dir=./build
+build_dir=$(project_dir)/build
 build_tools_dir=$(build_dir)/tools
 build_source_dir=$(build_dir)/source
 appstore_build_dir=$(build_dir)/artifacts/appstore

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
 		"optimize-autoloader": true,
 		"autoloader-suffix": "Polls",
 		"platform": {
-        "php": "8.0"
-      },
+			"php": "8.0"
+		},
 		"allow-plugins": {
 			"bamarni/composer-bin-plugin": true
 		}
@@ -36,7 +36,7 @@
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
-		"doctrine/dbal": "3.7",
+		"doctrine/dbal": "3.8.6",
 		"league/factory-muffin": "^3.0",
 		"league/factory-muffin-faker": "^2.0",
 		"nextcloud/coding-standard": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
@@ -121,11 +121,11 @@ public function getSession(): JSONResponse {
 
 	/**
 	 * Watch poll for updates
-	 * @param ?int $offset only watch changes after this timestamp
+	 * @param int|null $offset only watch changes after this timestamp
 	 */
 	#[PublicPage]
 	#[ShareTokenRequired]
-	public function watchPoll(?int $offset): JSONResponse {
+	public function watchPoll(int|null $offset): JSONResponse {
 		return $this->responseLong(fn () => [
 			'updates' => $this->watchService->watchUpdates($this->userSession->getShare()->getPollId(), $offset)
 		]);

diff --git a/lib/Controller/WatchController.php b/lib/Controller/WatchController.php
@@ -29,11 +29,11 @@ public function __construct(
 	/**
 	 * Watch poll for updates
 	 * @param int $pollId poll id of poll to wqatch
-	 * @param ?int $offset only watch changes after this timestamp
+	 * @param int|null $offset only watch changes after this timestamp
 	 */
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
-	public function watchPoll(int $pollId, ?int $offset): JSONResponse {
+	public function watchPoll(int $pollId, int|null $offset): JSONResponse {
 		return $this->responseLong(fn () => ['updates' => $this->watchService->watchUpdates($pollId, $offset)]);
 	}
 }
diff --git a/lib/Dashboard/PollWidget.php b/lib/Dashboard/PollWidget.php
@@ -39,7 +39,7 @@ public function getIconClass(): string {
 		return 'icon-polls-dark';
 	}
 
-	public function getUrl(): ?string {
+	public function getUrl(): string|null {
 		return $this->urlGenerator->linkToRouteAbsolute(AppConstants::APP_ID . '.page.index');
 	}
 

diff --git a/lib/Db/Comment.php b/lib/Db/Comment.php
@@ -34,7 +34,7 @@ class Comment extends EntityWithUser implements JsonSerializable {
 	public $id = null;
 	protected int $pollId = 0;
 	protected string $userId = '';
-	protected ?string $comment = null;
+	protected string|null $comment = null;
 	protected int $timestamp = 0;
 	protected int $deleted = 0;
 

diff --git a/lib/Db/Log.php b/lib/Db/Log.php
@@ -47,9 +47,9 @@ class Log extends Entity implements JsonSerializable {
 	// schema columns
 	public $id = null;
 	protected int $pollId = 0;
-	protected ?string $userId = '';
-	protected ?string $displayName = '';
-	protected ?string $messageId = '';
+	protected string|null $userId = '';
+	protected string|null $displayName = '';
+	protected string|null $messageId = '';
 	protected int $created = 0;
 	protected int $processed = 0;
 

diff --git a/lib/Db/Option.php b/lib/Db/Option.php
@@ -70,7 +70,7 @@ class Option extends EntityWithUser implements JsonSerializable {
 	protected int $deleted = 0;
 
 	// joined columns
-	protected ?string $userVoteAnswer = '';
+	protected string|null $userVoteAnswer = '';
 	protected int $optionLimit = 0;
 	protected int $voteLimit = 0;
 	protected int $userCountYesVotes = 0;

diff --git a/lib/Db/Poll.php b/lib/Db/Poll.php
@@ -128,8 +128,8 @@ class Poll extends EntityWithUser implements JsonSerializable {
 	public $id = null;
 	protected string $type = '';
 	protected string $title = '';
-	protected ?string $description = '';
-	protected ?string $owner = '';
+	protected string|null $description = '';
+	protected string|null $owner = '';
 	protected int $created = 0;
 	protected int $expire = 0;
 	protected int $deleted = 0;
@@ -146,15 +146,15 @@ class Poll extends EntityWithUser implements JsonSerializable {
 	protected int $hideBookedUp = 0;
 	protected int $useNo = 0;
 	protected int $lastInteraction = 0;
-	protected ?string $miscSettings = '';
+	protected string|null $miscSettings = '';
 
 	// joined columns
-	protected ?int $isCurrentUserLocked = 0;
+	protected int|null $isCurrentUserLocked = 0;
 	protected int $maxDate = 0;
 	protected int $minDate = 0;
 	protected string $userRole = self::ROLE_NONE;
 	protected string $shareToken = '';
-	protected ?string $groupShares = '';
+	protected string|null $groupShares = '';
 	protected int $countOptions = 0;
 
 	// subqueried columns

diff --git a/lib/Db/PollMapper.php b/lib/Db/PollMapper.php
@@ -295,7 +295,7 @@ protected function joinOptionsForMaxDate(IQueryBuilder &$qb, string $fromAlias):
 	/**
 	 * Subquery for votes count
 	 */
-	protected function subQueryVotesCount(string $fromAlias, IParameter $currentUserId, ?IParameter $answerFilter = null): IQueryBuilder {
+	protected function subQueryVotesCount(string $fromAlias, IParameter $currentUserId, IParameter|null $answerFilter = null): IQueryBuilder {
 		$subAlias = 'user_vote_sub';
 
 		$subQuery = $this->db->getQueryBuilder();

diff --git a/lib/Db/Preferences.php b/lib/Db/Preferences.php
@@ -43,7 +43,7 @@ class Preferences extends Entity implements JsonSerializable {
 	public $id = 0;
 	protected string $userId = '';
 	protected int $timestamp = 0;
-	protected ?string $preferences = '';
+	protected string|null $preferences = '';
 
 	public function __construct() {
 		$this->addType('timestamp', 'int');

diff --git a/lib/Db/PreferencesMapper.php b/lib/Db/PreferencesMapper.php
@@ -30,7 +30,7 @@ public function __construct(IDBConnection $db) {
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
 	 * @return Preferences
 	 */
-	public function find(?string $userId): Preferences {
+	public function find(string|null $userId): Preferences {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('*')

diff --git 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|null $entityClass = null
 	) {
 		parent::__construct($db, $tableName, $entityClass);
 	}

diff --git a/lib/Db/Share.php b/lib/Db/Share.php
@@ -114,12 +114,12 @@ class Share extends EntityWithUser implements JsonSerializable {
 	protected string $type = '';
 	protected string $label = '';
 	protected string $userId = '';
-	protected ?string $displayName = null;
-	protected ?string $emailAddress = null;
+	protected string|null $displayName = null;
+	protected string|null $emailAddress = null;
 	protected int $invitationSent = 0;
 	protected int $reminderSent = 0;
 	protected int $locked = 0;
-	protected ?string $miscSettings = '';
+	protected string|null $miscSettings = '';
 	protected int $deleted = 0;
 
 	// joined columns

diff --git a/lib/Db/TableManager.php b/lib/Db/TableManager.php
@@ -259,7 +259,7 @@ public function removeOrphaned(): void {
 	 *
 	 * @psalm-return list<string>
 	 */
-	public function deleteAllDuplicates(?IOutput $output = null): array {
+	public function deleteAllDuplicates(IOutput|null $output = null): array {
 		$messages = [];
 		foreach (TableSchema::UNIQUE_INDICES as $tableName => $index) {
 			$count = $this->deleteDuplicates($tableName, $index['columns']);
@@ -346,7 +346,7 @@ public function fixVotes(): void {
 		}
 	}
 
-	public function resetLastInteraction(?int $timestamp = null): array {
+	public function resetLastInteraction(int|null $timestamp = null): array {
 		$messages = [];
 		$timestamp = $timestamp ?? time();
 		$query = $this->connection->getQueryBuilder();

diff --git a/lib/Db/UserMapper.php b/lib/Db/UserMapper.php
@@ -91,7 +91,7 @@ public function getParticipants(int $pollId): array {
 		return $users;
 	}
 
-	public function getUserFromUserBase(string $userId, ?int $pollId = null): User {
+	public function getUserFromUserBase(string $userId, int|null $pollId = null): User {
 		$user = $this->userManager->get($userId);
 		if ($user instanceof IUser) {
 			try {

diff --git a/lib/Db/Vote.php b/lib/Db/Vote.php
@@ -49,7 +49,7 @@ class Vote extends EntityWithUser implements JsonSerializable {
 	protected int $deleted = 0;
 
 	// joined columns
-	protected ?int $optionId = null;
+	protected int|null $optionId = null;
 
 	public function __construct() {
 		$this->addType('id', 'int');

diff --git a/lib/Event/BaseEvent.php b/lib/Event/BaseEvent.php
@@ -17,8 +17,8 @@
 use OCP\EventDispatcher\Event;
 
 abstract class BaseEvent extends Event {
-	protected ?string $activityObjectType = null;
-	protected ?string $eventId = null;
+	protected string|null $activityObjectType = null;
+	protected string|null $eventId = null;
 	protected array $activitySubjectParams = [];
 	protected bool $log = true;
 	protected Poll $poll;
@@ -73,7 +73,7 @@ public function getNotification(): array {
 		return [];
 	}
 
-	public function getActivityObjectType(): ?string {
+	public function getActivityObjectType(): string|null {
 		return $this->activityObjectType;
 	}
 
@@ -84,7 +84,7 @@ public function getActivityObjectId(): int {
 		return $this->eventObject->getId();
 	}
 
-	public function getActivityType(): ?string {
+	public function getActivityType(): string|null {
 		return $this->eventId;
 	}
 

diff --git a/lib/Exceptions/ShareAlreadyExistsException.php b/lib/Exceptions/ShareAlreadyExistsException.php
@@ -14,11 +14,11 @@
 class ShareAlreadyExistsException extends Exception {
 	public function __construct(
 		string $e = 'Share already exists',
-		private ?Share $existingShare = null,
+		private Share|null $existingShare = null,
 	) {
 		parent::__construct($e, Http::STATUS_OK);
 	}
-	public function getShare(): ?Share {
+	public function getShare(): Share|null {
 		return $this->existingShare;
 	}
 }