Merge pull request #3022 from nextcloud/ref/psalm

Code maintenence
nextcloud · Aug 13, 2023 · ae4bcdf · ae4bcdf
2 parents 7fb5102 + 3484143
commit ae4bcdf
Show file tree

Hide file tree

Showing 24 changed files with 14 additions and 352 deletions.
diff --git a/lib/Cron/GroupDeletedJob.php b/lib/Cron/GroupDeletedJob.php
@@ -52,13 +52,6 @@ protected function run($argument) {
 			'group' => $group
 		]);
 
-		$replacementName = 'deleted_' . $this->secureRandom->generate(
-			8,
-			ISecureRandom::CHAR_DIGITS .
-			ISecureRandom::CHAR_LOWER .
-			ISecureRandom::CHAR_UPPER
-		);
-
 		$this->shareMapper->deleteByIdAndType($group, Share::TYPE_GROUP);
 	}
 }
diff --git a/lib/Db/Poll.php b/lib/Db/Poll.php
@@ -211,10 +211,6 @@ public function getExpired(): bool {
 		);
 	}
 
-	public function getUri(): string {
-		return self::URI_PREFIX . $this->getId();
-	}
-
 	public function getVoteUrl() : string {
 		return $this->urlGenerator->linkToRouteAbsolute(
 			AppConstants::APP_ID . '.page.vote',

diff --git a/lib/Db/PollMapper.php b/lib/Db/PollMapper.php
@@ -54,17 +54,6 @@ public function find(int $id): Poll {
 		return $this->findEntity($qb);
 	}
 
-	/**
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @return Poll[]
-	 */
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-		   ->from($this->getTableName());
-		return $this->findEntities($qb);
-	}
-
 	/**
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 * @return Poll[]
@@ -110,7 +99,7 @@ public function findOwner(string $userId): array {
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 * @return Poll[]
 	 */
-	public function search(string $userId, ISearchQuery $query): array {
+	public function search(ISearchQuery $query): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())

diff --git a/lib/Db/ShareMapper.php b/lib/Db/ShareMapper.php
@@ -41,21 +41,6 @@ public function __construct(IDBConnection $db) {
 		parent::__construct($db, Share::TABLE, Share::class);
 	}
 
-	/**
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @return Share[]
-	 * @psalm-return array<array-key, Share>
-	 */
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-		   ->from($this->getTableName());
-
-		return $this->findEntities($qb);
-	}
-
-
 	/**
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 * @return Share[]
@@ -145,25 +130,6 @@ public function findByToken(string $token): Share {
 		}
 	}
 
-	public function deleteByPoll(int $pollId): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete($this->getTableName())
-		   ->where(
-		   	$qb->expr()->eq('poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT))
-		   );
-
-		$qb->executeStatement();
-	}
-
-	public function deleteByUserId(string $userId): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->getTableName())
-			->where('user_id = :userId')
-			->setParameter('userId', $userId);
-		$query->executeStatement();
-	}
-
 	/**
 	 * @return void
 	 */
@@ -176,18 +142,4 @@ public function deleteByIdAndType(string $id, string $type): void {
 			->setParameter('type', $type);
 		$query->executeStatement();
 	}
-
-	/**
-	 * @return void
-	 */
-	public function remove(int $shareId): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete($this->getTableName())
-		   ->where(
-		   	$qb->expr()->eq('id', $qb->createNamedParameter($shareId, IQueryBuilder::PARAM_INT))
-		   );
-
-		$qb->executeStatement();
-	}
 }
diff --git a/lib/Db/SubscriptionMapper.php b/lib/Db/SubscriptionMapper.php
@@ -38,21 +38,6 @@ public function __construct(IDBConnection $db) {
 		parent::__construct($db, Subscription::TABLE, Subscription::class);
 	}
 
-	/**
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
-	 * @return Subscription[]
-	 * @psalm-return array<array-key, Subscription>
-	 */
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			 ->from($this->getTableName());
-
-		return $this->findEntities($qb);
-	}
-
 	/**
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result

diff --git a/lib/Db/VoteMapper.php b/lib/Db/VoteMapper.php
@@ -136,13 +136,6 @@ public function findParticipantsVotes(int $pollId, string $userId): array {
 		return $this->findEntities($qb);
 	}
 
-	public function deleteById(int $voteId): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-		   ->where($qb->expr()->eq('id', $qb->createNamedParameter($voteId, IQueryBuilder::PARAM_INT)))
-		   ->executeStatement();
-	}
-
 	public function deleteByPollAndUserId(int $pollId, string $userId): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete($this->getTableName())
@@ -151,13 +144,6 @@ public function deleteByPollAndUserId(int $pollId, string $userId): void {
 		   ->executeStatement();
 	}
 
-	public function deleteByPoll(int $pollId): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-		   ->where($qb->expr()->eq('poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
-		   ->executeStatement();
-	}
-
 	/**
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 * @return Vote[]

diff --git a/lib/Event/BaseEvent.php b/lib/Event/BaseEvent.php
@@ -30,7 +30,6 @@
 use OCA\Polls\Db\Vote;
 use OCA\Polls\Helper\Container;
 use OCA\Polls\Service\UserService;
-use OCP\AppFramework\Db\Entity;
 use OCP\EventDispatcher\Event;
 use OCP\IUserSession;
 
@@ -59,18 +58,10 @@ public function __construct(
 		];
 	}
 
-	public function getEventObject(): Entity {
-		return $this->eventObject;
-	}
-
 	public function getPollId(): int {
 		return $this->eventObject->getPollId();
 	}
 
-	public function getPollUrl(): string {
-		return $this->poll->getVoteUrl();
-	}
-
 	public function getPollTitle(): string {
 		return $this->poll->getTitle();
 	}
@@ -79,10 +70,6 @@ public function getPollOwner(): string {
 		return $this->poll->getOwner();
 	}
 
-	public function getPoll(): Poll {
-		return $this->poll;
-	}
-
 	public function getActor(): string {
 		return $this->userSession->getUser()?->getUID() ?? $this->eventObject->getUserId();
 	}

diff --git a/lib/Event/CommentEvent.php b/lib/Event/CommentEvent.php
@@ -40,8 +40,4 @@ public function __construct(
 			'name' => $comment->getComment(),
 		];
 	}
-
-	public function getComment(): Comment {
-		return $this->comment;
-	}
 }
diff --git a/lib/Event/OptionEvent.php b/lib/Event/OptionEvent.php
@@ -43,8 +43,4 @@ public function __construct(
 			'name' => $this->option->getPollOptionText(),
 		];
 	}
-
-	public function getOption(): Option {
-		return $this->option;
-	}
 }
diff --git a/lib/Event/ShareEvent.php b/lib/Event/ShareEvent.php
@@ -48,10 +48,6 @@ public function __construct(Share $share) {
 		$this->activitySubjectParams['sharee'] = $this->getSharee()->getRichObjectString();
 	}
 
-	public function getShare(): Share {
-		return $this->share;
-	}
-
 	protected function getSharee() : UserBase {
 		return $this->userService->getUserFromShare($this->share);
 	}

diff --git a/lib/Event/VoteEvent.php b/lib/Event/VoteEvent.php
@@ -38,8 +38,4 @@ public function __construct(
 		$this->activityObjectType = 'poll';
 		$this->vote = $vote;
 	}
-
-	public function getVote(): Vote {
-		return $this->vote;
-	}
 }
diff --git a/lib/Exceptions/BadRequestException.php b/lib/Exceptions/BadRequestException.php
diff --git a/lib/Exceptions/ContactGroupNotFound.php b/lib/Exceptions/ContactGroupNotFound.php
diff --git a/lib/Exceptions/MultipleContactsFound.php b/lib/Exceptions/MultipleContactsFound.php
diff --git a/lib/Helper/Trace.php b/lib/Helper/Trace.php