Skip to content

Commit 81302f7

Browse files
ChristophWurstChristophWurst
authored
Merge pull request #24948 from nextcloud/dependabot/composer/doctrine/dbal-3.0.0
Bump doctrine/dbal from 2.12.0 to 3.0.0
2 parents aeb32e1 + 250f76a commit 81302f7

File tree

109 files changed

+1308
-853
lines changed

Some content is hidden

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

109 files changed

+1308
-853
lines changed

‎.drone.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
commands:
88
- git submodule update --init
99
- name: checkers
10-
image: nextcloudci/php7.3:latest
10+
image: nextcloudci/php7.3:php7.3-5
1111
commands:
1212
- ./autotest-checkers.sh
1313
secrets: [ github_token ]
@@ -224,12 +224,12 @@ steps:
224224
commands:
225225
- git submodule update --init
226226
- name: nodb-php7.3
227-
image: nextcloudci/php7.3:latest
227+
image: nextcloudci/php7.3:php7.3-5
228228
commands:
229229
- bash tests/drone-run-php-tests.sh || exit 0
230230
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
231231
- name: nodb-php7.4
232-
image: nextcloudci/php7.4:latest
232+
image: nextcloudci/php7.4:php7.4-3
233233
commands:
234234
- bash tests/drone-run-php-tests.sh || exit 0
235235
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -261,12 +261,12 @@ steps:
261261
commands:
262262
- git submodule update --init
263263
- name: sqlite-php7.3
264-
image: nextcloudci/php7.3:latest
264+
image: nextcloudci/php7.3:php7.3-5
265265
commands:
266266
- bash tests/drone-run-php-tests.sh || exit 0
267267
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
268268
- name: sqlite-php7.4
269-
image: nextcloudci/php7.4:latest
269+
image: nextcloudci/php7.4:php7.4-3
270270
commands:
271271
- bash tests/drone-run-php-tests.sh || exit 0
272272
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -298,7 +298,7 @@ steps:
298298
commands:
299299
- git submodule update --init
300300
- name: mariadb10.1-php7.3
301-
image: nextcloudci/php7.3:latest
301+
image: nextcloudci/php7.3:php7.3-5
302302
commands:
303303
- bash tests/drone-run-php-tests.sh || exit 0
304304
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -334,7 +334,7 @@ steps:
334334
commands:
335335
- git submodule update --init
336336
- name: mariadb10.2-php7.3
337-
image: nextcloudci/php7.3:latest
337+
image: nextcloudci/php7.3:php7.3-5
338338
commands:
339339
- bash tests/drone-run-php-tests.sh || exit 0
340340
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -369,7 +369,7 @@ steps:
369369
commands:
370370
- git submodule update --init
371371
- name: mariadb10.3-php7.3
372-
image: nextcloudci/php7.3:latest
372+
image: nextcloudci/php7.3:php7.3-5
373373
commands:
374374
- bash tests/drone-run-php-tests.sh || exit 0
375375
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -405,7 +405,7 @@ steps:
405405
commands:
406406
- git submodule update --init
407407
- name: mariadb10.4-php7.4
408-
image: nextcloudci/php7.4:latest
408+
image: nextcloudci/php7.4:php7.4-3
409409
commands:
410410
- bash tests/drone-run-php-tests.sh || exit 0
411411
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -446,7 +446,7 @@ steps:
446446
commands:
447447
- git submodule update --init
448448
- name: mysql-php7.4
449-
image: nextcloudci/php7.4:latest
449+
image: nextcloudci/php7.4:php7.4-3
450450
commands:
451451
- bash tests/drone-run-php-tests.sh || exit 0
452452
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -483,7 +483,7 @@ steps:
483483
commands:
484484
- git submodule update --init
485485
- name: postgres-php7.3
486-
image: nextcloudci/php7.3:php7.3-4
486+
image: nextcloudci/php7.3:php7.3-5
487487
commands:
488488
- bash tests/drone-run-php-tests.sh || exit 0
489489
- sleep 10 # gives the database enough time to initialize
@@ -519,7 +519,7 @@ steps:
519519
commands:
520520
- git submodule update --init
521521
- name: postgres-php7.3
522-
image: nextcloudci/php7.3:latest
522+
image: nextcloudci/php7.3:php7.3-5
523523
commands:
524524
- bash tests/drone-run-php-tests.sh || exit 0
525525
- sleep 10 # gives the database enough time to initialize
@@ -554,7 +554,7 @@ steps:
554554
commands:
555555
- git submodule update --init
556556
- name: postgres-php7.4
557-
image: nextcloudci/php7.4:latest
557+
image: nextcloudci/php7.4:php7.4-3
558558
commands:
559559
- bash tests/drone-run-php-tests.sh || exit 0
560560
- sleep 10 # gives the database enough time to initialize
@@ -590,7 +590,7 @@ steps:
590590
commands:
591591
- git submodule update --init
592592
- name: postgres-php7.4
593-
image: nextcloudci/php7.4:latest
593+
image: nextcloudci/php7.4:php7.4-3
594594
commands:
595595
- bash tests/drone-run-php-tests.sh || exit 0
596596
- sleep 10 # gives the database enough time to initialize
@@ -626,7 +626,7 @@ steps:
626626
commands:
627627
- git submodule update --init
628628
- name: postgres-php7.4
629-
image: nextcloudci/php7.4:latest
629+
image: nextcloudci/php7.4:php7.4-3
630630
commands:
631631
- bash tests/drone-run-php-tests.sh || exit 0
632632
- sleep 10 # gives the database enough time to initialize
@@ -662,7 +662,7 @@ steps:
662662
commands:
663663
- git submodule update --init
664664
- name: mysqlmb4-php7.4
665-
image: nextcloudci/php7.4:latest
665+
image: nextcloudci/php7.4:php7.4-3
666666
commands:
667667
- bash tests/drone-run-php-tests.sh || exit 0
668668
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -703,7 +703,7 @@ steps:
703703
commands:
704704
- git submodule update --init
705705
- name: mysqlmb4-php7.3
706-
image: nextcloudci/php7.3:php7.3-4
706+
image: nextcloudci/php7.3:php7.3-5
707707
commands:
708708
- bash tests/drone-run-php-tests.sh || exit 0
709709
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -2008,7 +2008,7 @@ steps:
20082008
commands:
20092009
- git submodule update --init
20102010
- name: nodb-codecov
2011-
image: nextcloudci/php7.4:latest
2011+
image: nextcloudci/php7.4:php7.4-3
20122012
environment:
20132013
CODECOV_TOKEN:
20142014
from_secret: CODECOV_TOKEN
@@ -2039,7 +2039,7 @@ steps:
20392039
commands:
20402040
- git submodule update --init
20412041
- name: db-codecov
2042-
image: nextcloudci/php7.4:latest
2042+
image: nextcloudci/php7.4:php7.4-3
20432043
environment:
20442044
CODECOV_TOKEN:
20452045
from_secret: CODECOV_TOKEN
@@ -2070,7 +2070,7 @@ steps:
20702070
commands:
20712071
- git submodule update --init
20722072
- name: object-store
2073-
image: nextcloudci/php7.4:latest
2073+
image: nextcloudci/php7.4:php7.4-3
20742074
environment:
20752075
CODECOV_TOKEN:
20762076
from_secret: CODECOV_TOKEN
@@ -2103,7 +2103,7 @@ steps:
21032103
commands:
21042104
- git submodule update --init
21052105
- name: object-store
2106-
image: nextcloudci/php7.4:latest
2106+
image: nextcloudci/php7.4:php7.4-3
21072107
environment:
21082108
CODECOV_TOKEN:
21092109
from_secret: CODECOV_TOKEN
@@ -2237,7 +2237,7 @@ trigger:
22372237
# commands:
22382238
# - git submodule update --init
22392239
#- name: memcache-redis-cluster
2240-
# image: nextcloudci/php7.3:latest
2240+
# image: nextcloudci/php7.3:php7.3-5
22412241
# commands:
22422242
# - phpenmod xdebug
22432243
# - sleep 20

‎3rdparty‎

Submodule 3rdparty updated 408 files

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 4 additions & 4 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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');

0 commit comments

Comments
 (0)