Merge pull request #844 from nextcloud/carl/port-away-execute

refactor: Port away from deprecated IQueryBuilder::execute
This commit is contained in:
Timo Triebensky 2025-09-27 17:41:58 +02:00 committed by GitHub
commit a8e48902d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions

View file

@ -99,7 +99,7 @@ class ShareRequestMapper extends QBMapper {
return $qb->delete(self::TABLE_NAME)
->where($qb->expr()->eq('item_id', $qb->createNamedParameter($item_id, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('target_user_id', $qb->createNamedParameter($target_user_id, IQueryBuilder::PARAM_STR)))
->execute();
->executeStatement();
}
/**
@ -199,6 +199,6 @@ class ShareRequestMapper extends QBMapper {
->set('permissions', $qb->createNamedParameter($permissions, IQueryBuilder::PARAM_INT))
->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR)))
->andWhere($qb->expr()->eq('target_user_id', $qb->createNamedParameter($user_id, IQueryBuilder::PARAM_STR)))
->execute();
->executeStatement();
}
}

View file

@ -75,22 +75,22 @@ class ServerSideEncryption implements IRepairStep {
* @return mixed[]
* @throws Exception
*/
private function fetchAll(string $table) {
private function fetchAll(string $table): array {
$qb = $this->db->getQueryBuilder();
$result = $qb->select('*')
->from($table)
->execute();
->executeQuery();
return $result->fetchAll();
}
private function encryptCredentials() {
private function encryptCredentials(): void {
$credentials = $this->fetchAll('passman_credentials');
foreach ($credentials as $credential) {
$this->credentialService->updateCredential($credential);
}
}
private function encryptRevisions() {
private function encryptRevisions(): void {
$revisions = $this->fetchAll('passman_revisions');
foreach ($revisions as $_revision) {
$revision = new CredentialRevision();

View file

@ -48,7 +48,7 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase {
* @var PHPUnit_Extensions_Database_DataSet_MysqlXmlDataSet[]
*/
protected $datasets;
/**
*
* @var \OC\Server
@ -110,7 +110,7 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase {
$qb->setValue($key, $value);
}
$qb->execute();
$qb->executeStatement();
$this->db->lastInsertId();
}
}