Merge pull request #24948 from nextcloud/dependabot/composer/doctrine…

…/dbal-3.0.0

Bump doctrine/dbal from 2.12.0 to 3.0.0

.drone.yml

@@ -7,7 +7,7 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -224,12 +224,12 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -261,12 +261,12 @@ steps:
   commands:
     - git submodule update --init
 - name: sqlite-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -298,7 +298,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.1-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -334,7 +334,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.2-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -369,7 +369,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.3-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -405,7 +405,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.4-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -446,7 +446,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysql-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -483,7 +483,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -519,7 +519,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -554,7 +554,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -590,7 +590,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -626,7 +626,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -662,7 +662,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -703,7 +703,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -2008,7 +2008,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2039,7 +2039,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2070,7 +2070,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2103,7 +2103,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2237,7 +2237,7 @@ trigger:
 #  commands:
 #    - git submodule update --init
 #- name: memcache-redis-cluster
-#  image: nextcloudci/php7.3:latest
+#  image: nextcloudci/php7.3:php7.3-5
 #  commands:
 #    - phpenmod xdebug
 #    - sleep 20

apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -82,7 +82,7 @@ public function findExisting(IUser $user,
 			->setMaxResults(1);
 		$result = $cardQuery->execute();
 		/** @var string|resource|false $card */
-		$card = $result->fetchColumn(0);
+		$card = $result->fetchOne();
 
 		if ($card === false) {
 			return null;

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

@@ -401,7 +401,7 @@ private function getAllCachedByBackend(string $tableName,
 
 		return array_map(function ($row) {
 			return $row['resource_id'];
-		}, $stmt->fetchAll(\PDO::FETCH_NAMED));
+		}, $stmt->fetchAll());
 	}
 
 	/**
@@ -435,6 +435,6 @@ private function getIdForBackendAndResource(string $table,
 			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
 		$stmt = $query->execute();
 
-		return $stmt->fetch(\PDO::FETCH_NAMED)['id'];
+		return $stmt->fetch()['id'];
 	}
 }

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -256,7 +256,7 @@ public function getCalendarsForUserCount($principalUri, $excludeBirthday = true)
 		}
 
 		$result = $query->execute();
-		$column = (int)$result->fetchColumn();
+		$column = (int)$result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -1114,7 +1114,7 @@ public function createCalendarObject($calendarId, $objectUri, $calendarData, $ca
 			->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
 
 		$result = $q->execute();
-		$count = (int) $result->fetchColumn();
+		$count = (int) $result->fetchOne();
 		$result->closeCursor();
 
 		if ($count !== 0) {
@@ -1963,7 +1963,7 @@ public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limi
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
 		$stmt->execute([ $calendarId ]);
-		$currentToken = $stmt->fetchColumn(0);
+		$currentToken = $stmt->fetchOne();
 
 		if (is_null($currentToken)) {
 			return null;
@@ -2373,7 +2373,7 @@ protected function addChange($calendarId, $objectUri, $operation, $calendarType
 			->from($table)
 			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
 		$result = $query->execute();
-		$syncToken = (int)$result->fetchColumn();
+		$syncToken = (int)$result->fetchOne();
 		$result->closeCursor();
 
 		$query = $this->db->getQueryBuilder();

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -140,7 +140,7 @@ public function getAddressBooksForUserCount($principalUri) {
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
 
 		$result = $query->execute();
-		$column = (int) $result->fetchColumn();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -661,7 +661,7 @@ public function createCard($addressBookId, $cardUri, $cardData) {
 			->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
 			->setMaxResults(1);
 		$result = $q->execute();
-		$count = (bool)$result->fetchColumn();
+		$count = (bool)$result->fetchOne();
 		$result->closeCursor();
 		if ($count) {
 			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,
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*addressbooks` WHERE `id` = ?');
 		$stmt->execute([$addressBookId]);
-		$currentToken = $stmt->fetchColumn(0);
+		$currentToken = $stmt->fetchOne();
 
 		if (is_null($currentToken)) {
 			return null;

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

@@ -77,7 +77,7 @@ public function run(IOutput $output) {
 		$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
 			->from('calendarobjects');
 		$result = $query->execute();
-		$maxId = (int) $result->fetchColumn();
+		$maxId = (int) $result->fetchOne();
 		$result->closeCursor();
 
 		$output->info('Add background job');

apps/dav/lib/Migration/BuildSocialSearchIndex.php

@@ -74,8 +74,8 @@ public function run(IOutput $output) {
 		$query->select($query->func()->max('cardid'))
 			->from('cards_properties')
 			->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
-		$maxId = (int)$query->execute()->fetchColumn();
-		
+		$maxId = (int)$query->execute()->fetchOne();
+
 		if ($maxId === 0) {
 			return;
 		}

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

@@ -107,7 +107,7 @@ protected function getInvalidObjects($pattern) {
 			$query->select($query->func()->count('*', 'num_entries'))
 				->from('calendarobjects');
 			$result = $query->execute();
-			$count = $result->fetchColumn();
+			$count = $result->fetchOne();
 			$result->closeCursor();
 
 			$numChunks = ceil($count / $chunkSize);

apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php

@@ -88,7 +88,7 @@ public function run(IOutput $output) {
 		$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
 			->from('calendarobjects');
 		$result = $query->execute();
-		$maxId = (int) $result->fetchColumn();
+		$maxId = (int) $result->fetchOne();
 		$result->closeCursor();
 
 		$output->info('Add background job');

apps/files_sharing/lib/Command/CleanupRemoteStorages.php

@@ -106,7 +106,7 @@ public function countFiles($numericId, OutputInterface $output) {
 				IQueryBuilder::PARAM_STR)
 			);
 		$result = $queryBuilder->execute();
-		$count = $result->fetchColumn();
+		$count = $result->fetchOne();
 		$output->writeln("$count files can be deleted for storage $numericId");
 	}