🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4

apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -29,33 +29,37 @@ public function findExisting(IUser $user,
 		$cardQuery = $this->db->getQueryBuilder();
 		$propQuery = $this->db->getQueryBuilder();
 
-		$propOr = $propQuery->expr()->orX();
+		$additionalWheres = [];
 		if ($uid !== null) {
-			$propOr->add($propQuery->expr()->andX(
+			$additionalWheres[] = $propQuery->expr()->andX(
 				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('UID')),
 				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($uid))
-			));
+			);
 		}
 		if ($email !== null) {
-			$propOr->add($propQuery->expr()->andX(
+			$additionalWheres[] = $propQuery->expr()->andX(
 				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('EMAIL')),
 				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($email))
-			));
+			);
 		}
 		if ($cloudId !== null) {
-			$propOr->add($propQuery->expr()->andX(
+			$additionalWheres[] = $propQuery->expr()->andX(
 				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('CLOUD')),
 				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($cloudId))
-			));
+			);
 		}
 		$addressbooksQuery->selectDistinct('id')
 			->from('addressbooks')
 			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
 		$propQuery->selectDistinct('cardid')
 			->from('cards_properties')
 			->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($propOr)
 			->groupBy('cardid');
+
+		if (!empty($additionalWheres)) {
+			$propQuery->andWhere($propQuery->expr()->orX(...$additionalWheres));
+		}
+
 		$cardQuery->select('carddata')
 			->from('cards')
 			->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))

apps/contactsinteraction/lib/Db/RecentContactMapper.php

@@ -61,23 +61,25 @@ public function findMatch(IUser $user,
 		?string $cloudId): array {
 		$qb = $this->db->getQueryBuilder();
 
-		$or = $qb->expr()->orX();
+		$additionalWheres = [];
 		if ($uid !== null) {
-			$or->add($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+			$additionalWheres[] = $qb->expr()->eq('uid', $qb->createNamedParameter($uid));
 		}
 		if ($email !== null) {
-			$or->add($qb->expr()->eq('email', $qb->createNamedParameter($email)));
+			$additionalWheres[] = $qb->expr()->eq('email', $qb->createNamedParameter($email));
 		}
 		if ($cloudId !== null) {
-			$or->add($qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId)));
+			$additionalWheres[] = $qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId));
 		}
 
 		$select = $qb
 			->select('*')
 			->from($this->getTableName())
-			->where($or)
-			->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
+			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
 
+		if (!empty($additionalWheres)) {
+			$select->andWhere($select->expr()->orX(...$additionalWheres));
+		}
 		return $this->findEntities($select);
 	}
 

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -1874,12 +1874,12 @@ public function search(
 		}
 
 		if (!empty($searchProperties)) {
-			$or = $innerQuery->expr()->orX();
+			$or = [];
 			foreach ($searchProperties as $searchProperty) {
-				$or->add($innerQuery->expr()->eq('op.name',
-					$outerQuery->createNamedParameter($searchProperty)));
+				$or[] = $innerQuery->expr()->eq('op.name',
+					$outerQuery->createNamedParameter($searchProperty));
 			}
-			$innerQuery->andWhere($or);
+			$innerQuery->andWhere($innerQuery->expr()->orX(...$or));
 		}
 
 		if ($pattern !== '') {
@@ -1923,12 +1923,12 @@ public function search(
 		}
 
 		if (!empty($options['types'])) {
-			$or = $outerQuery->expr()->orX();
+			$or = [];
 			foreach ($options['types'] as $type) {
-				$or->add($outerQuery->expr()->eq('componenttype',
-					$outerQuery->createNamedParameter($type)));
+				$or[] = $outerQuery->expr()->eq('componenttype',
+					$outerQuery->createNamedParameter($type));
 			}
-			$outerQuery->andWhere($or);
+			$outerQuery->andWhere($outerQuery->expr()->orX(...$or));
 		}
 
 		$outerQuery->andWhere($outerQuery->expr()->in('c.id', $outerQuery->createFunction($innerQuery->getSQL())));
@@ -2149,67 +2149,71 @@ public function searchPrincipalUri(string $principalUri,
 			$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
 
 			$calendarObjectIdQuery = $this->db->getQueryBuilder();
-			$calendarOr = $calendarObjectIdQuery->expr()->orX();
-			$searchOr = $calendarObjectIdQuery->expr()->orX();
+			$calendarOr = [];
+			$searchOr = [];
 
 			// Fetch calendars and subscription
 			$calendars = $this->getCalendarsForUser($principalUri);
 			$subscriptions = $this->getSubscriptionsForUser($principalUri);
 			foreach ($calendars as $calendar) {
-				$calendarAnd = $calendarObjectIdQuery->expr()->andX();
-				$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])));
-				$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+				$calendarAnd = $calendarObjectIdQuery->expr()->andX(
+					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])),
+					$calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)),
+				);
 
 				// If it's shared, limit search to public events
 				if (isset($calendar['{http://owncloud.org/ns}owner-principal'])
 					&& $calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
 					$calendarAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
 				}
 
-				$calendarOr->add($calendarAnd);
+				$calendarOr[] = $calendarAnd;
 			}
 			foreach ($subscriptions as $subscription) {
-				$subscriptionAnd = $calendarObjectIdQuery->expr()->andX();
-				$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])));
-				$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
+				$subscriptionAnd = $calendarObjectIdQuery->expr()->andX(
+					$calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])),
+					$calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)),
+				);
 
 				// If it's shared, limit search to public events
 				if (isset($subscription['{http://owncloud.org/ns}owner-principal'])
 					&& $subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
 					$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
 				}
 
-				$calendarOr->add($subscriptionAnd);
+				$calendarOr[] = $subscriptionAnd;
 			}
 
 			foreach ($searchProperties as $property) {
-				$propertyAnd = $calendarObjectIdQuery->expr()->andX();
-				$propertyAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
-				$propertyAnd->add($calendarObjectIdQuery->expr()->isNull('cob.parameter'));
+				$propertyAnd = $calendarObjectIdQuery->expr()->andX(
+					$calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)),
+					$calendarObjectIdQuery->expr()->isNull('cob.parameter'),
+				);
 
-				$searchOr->add($propertyAnd);
+				$searchOr[] = $propertyAnd;
 			}
 			foreach ($searchParameters as $property => $parameter) {
-				$parameterAnd = $calendarObjectIdQuery->expr()->andX();
-				$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
-				$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)));
+				$parameterAnd = $calendarObjectIdQuery->expr()->andX(
+					$calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)),
+					$calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)),
+				);
 
-				$searchOr->add($parameterAnd);
+				$searchOr[] = $parameterAnd;
 			}
 
-			if ($calendarOr->count() === 0) {
+			if (empty($calendarOr)) {
 				return [];
 			}
-			if ($searchOr->count() === 0) {
+			if (empty($searchOr)) {
 				return [];
 			}
 
 			$calendarObjectIdQuery->selectDistinct('cob.objectid')
 				->from($this->dbObjectPropertiesTable, 'cob')
 				->leftJoin('cob', 'calendarobjects', 'co', $calendarObjectIdQuery->expr()->eq('co.id', 'cob.objectid'))
 				->andWhere($calendarObjectIdQuery->expr()->in('co.componenttype', $calendarObjectIdQuery->createNamedParameter($componentTypes, IQueryBuilder::PARAM_STR_ARRAY)))
-				->andWhere($calendarOr)
-				->andWhere($searchOr)
+				->andWhere($calendarObjectIdQuery->expr()->orX(...$calendarOr))
+				->andWhere($calendarObjectIdQuery->expr()->orX(...$searchOr))
 				->andWhere($calendarObjectIdQuery->expr()->isNull('deleted_at'));
 
 			if ($pattern !== '') {

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -1148,20 +1148,20 @@ private function searchByAddressBookIds(array $addressBookIds,
 			/**
 			 * FIXME Find a way to match only 4 last digits
 			 * BDAY can be --1018 without year or 20001019 with it
-			 * $bDayOr = $query2->expr()->orX();
+			 * $bDayOr = [];
 			 * if ($options['since'] instanceof DateTimeFilter) {
-			 * $bDayOr->add(
+			 * $bDayOr[] =
 			 * $query2->expr()->gte('SUBSTR(cp_bday.value, -4)',
-			 * $query2->createNamedParameter($options['since']->get()->format('md')))
+			 * $query2->createNamedParameter($options['since']->get()->format('md'))
 			 * );
 			 * }
 			 * if ($options['until'] instanceof DateTimeFilter) {
-			 * $bDayOr->add(
+			 * $bDayOr[] =
 			 * $query2->expr()->lte('SUBSTR(cp_bday.value, -4)',
-			 * $query2->createNamedParameter($options['until']->get()->format('md')))
+			 * $query2->createNamedParameter($options['until']->get()->format('md'))
 			 * );
 			 * }
-			 * $query2->andWhere($bDayOr);
+			 * $query2->andWhere($query2->expr()->orX(...$bDayOr));
 			 */
 		}
 

apps/dav/lib/DAV/CustomPropertiesBackend.php

@@ -411,7 +411,7 @@ private function getUserProperties(string $path, array $requestedProperties) {
 			// request only a subset
 			$sql .= ' AND `propertyname` in (?)';
 			$whereValues[] = $requestedProperties;
-			$whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
+			$whereTypes[] = IQueryBuilder::PARAM_STR_ARRAY;
 		}
 
 		$result = $this->connection->executeQuery(

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

@@ -5,7 +5,6 @@
  */
 namespace OCA\DAV\Migration;
 
-use Doctrine\DBAL\Platforms\OraclePlatform;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
@@ -75,7 +74,7 @@ public function run(IOutput $output) {
 	}
 
 	protected function getInvalidObjects($pattern) {
-		if ($this->db->getDatabasePlatform() instanceof OraclePlatform) {
+		if ($this->db->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) {
 			$rows = [];
 			$chunkSize = 500;
 			$query = $this->db->getQueryBuilder();

apps/dav/lib/Migration/Version1004Date20170825134824.php

@@ -233,7 +233,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 			$table->addUniqueIndex(['principaluri', 'uri'], 'calendars_index');
 		} else {
 			$table = $schema->getTable('calendars');
-			$table->changeColumn('components', [
+			$table->modifyColumn('components', [
 				'notnull' => false,
 				'length' => 64,
 			]);
@@ -323,7 +323,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 			$table->addUniqueIndex(['principaluri', 'uri'], 'calsub_index');
 		} else {
 			$table = $schema->getTable('calendarsubscriptions');
-			$table->changeColumn('lastmodified', [
+			$table->modifyColumn('lastmodified', [
 				'notnull' => false,
 				'unsigned' => true,
 			]);

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

@@ -32,7 +32,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		if ($schema->hasTable('federated_reshares')) {
 			$table = $schema->getTable('federated_reshares');
 			$remoteIdColumn = $table->getColumn('remote_id');
-			if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
+			if (Types::getType($remoteIdColumn->getType()) !== Types::STRING) {
 				$remoteIdColumn->setNotnull(false);
 				$remoteIdColumn->setType(Type::getType(Types::STRING));
 				$remoteIdColumn->setOptions(['length' => 255]);

apps/files_external/lib/Migration/Version1011Date20200630192246.php

@@ -103,7 +103,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->addUniqueIndex(['mount_id', 'key'], 'config_mount_key');
 		} else {
 			$table = $schema->getTable('external_config');
-			$table->changeColumn('value', [
+			$table->modifyColumn('value', [
 				'notnull' => false,
 				'length' => 4000,
 			]);

apps/files_sharing/lib/Migration/Version11300Date20201120141438.php

@@ -90,7 +90,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		} else {
 			$table = $schema->getTable('share_external');
 			$remoteIdColumn = $table->getColumn('remote_id');
-			if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
+			if (Types::getType($remoteIdColumn->getType()) !== Types::STRING) {
 				$remoteIdColumn->setNotnull(false);
 				$remoteIdColumn->setType(Type::getType(Types::STRING));
 				$remoteIdColumn->setOptions(['length' => 255]);

apps/settings/lib/SetupChecks/SupportedDatabase.php

@@ -11,7 +11,7 @@
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -103,7 +103,7 @@ public function run(): SetupResult {
 			}
 		} elseif ($databasePlatform instanceof OraclePlatform) {
 			$version = 'Oracle';
-		} elseif ($databasePlatform instanceof SqlitePlatform) {
+		} elseif ($databasePlatform instanceof SQLitePlatform) {
 			return SetupResult::warning(
 				$this->l10n->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend. This is particularly recommended when using the desktop client for file synchronisation. To migrate to another database use the command line tool: "occ db:convert-type".'),
 				$this->urlGenerator->linkToDocs('admin-db-conversion')

apps/settings/tests/SetupChecks/SupportedDatabaseTest.php

@@ -8,7 +8,6 @@
  */
 namespace OCA\Settings\Tests;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use OCA\Settings\SetupChecks\SupportedDatabase;
 use OCP\IDBConnection;
 use OCP\IL10N;
@@ -41,8 +40,7 @@ protected function setUp(): void {
 	}
 
 	public function testPass(): void {
-		$platform = $this->connection->getDatabasePlatform();
-		if ($platform instanceof SqlitePlatform) {
+		if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE) {
 			/** SQlite always gets a warning */
 			$this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
 		} else {

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php

@@ -9,8 +9,8 @@
 namespace OCA\TwoFactorBackupCodes\Migration;
 
 use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
@@ -32,7 +32,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 		$column->setDefault('');
 
 		$column = $table->getColumn('used');
-		if ($column->getType()->getName() !== Types::SMALLINT) {
+		if (Types::getType($column->getType()) !== Types::SMALLINT) {
 			$column->setType(Type::getType(Types::SMALLINT));
 			$column->setOptions(['length' => 6]);
 		}

apps/user_ldap/lib/Mapping/AbstractMapping.php

@@ -8,9 +8,9 @@
 namespace OCA\User_LDAP\Mapping;
 
 use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use OCP\DB\IPreparedStatement;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -202,7 +202,7 @@ protected function prepareListOfIdsQuery(array $hashList): IQueryBuilder {
 
 	protected function collectResultsFromListOfIdsQuery(IQueryBuilder $qb, array &$results): void {
 		$stmt = $qb->executeQuery();
-		while ($entry = $stmt->fetch(\Doctrine\DBAL\FetchMode::ASSOCIATIVE)) {
+		while ($entry = $stmt->fetch()) {
 			$results[$entry['ldap_dn']] = $entry['owncloud_name'];
 			$this->cache[$entry['ldap_dn']] = $entry['owncloud_name'];
 		}
@@ -216,7 +216,7 @@ protected function collectResultsFromListOfIdsQuery(IQueryBuilder $qb, array &$r
 	public function getListOfIdsByDn(array $fdns): array {
 		$totalDBParamLimit = 65000;
 		$sliceSize = 1000;
-		$maxSlices = $this->dbc->getDatabasePlatform() instanceof SqlitePlatform ? 9 : $totalDBParamLimit / $sliceSize;
+		$maxSlices = $this->dbc->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE ? 9 : $totalDBParamLimit / $sliceSize;
 		$results = [];
 
 		$slice = 1;

apps/workflowengine/lib/Migration/Version2200Date20210805101925.php

@@ -27,7 +27,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		if ($schema->hasTable('flow_operations')) {
 			$table = $schema->getTable('flow_operations');
-			$table->changeColumn('name', [
+			$table->modifyColumn('name', [
 				'notnull' => false,
 			]);
 		}