fix(migration): support the new OCP DB schema API (#13513)

ISchemaWrapper::getTable() now returns OCP\DB\Schema\ITable instead of
the Doctrine Table on server 35+. Widen addMailboxKey() to accept both
so the migrations keep running on server 32-35, and reference the
foreign table and column by name so the call type-checks against the
stricter interface.

Replace the Doctrine-only calls the reduced interface no longer exposes:
a column-name literal instead of IColumn::getName(), and getPrimaryKey()
instead of hasPrimaryKey(). Fix the mis-cased notNull option on
classification_enabled so the boolean column stays nullable, which the
new schema validation now enforces.

Constrain the sort direction in MessageMapper::findByIds() to a literal
so it satisfies IQueryBuilder::orderBy()'s tightened, taint-checked
parameter. Normalizing in one place keeps every caller working and
avoids threading a direction type through the search stack.

ITable exists only in the newer OCP stubs, so it is suppressed in psalm
for the older matrix versions. Version1130's foreign-key enumeration and
column type change forward to Doctrine at runtime and were handled
server-side, so that migration is left unchanged.

Assisted-by: Claude:claude-opus-4-8

Signed-off-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
Co-authored-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>

Author: backportbot[bot]

lib/Db/MessageMapper.php

@@ -1273,13 +1273,14 @@ public function findByIds(string $userId, array $ids, string $sortOrder, string
 		if ($ids === []) {
 			return [];
 		}
+		$direction = strtoupper($sortOrder) === 'DESC' ? 'DESC' : 'ASC';
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
 			->where(
 				$qb->expr()->in('id', $qb->createParameter('ids'))
 			)
-			->orderBy($orderBy, $sortOrder);
+			->orderBy($orderBy, $direction);
 
 		$results = [];
 		foreach (array_chunk($ids, 1000) as $chunk) {

lib/Migration/Version1140Date20220628174152.php

@@ -61,24 +61,20 @@ public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $
 			$alterQuery = 'ALTER TABLE `%s` MODIFY `%s` longtext null;';
 
 			$accountsTable = $schema->getTable('mail_accounts');
-			$accountsSignatureColumn = $accountsTable->getColumn('signature');
 
 			$this->connection->executeStatement(
-				sprintf($alterQuery, $accountsTable->getName(), $accountsSignatureColumn->getName())
+				sprintf($alterQuery, $accountsTable->getName(), 'signature')
 			);
 
 			$aliasesTable = $schema->getTable('mail_aliases');
-			$aliasesSignatureColumn = $accountsTable->getColumn('signature');
 
 			$this->connection->executeStatement(
-				sprintf($alterQuery, $aliasesTable->getName(), $aliasesSignatureColumn->getName())
+				sprintf($alterQuery, $aliasesTable->getName(), 'signature')
 			);
 
 			unset(
 				$accountsTable,
-				$accountsSignatureColumn,
-				$aliasesTable,
-				$aliasesSignatureColumn
+				$aliasesTable
 			);
 		}
 	}

lib/Migration/Version2300Date20230120085320.php

@@ -30,7 +30,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$schema = $schemaClosure();
 
 		$table = $schema->getTable('mail_smime_certificates');
-		if (!$table->hasPrimaryKey()) {
+		if ($table->getPrimaryKey() === null) {
 			$table->setPrimaryKey(['id'], 'mail_smime_certs_id_idx');
 		}
 

lib/Migration/Version5007Date20251024153423.php

@@ -42,7 +42,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		if (!$accountsTable->hasColumn('classification_enabled')) {
 			$accountsTable->addColumn('classification_enabled', Types::BOOLEAN, [
 				'default' => true,
-				'notNull' => false,
+				'notnull' => false,
 			]);
 		}
 		return $schema;

lib/Migration/Version5007Date20260108124422.php

@@ -14,6 +14,7 @@
 use OCP\DB\Exception;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\DB\Schema\ITable;
 use OCP\IDBConnection;
 use OCP\Migration\Attributes\ModifyColumn;
 use OCP\Migration\IOutput;
@@ -82,15 +83,17 @@ private function removeInconsistentMailboxEntries(string $mailboxType): void {
 	}
 
 	/**
-	 * @param Table $accountsTable
-	 * @param Table $mailboxesTable
+	 * @param Table|ITable $accountsTable
+	 * @param Table|ITable $mailboxesTable
 	 * @param string $mailboxType
 	 * @return void
 	 */
-	private function addMailboxKey(Table $accountsTable, Table $mailboxesTable, string $mailboxType): void {
+	private function addMailboxKey(Table|ITable $accountsTable, Table|ITable $mailboxesTable, string $mailboxType): void {
+		/** @var non-empty-lowercase-string $column */
+		$column = $mailboxType . '_mailbox_id';
 		$accountsTable->addForeignKeyConstraint(
-			$mailboxesTable,
-			["{$mailboxType}_mailbox_id"],
+			$mailboxesTable->getName(),
+			[$column],
 			['id'],
 			[
 				'onDelete' => 'SET NULL',

psalm.xml

@@ -40,6 +40,7 @@
 				<referencedClass name="Doctrine\DBAL\Platforms\PostgreSQL94Platform" />
 				<referencedClass name="Doctrine\DBAL\Platforms\SqlitePlatform" />
 				<referencedClass name="Doctrine\DBAL\Schema\Table" />
+				<referencedClass name="OCP\DB\Schema\ITable" />
 				<referencedClass name="Doctrine\DBAL\Types\Type" />
 				<referencedClass name="Doctrine\DBAL\Types\Types" />
 				<referencedClass name="IPLib\Factory" />
@@ -67,6 +68,7 @@
 				<referencedClass name="Doctrine\DBAL\Schema\Schema" />
 				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
 				<referencedClass name="Doctrine\DBAL\Schema\Table" />
+				<referencedClass name="OCP\DB\Schema\ITable" />
 				<referencedClass name="OC\Security\CSP\ContentSecurityPolicyNonceManager" />
 				<referencedClass name="Symfony\Component\Console\Output\OutputInterface" />
 			</errorLevel>