chore(db): Correctly apply query types

fix: psalm fix: error fix: add batch fix: fatal error fix: add batch chore: add batch chore: add batch fix: psalm fix: typo fix: psalm fix: return bool fix: revert Manager
nextcloud · Oct 16, 2024 · 70db9dc · 70db9dc
1 parent 94e1241
commit 70db9dc
Show file tree

Hide file tree

Showing 28 changed files with 194 additions and 334 deletions.
diff --git a/apps/contactsinteraction/lib/Db/CardSearchDao.php b/apps/contactsinteraction/lib/Db/CardSearchDao.php
@@ -15,10 +15,10 @@
 use function stream_get_contents;
 
 class CardSearchDao {
-	private IDBConnection $db;
 
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
+	public function __construct(
+		private IDBConnection $db,
+	) {
 	}
 
 	public function findExisting(IUser $user,
@@ -65,7 +65,7 @@ public function findExisting(IUser $user,
 			->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
 			->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
 			->setMaxResults(1);
-		$result = $cardQuery->execute();
+		$result = $cardQuery->executeQuery();
 		/** @var string|resource|false $card */
 		$card = $result->fetchOne();
 

diff --git a/apps/dav/lib/CalDAV/Schedule/IMipService.php b/apps/dav/lib/CalDAV/Schedule/IMipService.php
@@ -27,13 +27,7 @@
 
 class IMipService {
 
-	private URLGenerator $urlGenerator;
-	private IConfig $config;
-	private IDBConnection $db;
-	private ISecureRandom $random;
-	private L10NFactory $l10nFactory;
 	private IL10N $l10n;
-	private ITimeFactory $timeFactory;
 
 	/** @var string[] */
 	private const STRING_DIFF = [
@@ -43,20 +37,16 @@ class IMipService {
 		'meeting_location' => 'LOCATION'
 	];
 
-	public function __construct(URLGenerator $urlGenerator,
-		IConfig $config,
-		IDBConnection $db,
-		ISecureRandom $random,
-		L10NFactory $l10nFactory,
-		ITimeFactory $timeFactory) {
-		$this->urlGenerator = $urlGenerator;
-		$this->config = $config;
-		$this->db = $db;
-		$this->random = $random;
-		$this->l10nFactory = $l10nFactory;
+	public function __construct(
+		private URLGenerator $urlGenerator,
+		private IConfig $config,
+		private IDBConnection $db,
+		private ISecureRandom $random,
+		private L10NFactory $l10nFactory,
+		private ITimeFactory $timeFactory,
+	) {
 		$default = $this->l10nFactory->findGenericLanguage();
 		$this->l10n = $this->l10nFactory->get('dav', $default);
-		$this->timeFactory = $timeFactory;
 	}
 
 	/**
@@ -912,7 +902,7 @@ public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int
 				'expiration' => $query->createNamedParameter($lastOccurrence),
 				'uid' => $query->createNamedParameter($uid)
 			])
-			->execute();
+			->executeStatement();
 
 		return $token;
 	}

diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -200,7 +200,7 @@ public function getUsersOwnAddressBooks($principalUri) {
 
 		$addressBooks = [];
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		while ($row = $result->fetch()) {
 			$addressBooks[$row['id']] = [
 				'id' => $row['id'],
@@ -395,7 +395,7 @@ public function createAddressBook($principalUri, $url, array $properties) {
 					'synctoken' => $query->createParameter('synctoken'),
 				])
 				->setParameters($values)
-				->execute();
+				->executeStatement();
 
 			$addressBookId = $query->getLastInsertId();
 			return [
@@ -479,7 +479,7 @@ public function getCards($addressbookId) {
 
 		$cards = [];
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		while ($row = $result->fetch()) {
 			$row['etag'] = '"' . $row['etag'] . '"';
 
@@ -516,7 +516,7 @@ public function getCard($addressBookId, $cardUri) {
 			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
 			->setMaxResults(1);
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetch();
 		if (!$row) {
 			return false;
@@ -560,7 +560,7 @@ public function getMultipleCards($addressBookId, array $uris) {
 
 		foreach ($chunks as $uris) {
 			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->execute();
+			$result = $query->executeQuery();
 
 			while ($row = $result->fetch()) {
 				$row['etag'] = '"' . $row['etag'] . '"';
@@ -634,7 +634,7 @@ public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlrea
 					'etag' => $query->createNamedParameter($etag),
 					'uid' => $query->createNamedParameter($uid),
 				])
-				->execute();
+				->executeStatement();
 
 			$etagCacheKey = "$addressBookId#$cardUri";
 			$this->etagCache[$etagCacheKey] = $etag;
@@ -697,7 +697,7 @@ public function updateCard($addressBookId, $cardUri, $cardData) {
 				->set('uid', $query->createNamedParameter($uid))
 				->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
 				->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-				->execute();
+				->executeStatement();
 
 			$this->etagCache[$etagCacheKey] = $etag;
 
@@ -1165,7 +1165,7 @@ private function searchByAddressBookIds(array $addressBookIds,
 			 */
 		}
 
-		$result = $query2->execute();
+		$result = $query2->executeQuery();
 		$matches = $result->fetchAll();
 		$result->closeCursor();
 		$matches = array_map(function ($match) {
@@ -1207,7 +1207,7 @@ public function collectCardProperties($bookId, $name) {
 			->from($this->dbCardsPropertiesTable)
 			->where($query->expr()->eq('name', $query->createNamedParameter($name)))
 			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
-			->execute();
+			->executeQuery();
 
 		$all = $result->fetchAll(PDO::FETCH_COLUMN);
 		$result->closeCursor();
@@ -1227,7 +1227,7 @@ public function getCardUri($id) {
 			->where($query->expr()->eq('id', $query->createParameter('id')))
 			->setParameter('id', $id);
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$uri = $result->fetch();
 		$result->closeCursor();
 
@@ -1251,7 +1251,7 @@ public function getContact($addressBookId, $uri) {
 		$query->select('*')->from($this->dbCardsTable)
 			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
 			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$queryResult = $query->execute();
+		$queryResult = $query->executeQuery();
 		$contact = $queryResult->fetch();
 		$queryResult->closeCursor();
 
@@ -1324,7 +1324,7 @@ protected function updateProperties($addressBookId, $cardUri, $vCardSerialized)
 				$query->setParameter('name', $property->name);
 				$query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
 				$query->setParameter('preferred', $preferred);
-				$query->execute();
+				$query->executeStatement();
 			}
 		}, $this->db);
 	}
@@ -1350,7 +1350,7 @@ protected function purgeProperties($addressBookId, $cardId) {
 		$query->delete($this->dbCardsPropertiesTable)
 			->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
 			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$query->execute();
+		$query->executeStatement();
 	}
 
 	/**
@@ -1362,7 +1362,7 @@ protected function getCardId(int $addressBookId, string $uri): int {
 			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
 			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$cardIds = $result->fetch();
 		$result->closeCursor();
 

diff --git a/apps/dav/lib/Migration/BuildCalendarSearchIndex.php b/apps/dav/lib/Migration/BuildCalendarSearchIndex.php
@@ -13,26 +13,11 @@
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-		IJobList $jobList,
-		IConfig $config) {
-		$this->db = $db;
-		$this->jobList = $jobList;
-		$this->config = $config;
+	public function __construct(
+		private IDBConnection $db,
+		private IJobList $jobList,
+		private IConfig $config,
+	) {
 	}
 
 	/**
@@ -55,7 +40,7 @@ public function run(IOutput $output) {
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
 			->from('calendarobjects');
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$maxId = (int)$result->fetchOne();
 		$result->closeCursor();
 

diff --git a/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php b/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php
@@ -22,15 +22,6 @@
  */
 class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IConfig */
-	private $config;
-
 	/** @var string */
 	private const CONFIG_KEY = 'buildCalendarReminderIndex';
 
@@ -39,12 +30,11 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
 	 * @param IJobList $jobList
 	 * @param IConfig $config
 	 */
-	public function __construct(IDBConnection $db,
-		IJobList $jobList,
-		IConfig $config) {
-		$this->db = $db;
-		$this->jobList = $jobList;
-		$this->config = $config;
+	public function __construct(
+		private IDBConnection $db,
+		private IJobList $jobList,
+		private IConfig $config,
+	) {
 	}
 
 	/**
@@ -67,7 +57,7 @@ public function run(IOutput $output) {
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
 			->from('calendarobjects');
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$maxId = (int)$result->fetchOne();
 		$result->closeCursor();