Skip to content

Commit 8b64e92

Browse files
Bump doctrine/dbal from 2.12.0 to 3.0.0
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 84e6e9f commit 8b64e92

File tree

106 files changed

+1271
-829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1271
-829
lines changed

3rdparty

Submodule 3rdparty updated 408 files

apps/contactsinteraction/lib/Db/CardSearchDao.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function findExisting(IUser $user,
8282
->setMaxResults(1);
8383
$result = $cardQuery->execute();
8484
/** @var string|resource|false $card */
85-
$card = $result->fetchColumn(0);
85+
$card = $result->fetchOne();
8686

8787
if ($card === false) {
8888
return null;

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ private function getAllCachedByBackend(string $tableName,
401401

402402
return array_map(function ($row) {
403403
return $row['resource_id'];
404-
}, $stmt->fetchAll(\PDO::FETCH_NAMED));
404+
}, $stmt->fetchAll());
405405
}
406406

407407
/**
@@ -435,6 +435,6 @@ private function getIdForBackendAndResource(string $table,
435435
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
436436
$stmt = $query->execute();
437437

438-
return $stmt->fetch(\PDO::FETCH_NAMED)['id'];
438+
return $stmt->fetch()['id'];
439439
}
440440
}

apps/dav/lib/CalDAV/CalDavBackend.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public function getCalendarsForUserCount($principalUri, $excludeBirthday = true)
256256
}
257257

258258
$result = $query->execute();
259-
$column = (int)$result->fetchColumn();
259+
$column = (int)$result->fetchOne();
260260
$result->closeCursor();
261261
return $column;
262262
}
@@ -1114,7 +1114,7 @@ public function createCalendarObject($calendarId, $objectUri, $calendarData, $ca
11141114
->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
11151115

11161116
$result = $q->execute();
1117-
$count = (int) $result->fetchColumn();
1117+
$count = (int) $result->fetchOne();
11181118
$result->closeCursor();
11191119

11201120
if ($count !== 0) {
@@ -1963,7 +1963,7 @@ public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limi
19631963
// Current synctoken
19641964
$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
19651965
$stmt->execute([ $calendarId ]);
1966-
$currentToken = $stmt->fetchColumn(0);
1966+
$currentToken = $stmt->fetchOne();
19671967

19681968
if (is_null($currentToken)) {
19691969
return null;
@@ -2373,7 +2373,7 @@ protected function addChange($calendarId, $objectUri, $operation, $calendarType
23732373
->from($table)
23742374
->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
23752375
$result = $query->execute();
2376-
$syncToken = (int)$result->fetchColumn();
2376+
$syncToken = (int)$result->fetchOne();
23772377
$result->closeCursor();
23782378

23792379
$query = $this->db->getQueryBuilder();

apps/dav/lib/CardDAV/CardDavBackend.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function getAddressBooksForUserCount($principalUri) {
140140
->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
141141

142142
$result = $query->execute();
143-
$column = (int) $result->fetchColumn();
143+
$column = (int) $result->fetchOne();
144144
$result->closeCursor();
145145
return $column;
146146
}
@@ -661,7 +661,7 @@ public function createCard($addressBookId, $cardUri, $cardData) {
661661
->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
662662
->setMaxResults(1);
663663
$result = $q->execute();
664-
$count = (bool)$result->fetchColumn();
664+
$count = (bool)$result->fetchOne();
665665
$result->closeCursor();
666666
if ($count) {
667667
throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
@@ -864,7 +864,7 @@ public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel,
864864
// Current synctoken
865865
$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*addressbooks` WHERE `id` = ?');
866866
$stmt->execute([$addressBookId]);
867-
$currentToken = $stmt->fetchColumn(0);
867+
$currentToken = $stmt->fetchOne();
868868

869869
if (is_null($currentToken)) {
870870
return null;

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function run(IOutput $output) {
7777
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
7878
->from('calendarobjects');
7979
$result = $query->execute();
80-
$maxId = (int) $result->fetchColumn();
80+
$maxId = (int) $result->fetchOne();
8181
$result->closeCursor();
8282

8383
$output->info('Add background job');

apps/dav/lib/Migration/BuildSocialSearchIndex.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public function run(IOutput $output) {
7474
$query->select($query->func()->max('cardid'))
7575
->from('cards_properties')
7676
->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
77-
$maxId = (int)$query->execute()->fetchColumn();
78-
77+
$maxId = (int)$query->execute()->fetchOne();
78+
7979
if ($maxId === 0) {
8080
return;
8181
}

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function getInvalidObjects($pattern) {
107107
$query->select($query->func()->count('*', 'num_entries'))
108108
->from('calendarobjects');
109109
$result = $query->execute();
110-
$count = $result->fetchColumn();
110+
$count = $result->fetchOne();
111111
$result->closeCursor();
112112

113113
$numChunks = ceil($count / $chunkSize);

apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function run(IOutput $output) {
8888
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
8989
->from('calendarobjects');
9090
$result = $query->execute();
91-
$maxId = (int) $result->fetchColumn();
91+
$maxId = (int) $result->fetchOne();
9292
$result->closeCursor();
9393

9494
$output->info('Add background job');

apps/files_sharing/lib/Command/CleanupRemoteStorages.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function countFiles($numericId, OutputInterface $output) {
106106
IQueryBuilder::PARAM_STR)
107107
);
108108
$result = $queryBuilder->execute();
109-
$count = $result->fetchColumn();
109+
$count = $result->fetchOne();
110110
$output->writeln("$count files can be deleted for storage $numericId");
111111
}
112112

0 commit comments

Comments
 (0)