Skip to content

Port away from deprecated Doctrine APIs #55674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 4 commits into from
Oct 13, 2025
Merged

Port away from deprecated Doctrine APIs #55674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0c6ef5
refactor(dbal): Port away from deprecated hasPrimaryKey
CarlSchwan Oct 10, 2025
7a43bf2
refactor(dbal): Migrate away from Type::getName
CarlSchwan Oct 10, 2025
9095a36
refactor(dbal): Port away from getDatabasePlatform() instanceof pattern
CarlSchwan Oct 10, 2025
49d5227
refactor(dbal): Port away from remaining IQueryBuilder::execute calls
CarlSchwan Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function testCleanRemindersForEvent(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(4, $rows);
Expand All @@ -55,7 +55,7 @@ public function testCleanRemindersForEvent(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(2, $rows);
Expand All @@ -65,7 +65,7 @@ public function testCleanRemindersForCalendar(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(4, $rows);
Expand All @@ -75,7 +75,7 @@ public function testCleanRemindersForCalendar(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(1, $rows);
Expand All @@ -85,7 +85,7 @@ public function testRemoveReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(4, $rows);
Expand All @@ -95,7 +95,7 @@ public function testRemoveReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(3, $rows);
Expand Down Expand Up @@ -192,7 +192,7 @@ public function testInsertReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(4, $rows);
Expand All @@ -203,7 +203,7 @@ public function testInsertReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->execute()
->executeQuery()
->fetchAll();

$this->assertCount(5, $rows);
Expand Down
22 changes: 11 additions & 11 deletions apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('Beamer1'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();

$query->insert($this->mainDbTable)
->values([
Expand All @@ -472,7 +472,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('TV1'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();

$query->insert($this->mainDbTable)
->values([
Expand All @@ -482,7 +482,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('Beamer2'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();
$id3 = $query->getLastInsertId();

$query->insert($this->mainDbTable)
Expand All @@ -493,7 +493,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('TV2'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();
$id4 = $query->getLastInsertId();

$query->insert($this->mainDbTable)
Expand All @@ -504,7 +504,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('Beamer3'),
'group_restrictions' => $query->createNamedParameter('["foo", "bar"]'),
])
->execute();
->executeStatement();

$query->insert($this->mainDbTable)
->values([
Expand All @@ -514,7 +514,7 @@ protected function createTestDatasetInDb() {
'displayname' => $query->createNamedParameter('Pointer'),
'group_restrictions' => $query->createNamedParameter('["group1", "bar"]'),
])
->execute();
->executeStatement();
$id6 = $query->getLastInsertId();

$query->insert($this->metadataDbTable)
Expand All @@ -523,34 +523,34 @@ protected function createTestDatasetInDb() {
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}foo'),
'value' => $query->createNamedParameter('value1')
])
->execute();
->executeStatement();
$query->insert($this->metadataDbTable)
->values([
$this->foreignKey => $query->createNamedParameter($id3),
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta2'),
'value' => $query->createNamedParameter('value2')
])
->execute();
->executeStatement();
$query->insert($this->metadataDbTable)
->values([
$this->foreignKey => $query->createNamedParameter($id4),
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta1'),
'value' => $query->createNamedParameter('value1')
])
->execute();
->executeStatement();
$query->insert($this->metadataDbTable)
->values([
$this->foreignKey => $query->createNamedParameter($id4),
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta3'),
'value' => $query->createNamedParameter('value3-old')
])
->execute();
->executeStatement();
$query->insert($this->metadataDbTable)
->values([
$this->foreignKey => $query->createNamedParameter($id6),
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta99'),
'value' => $query->createNamedParameter('value99')
])
->execute();
->executeStatement();
}
}
30 changes: 15 additions & 15 deletions apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ public function testUpdateProperties(): void {
->from('cards_properties')
->orderBy('name');

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();

Expand All @@ -574,7 +574,7 @@ public function testUpdateProperties(): void {
$query->select('*')
->from('cards_properties');

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();

Expand All @@ -598,7 +598,7 @@ public function testPurgeProperties(): void {
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();

$query = $this->db->getQueryBuilder();
$query->insert('cards_properties')
Expand All @@ -611,15 +611,15 @@ public function testPurgeProperties(): void {
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();

$this->invokePrivate($this->backend, 'purgeProperties', [1, 1]);

$query = $this->db->getQueryBuilder();
$query->select('*')
->from('cards_properties');

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();

Expand All @@ -642,7 +642,7 @@ public function testGetCardId(): void {
'size' => $query->createNamedParameter(120)
]
);
$query->execute();
$query->executeStatement();
$id = $query->getLastInsertId();

$this->assertSame($id,
Expand Down Expand Up @@ -686,7 +686,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'size' => $query->createNamedParameter(120),
]
);
$query->execute();
$query->executeStatement();
$vCardIds[] = $query->getLastInsertId();
}

Expand All @@ -701,7 +701,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();
$query = $this->db->getQueryBuilder();
$query->insert($this->dbCardsPropertiesTable)
->values(
Expand All @@ -713,7 +713,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();
$query = $this->db->getQueryBuilder();
$query->insert($this->dbCardsPropertiesTable)
->values(
Expand All @@ -725,7 +725,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();
$query = $this->db->getQueryBuilder();
$query->insert($this->dbCardsPropertiesTable)
->values(
Expand All @@ -737,7 +737,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();
$query = $this->db->getQueryBuilder();
$query->insert($this->dbCardsPropertiesTable)
->values(
Expand All @@ -749,7 +749,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
'preferred' => $query->createNamedParameter(0)
]
);
$query->execute();
$query->executeStatement();

$result = $this->backend->search(0, $pattern, $properties, $options);

Expand Down Expand Up @@ -795,7 +795,7 @@ public function testGetCardUri(): void {
'size' => $query->createNamedParameter(120),
]
);
$query->execute();
$query->executeStatement();

$id = $query->getLastInsertId();

Expand Down Expand Up @@ -823,7 +823,7 @@ public function testGetContact(): void {
'size' => $query->createNamedParameter(120),
]
);
$query->execute();
$query->executeStatement();
}

$result = $this->backend->getContact(0, 'uri0');
Expand Down Expand Up @@ -856,7 +856,7 @@ public function testCollectCardProperties(): void {
'preferred' => $query->createNamedParameter(0)
]
)
->execute();
->executeStatement();

$result = $this->backend->collectCardProperties(666, 'FN');
$this->assertEquals(['John Doe'], $result);
Expand Down
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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 ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
$remoteIdColumn->setNotnull(false);
$remoteIdColumn->setType(Type::getType(Types::STRING));
$remoteIdColumn->setOptions(['length' => 255]);
Expand Down
10 changes: 5 additions & 5 deletions apps/federation/tests/DbHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function testAddServer(string $url, string $expectedUrl, string $expected

$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();
$this->assertCount(1, $result);
Expand All @@ -87,7 +87,7 @@ public function testRemove(): void {

$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();
$this->assertCount(2, $result);
Expand All @@ -99,7 +99,7 @@ public function testRemove(): void {
$this->dbHandler->removeServer($id2);
$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();
$this->assertCount(1, $result);
Expand Down Expand Up @@ -175,15 +175,15 @@ public function XtestAddSharedSecret() {
$this->dbHandler->addServer('server1');
$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();
$this->assertCount(1, $result);
$this->assertSame(null, $result[0]['shared_secret']);
$this->dbHandler->addSharedSecret('http://server1', 'secret');
$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);

$qResult = $query->execute();
$qResult = $query->executeQuery();
$result = $qResult->fetchAll();
$qResult->closeCursor();
$this->assertCount(1, $result);
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Service/StoragesServiceTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public function testDeleteStorage(array $backendOptions, string $rustyStorageId)
->from('storages')
->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId)));

$result = $storageCheckQuery->execute();
$result = $storageCheckQuery->executeQuery();
$storages = $result->fetchAll();
$result->closeCursor();
$this->assertCount(0, $storages, 'expected 0 storages, got ' . json_encode($storages));
Expand Down
4 changes: 2 additions & 2 deletions apps/files_sharing/lib/External/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public function removeUserShares($uid): bool {
)
)
);
$qb->execute();
$qb->executeStatement();
} catch (\Doctrine\DBAL\Exception $ex) {
$this->logger->emergency('Could not delete user shares', ['exception' => $ex]);
return false;
Expand Down Expand Up @@ -798,7 +798,7 @@ private function getShares($accepted) {
->orderBy('id', 'ASC');

try {
$result = $qb->execute();
$result = $qb->executeQuery();
$shares = $result->fetchAll();
$result->closeCursor();

Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/lib/Migration/Version11300Date20201120141438.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,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 ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
$remoteIdColumn->setNotnull(false);
$remoteIdColumn->setType(Type::getType(Types::STRING));
$remoteIdColumn->setOptions(['length' => 255]);
Expand Down
Loading
Loading