Skip to content

Commit 1511e8b

Browse files
solracsfsolracsf
committed
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
1 parent 94e1241 commit 1511e8b

File tree

29 files changed

+212
-352
lines changed

29 files changed

+212
-352
lines changed

‎apps/contactsinteraction/lib/Db/CardSearchDao.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
use function stream_get_contents;
1616

1717
class CardSearchDao {
18-
private IDBConnection $db;
1918

20-
public function __construct(IDBConnection $db) {
21-
$this->db = $db;
19+
public function __construct(
20+
private IDBConnection $db,
21+
) {
2222
}
2323

2424
public function findExisting(IUser $user,
@@ -65,7 +65,7 @@ public function findExisting(IUser $user,
6565
->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
6666
->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
6767
->setMaxResults(1);
68-
$result = $cardQuery->execute();
68+
$result = $cardQuery->executeQuery();
6969
/** @var string|resource|false $card */
7070
$card = $result->fetchOne();
7171

‎apps/dav/lib/CalDAV/Schedule/IMipService.php‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@
2727

2828
class IMipService {
2929

30-
private URLGenerator $urlGenerator;
31-
private IConfig $config;
32-
private IDBConnection $db;
33-
private ISecureRandom $random;
34-
private L10NFactory $l10nFactory;
3530
private IL10N $l10n;
36-
private ITimeFactory $timeFactory;
3731

3832
/** @var string[] */
3933
private const STRING_DIFF = [
@@ -43,20 +37,16 @@ class IMipService {
4337
'meeting_location' => 'LOCATION'
4438
];
4539

46-
public function __construct(URLGenerator $urlGenerator,
47-
IConfig $config,
48-
IDBConnection $db,
49-
ISecureRandom $random,
50-
L10NFactory $l10nFactory,
51-
ITimeFactory $timeFactory) {
52-
$this->urlGenerator = $urlGenerator;
53-
$this->config = $config;
54-
$this->db = $db;
55-
$this->random = $random;
56-
$this->l10nFactory = $l10nFactory;
40+
public function __construct(
41+
private URLGenerator $urlGenerator,
42+
private IConfig $config,
43+
private IDBConnection $db,
44+
private ISecureRandom $random,
45+
private L10NFactory $l10nFactory,
46+
private ITimeFactory $timeFactory,
47+
) {
5748
$default = $this->l10nFactory->findGenericLanguage();
5849
$this->l10n = $this->l10nFactory->get('dav', $default);
59-
$this->timeFactory = $timeFactory;
6050
}
6151

6252
/**
@@ -912,7 +902,7 @@ public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int
912902
'expiration' => $query->createNamedParameter($lastOccurrence),
913903
'uid' => $query->createNamedParameter($uid)
914904
])
915-
->execute();
905+
->executeStatement();
916906

917907
return $token;
918908
}

‎apps/dav/lib/CardDAV/CardDavBackend.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function getUsersOwnAddressBooks($principalUri) {
200200

201201
$addressBooks = [];
202202

203-
$result = $query->execute();
203+
$result = $query->executeQuery();
204204
while ($row = $result->fetch()) {
205205
$addressBooks[$row['id']] = [
206206
'id' => $row['id'],
@@ -395,7 +395,7 @@ public function createAddressBook($principalUri, $url, array $properties) {
395395
'synctoken' => $query->createParameter('synctoken'),
396396
])
397397
->setParameters($values)
398-
->execute();
398+
->executeStatement();
399399

400400
$addressBookId = $query->getLastInsertId();
401401
return [
@@ -479,7 +479,7 @@ public function getCards($addressbookId) {
479479

480480
$cards = [];
481481

482-
$result = $query->execute();
482+
$result = $query->executeQuery();
483483
while ($row = $result->fetch()) {
484484
$row['etag'] = '"' . $row['etag'] . '"';
485485

@@ -516,7 +516,7 @@ public function getCard($addressBookId, $cardUri) {
516516
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
517517
->setMaxResults(1);
518518

519-
$result = $query->execute();
519+
$result = $query->executeQuery();
520520
$row = $result->fetch();
521521
if (!$row) {
522522
return false;
@@ -560,7 +560,7 @@ public function getMultipleCards($addressBookId, array $uris) {
560560

561561
foreach ($chunks as $uris) {
562562
$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
563-
$result = $query->execute();
563+
$result = $query->executeQuery();
564564

565565
while ($row = $result->fetch()) {
566566
$row['etag'] = '"' . $row['etag'] . '"';
@@ -634,7 +634,7 @@ public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlrea
634634
'etag' => $query->createNamedParameter($etag),
635635
'uid' => $query->createNamedParameter($uid),
636636
])
637-
->execute();
637+
->executeStatement();
638638

639639
$etagCacheKey = "$addressBookId#$cardUri";
640640
$this->etagCache[$etagCacheKey] = $etag;
@@ -697,7 +697,7 @@ public function updateCard($addressBookId, $cardUri, $cardData) {
697697
->set('uid', $query->createNamedParameter($uid))
698698
->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
699699
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
700-
->execute();
700+
->executeStatement();
701701

702702
$this->etagCache[$etagCacheKey] = $etag;
703703

@@ -1165,7 +1165,7 @@ private function searchByAddressBookIds(array $addressBookIds,
11651165
*/
11661166
}
11671167

1168-
$result = $query2->execute();
1168+
$result = $query2->executeQuery();
11691169
$matches = $result->fetchAll();
11701170
$result->closeCursor();
11711171
$matches = array_map(function ($match) {
@@ -1207,7 +1207,7 @@ public function collectCardProperties($bookId, $name) {
12071207
->from($this->dbCardsPropertiesTable)
12081208
->where($query->expr()->eq('name', $query->createNamedParameter($name)))
12091209
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
1210-
->execute();
1210+
->executeQuery();
12111211

12121212
$all = $result->fetchAll(PDO::FETCH_COLUMN);
12131213
$result->closeCursor();
@@ -1227,7 +1227,7 @@ public function getCardUri($id) {
12271227
->where($query->expr()->eq('id', $query->createParameter('id')))
12281228
->setParameter('id', $id);
12291229

1230-
$result = $query->execute();
1230+
$result = $query->executeQuery();
12311231
$uri = $result->fetch();
12321232
$result->closeCursor();
12331233

@@ -1251,7 +1251,7 @@ public function getContact($addressBookId, $uri) {
12511251
$query->select('*')->from($this->dbCardsTable)
12521252
->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
12531253
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
1254-
$queryResult = $query->execute();
1254+
$queryResult = $query->executeQuery();
12551255
$contact = $queryResult->fetch();
12561256
$queryResult->closeCursor();
12571257

@@ -1324,7 +1324,7 @@ protected function updateProperties($addressBookId, $cardUri, $vCardSerialized)
13241324
$query->setParameter('name', $property->name);
13251325
$query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
13261326
$query->setParameter('preferred', $preferred);
1327-
$query->execute();
1327+
$query->executeStatement();
13281328
}
13291329
}, $this->db);
13301330
}
@@ -1350,7 +1350,7 @@ protected function purgeProperties($addressBookId, $cardId) {
13501350
$query->delete($this->dbCardsPropertiesTable)
13511351
->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
13521352
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
1353-
$query->execute();
1353+
$query->executeStatement();
13541354
}
13551355

13561356
/**
@@ -1362,7 +1362,7 @@ protected function getCardId(int $addressBookId, string $uri): int {
13621362
->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
13631363
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
13641364

1365-
$result = $query->execute();
1365+
$result = $query->executeQuery();
13661366
$cardIds = $result->fetch();
13671367
$result->closeCursor();
13681368

‎apps/dav/lib/Migration/BuildCalendarSearchIndex.php‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,11 @@
1313

1414
class BuildCalendarSearchIndex implements IRepairStep {
1515

16-
/** @var IDBConnection */
17-
private $db;
18-
19-
/** @var IJobList */
20-
private $jobList;
21-
22-
/** @var IConfig */
23-
private $config;
24-
25-
/**
26-
* @param IDBConnection $db
27-
* @param IJobList $jobList
28-
* @param IConfig $config
29-
*/
30-
public function __construct(IDBConnection $db,
31-
IJobList $jobList,
32-
IConfig $config) {
33-
$this->db = $db;
34-
$this->jobList = $jobList;
35-
$this->config = $config;
16+
public function __construct(
17+
private IDBConnection $db,
18+
private IJobList $jobList,
19+
private IConfig $config,
20+
) {
3621
}
3722

3823
/**
@@ -55,7 +40,7 @@ public function run(IOutput $output) {
5540
$query = $this->db->getQueryBuilder();
5641
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
5742
->from('calendarobjects');
58-
$result = $query->execute();
43+
$result = $query->executeQuery();
5944
$maxId = (int)$result->fetchOne();
6045
$result->closeCursor();
6146

‎apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@
2222
*/
2323
class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
2424

25-
/** @var IDBConnection */
26-
private $db;
27-
28-
/** @var IJobList */
29-
private $jobList;
30-
31-
/** @var IConfig */
32-
private $config;
33-
3425
/** @var string */
3526
private const CONFIG_KEY = 'buildCalendarReminderIndex';
3627

@@ -39,12 +30,11 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
3930
* @param IJobList $jobList
4031
* @param IConfig $config
4132
*/
42-
public function __construct(IDBConnection $db,
43-
IJobList $jobList,
44-
IConfig $config) {
45-
$this->db = $db;
46-
$this->jobList = $jobList;
47-
$this->config = $config;
33+
public function __construct(
34+
private IDBConnection $db,
35+
private IJobList $jobList,
36+
private IConfig $config,
37+
) {
4838
}
4939

5040
/**
@@ -67,7 +57,7 @@ public function run(IOutput $output) {
6757
$query = $this->db->getQueryBuilder();
6858
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
6959
->from('calendarobjects');
70-
$result = $query->execute();
60+
$result = $query->executeQuery();
7161
$maxId = (int)$result->fetchOne();
7262
$result->closeCursor();
7363

0 commit comments

Comments
 (0)