Skip to content

Commit 65f52c4

Browse files
CarlSchwanCarlSchwan
authored
Merge pull request #55674 from nextcloud/carl/deprecated-dbal
Port away from deprecated Doctrine APIs
2 parents 2ea30f9 + 49d5227 commit 65f52c4

File tree

26 files changed

+95
-125
lines changed

26 files changed

+95
-125
lines changed

‎apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testCleanRemindersForEvent(): void {
4545
$query = self::$realDatabase->getQueryBuilder();
4646
$rows = $query->select('*')
4747
->from('calendar_reminders')
48-
->execute()
48+
->executeQuery()
4949
->fetchAll();
5050

5151
$this->assertCount(4, $rows);
@@ -55,7 +55,7 @@ public function testCleanRemindersForEvent(): void {
5555
$query = self::$realDatabase->getQueryBuilder();
5656
$rows = $query->select('*')
5757
->from('calendar_reminders')
58-
->execute()
58+
->executeQuery()
5959
->fetchAll();
6060

6161
$this->assertCount(2, $rows);
@@ -65,7 +65,7 @@ public function testCleanRemindersForCalendar(): void {
6565
$query = self::$realDatabase->getQueryBuilder();
6666
$rows = $query->select('*')
6767
->from('calendar_reminders')
68-
->execute()
68+
->executeQuery()
6969
->fetchAll();
7070

7171
$this->assertCount(4, $rows);
@@ -75,7 +75,7 @@ public function testCleanRemindersForCalendar(): void {
7575
$query = self::$realDatabase->getQueryBuilder();
7676
$rows = $query->select('*')
7777
->from('calendar_reminders')
78-
->execute()
78+
->executeQuery()
7979
->fetchAll();
8080

8181
$this->assertCount(1, $rows);
@@ -85,7 +85,7 @@ public function testRemoveReminder(): void {
8585
$query = self::$realDatabase->getQueryBuilder();
8686
$rows = $query->select('*')
8787
->from('calendar_reminders')
88-
->execute()
88+
->executeQuery()
8989
->fetchAll();
9090

9191
$this->assertCount(4, $rows);
@@ -95,7 +95,7 @@ public function testRemoveReminder(): void {
9595
$query = self::$realDatabase->getQueryBuilder();
9696
$rows = $query->select('*')
9797
->from('calendar_reminders')
98-
->execute()
98+
->executeQuery()
9999
->fetchAll();
100100

101101
$this->assertCount(3, $rows);
@@ -192,7 +192,7 @@ public function testInsertReminder(): void {
192192
$query = self::$realDatabase->getQueryBuilder();
193193
$rows = $query->select('*')
194194
->from('calendar_reminders')
195-
->execute()
195+
->executeQuery()
196196
->fetchAll();
197197

198198
$this->assertCount(4, $rows);
@@ -203,7 +203,7 @@ public function testInsertReminder(): void {
203203
$query = self::$realDatabase->getQueryBuilder();
204204
$rows = $query->select('*')
205205
->from('calendar_reminders')
206-
->execute()
206+
->executeQuery()
207207
->fetchAll();
208208

209209
$this->assertCount(5, $rows);

‎apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTestCase.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ protected function createTestDatasetInDb() {
462462
'displayname' => $query->createNamedParameter('Beamer1'),
463463
'group_restrictions' => $query->createNamedParameter('[]'),
464464
])
465-
->execute();
465+
->executeStatement();
466466

467467
$query->insert($this->mainDbTable)
468468
->values([
@@ -472,7 +472,7 @@ protected function createTestDatasetInDb() {
472472
'displayname' => $query->createNamedParameter('TV1'),
473473
'group_restrictions' => $query->createNamedParameter('[]'),
474474
])
475-
->execute();
475+
->executeStatement();
476476

477477
$query->insert($this->mainDbTable)
478478
->values([
@@ -482,7 +482,7 @@ protected function createTestDatasetInDb() {
482482
'displayname' => $query->createNamedParameter('Beamer2'),
483483
'group_restrictions' => $query->createNamedParameter('[]'),
484484
])
485-
->execute();
485+
->executeStatement();
486486
$id3 = $query->getLastInsertId();
487487

488488
$query->insert($this->mainDbTable)
@@ -493,7 +493,7 @@ protected function createTestDatasetInDb() {
493493
'displayname' => $query->createNamedParameter('TV2'),
494494
'group_restrictions' => $query->createNamedParameter('[]'),
495495
])
496-
->execute();
496+
->executeStatement();
497497
$id4 = $query->getLastInsertId();
498498

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

509509
$query->insert($this->mainDbTable)
510510
->values([
@@ -514,7 +514,7 @@ protected function createTestDatasetInDb() {
514514
'displayname' => $query->createNamedParameter('Pointer'),
515515
'group_restrictions' => $query->createNamedParameter('["group1", "bar"]'),
516516
])
517-
->execute();
517+
->executeStatement();
518518
$id6 = $query->getLastInsertId();
519519

520520
$query->insert($this->metadataDbTable)
@@ -523,34 +523,34 @@ protected function createTestDatasetInDb() {
523523
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}foo'),
524524
'value' => $query->createNamedParameter('value1')
525525
])
526-
->execute();
526+
->executeStatement();
527527
$query->insert($this->metadataDbTable)
528528
->values([
529529
$this->foreignKey => $query->createNamedParameter($id3),
530530
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta2'),
531531
'value' => $query->createNamedParameter('value2')
532532
])
533-
->execute();
533+
->executeStatement();
534534
$query->insert($this->metadataDbTable)
535535
->values([
536536
$this->foreignKey => $query->createNamedParameter($id4),
537537
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta1'),
538538
'value' => $query->createNamedParameter('value1')
539539
])
540-
->execute();
540+
->executeStatement();
541541
$query->insert($this->metadataDbTable)
542542
->values([
543543
$this->foreignKey => $query->createNamedParameter($id4),
544544
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta3'),
545545
'value' => $query->createNamedParameter('value3-old')
546546
])
547-
->execute();
547+
->executeStatement();
548548
$query->insert($this->metadataDbTable)
549549
->values([
550550
$this->foreignKey => $query->createNamedParameter($id6),
551551
'key' => $query->createNamedParameter('{http://nextcloud.com/ns}meta99'),
552552
'value' => $query->createNamedParameter('value99')
553553
])
554-
->execute();
554+
->executeStatement();
555555
}
556556
}

‎apps/dav/tests/unit/CardDAV/CardDavBackendTest.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ public function testUpdateProperties(): void {
549549
->from('cards_properties')
550550
->orderBy('name');
551551

552-
$qResult = $query->execute();
552+
$qResult = $query->executeQuery();
553553
$result = $qResult->fetchAll();
554554
$qResult->closeCursor();
555555

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

577-
$qResult = $query->execute();
577+
$qResult = $query->executeQuery();
578578
$result = $qResult->fetchAll();
579579
$qResult->closeCursor();
580580

@@ -598,7 +598,7 @@ public function testPurgeProperties(): void {
598598
'preferred' => $query->createNamedParameter(0)
599599
]
600600
);
601-
$query->execute();
601+
$query->executeStatement();
602602

603603
$query = $this->db->getQueryBuilder();
604604
$query->insert('cards_properties')
@@ -611,15 +611,15 @@ public function testPurgeProperties(): void {
611611
'preferred' => $query->createNamedParameter(0)
612612
]
613613
);
614-
$query->execute();
614+
$query->executeStatement();
615615

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

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

622-
$qResult = $query->execute();
622+
$qResult = $query->executeQuery();
623623
$result = $qResult->fetchAll();
624624
$qResult->closeCursor();
625625

@@ -642,7 +642,7 @@ public function testGetCardId(): void {
642642
'size' => $query->createNamedParameter(120)
643643
]
644644
);
645-
$query->execute();
645+
$query->executeStatement();
646646
$id = $query->getLastInsertId();
647647

648648
$this->assertSame($id,
@@ -686,7 +686,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
686686
'size' => $query->createNamedParameter(120),
687687
]
688688
);
689-
$query->execute();
689+
$query->executeStatement();
690690
$vCardIds[] = $query->getLastInsertId();
691691
}
692692

@@ -701,7 +701,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
701701
'preferred' => $query->createNamedParameter(0)
702702
]
703703
);
704-
$query->execute();
704+
$query->executeStatement();
705705
$query = $this->db->getQueryBuilder();
706706
$query->insert($this->dbCardsPropertiesTable)
707707
->values(
@@ -713,7 +713,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
713713
'preferred' => $query->createNamedParameter(0)
714714
]
715715
);
716-
$query->execute();
716+
$query->executeStatement();
717717
$query = $this->db->getQueryBuilder();
718718
$query->insert($this->dbCardsPropertiesTable)
719719
->values(
@@ -725,7 +725,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
725725
'preferred' => $query->createNamedParameter(0)
726726
]
727727
);
728-
$query->execute();
728+
$query->executeStatement();
729729
$query = $this->db->getQueryBuilder();
730730
$query->insert($this->dbCardsPropertiesTable)
731731
->values(
@@ -737,7 +737,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
737737
'preferred' => $query->createNamedParameter(0)
738738
]
739739
);
740-
$query->execute();
740+
$query->executeStatement();
741741
$query = $this->db->getQueryBuilder();
742742
$query->insert($this->dbCardsPropertiesTable)
743743
->values(
@@ -749,7 +749,7 @@ public function testSearch(string $pattern, array $properties, array $options, a
749749
'preferred' => $query->createNamedParameter(0)
750750
]
751751
);
752-
$query->execute();
752+
$query->executeStatement();
753753

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

@@ -795,7 +795,7 @@ public function testGetCardUri(): void {
795795
'size' => $query->createNamedParameter(120),
796796
]
797797
);
798-
$query->execute();
798+
$query->executeStatement();
799799

800800
$id = $query->getLastInsertId();
801801

@@ -823,7 +823,7 @@ public function testGetContact(): void {
823823
'size' => $query->createNamedParameter(120),
824824
]
825825
);
826-
$query->execute();
826+
$query->executeStatement();
827827
}
828828

829829
$result = $this->backend->getContact(0, 'uri0');
@@ -856,7 +856,7 @@ public function testCollectCardProperties(): void {
856856
'preferred' => $query->createNamedParameter(0)
857857
]
858858
)
859-
->execute();
859+
->executeStatement();
860860

861861
$result = $this->backend->collectCardProperties(666, 'FN');
862862
$this->assertEquals(['John Doe'], $result);

‎apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
3030
if ($schema->hasTable('federated_reshares')) {
3131
$table = $schema->getTable('federated_reshares');
3232
$remoteIdColumn = $table->getColumn('remote_id');
33-
if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
33+
if ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
3434
$remoteIdColumn->setNotnull(false);
3535
$remoteIdColumn->setType(Type::getType(Types::STRING));
3636
$remoteIdColumn->setOptions(['length' => 255]);

‎apps/federation/tests/DbHandlerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testAddServer(string $url, string $expectedUrl, string $expected
6363

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

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

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

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

102-
$qResult = $query->execute();
102+
$qResult = $query->executeQuery();
103103
$result = $qResult->fetchAll();
104104
$qResult->closeCursor();
105105
$this->assertCount(1, $result);
@@ -175,15 +175,15 @@ public function XtestAddSharedSecret() {
175175
$this->dbHandler->addServer('server1');
176176
$query = $this->connection->getQueryBuilder()->select('*')->from($this->dbTable);
177177

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

186-
$qResult = $query->execute();
186+
$qResult = $query->executeQuery();
187187
$result = $qResult->fetchAll();
188188
$qResult->closeCursor();
189189
$this->assertCount(1, $result);

‎apps/files_external/tests/Service/StoragesServiceTestCase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public function testDeleteStorage(array $backendOptions, string $rustyStorageId)
315315
->from('storages')
316316
->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId)));
317317

318-
$result = $storageCheckQuery->execute();
318+
$result = $storageCheckQuery->executeQuery();
319319
$storages = $result->fetchAll();
320320
$result->closeCursor();
321321
$this->assertCount(0, $storages, 'expected 0 storages, got ' . json_encode($storages));

‎apps/files_sharing/lib/External/Manager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ public function removeUserShares($uid): bool {
703703
)
704704
)
705705
);
706-
$qb->execute();
706+
$qb->executeStatement();
707707
} catch (\Doctrine\DBAL\Exception $ex) {
708708
$this->logger->emergency('Could not delete user shares', ['exception' => $ex]);
709709
return false;
@@ -798,7 +798,7 @@ private function getShares($accepted) {
798798
->orderBy('id', 'ASC');
799799

800800
try {
801-
$result = $qb->execute();
801+
$result = $qb->executeQuery();
802802
$shares = $result->fetchAll();
803803
$result->closeCursor();
804804

‎apps/files_sharing/lib/Migration/Version11300Date20201120141438.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
8888
} else {
8989
$table = $schema->getTable('share_external');
9090
$remoteIdColumn = $table->getColumn('remote_id');
91-
if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
91+
if ($remoteIdColumn && Type::lookupName($remoteIdColumn->getType()) !== Types::STRING) {
9292
$remoteIdColumn->setNotnull(false);
9393
$remoteIdColumn->setType(Type::getType(Types::STRING));
9494
$remoteIdColumn->setOptions(['length' => 255]);

0 commit comments

Comments
 (0)