From 02bac8bf499255d4288ad877f95c457163379642 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 26 Sep 2025 13:23:22 +0200 Subject: [PATCH 1/2] refactor: Port away from deprecated IQueryBuilder::execute Signed-off-by: Carl Schwan --- lib/Db/ShareRequestMapper.php | 4 ++-- lib/Migration/ServerSideEncryption.php | 8 ++++---- tests/db/DatabaseHelperTest.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Db/ShareRequestMapper.php b/lib/Db/ShareRequestMapper.php index 9a5a86ab..3b12a3ba 100644 --- a/lib/Db/ShareRequestMapper.php +++ b/lib/Db/ShareRequestMapper.php @@ -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(); } } diff --git a/lib/Migration/ServerSideEncryption.php b/lib/Migration/ServerSideEncryption.php index c257b851..b7f0eb56 100644 --- a/lib/Migration/ServerSideEncryption.php +++ b/lib/Migration/ServerSideEncryption.php @@ -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(); + ->executeStatement(); 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(); diff --git a/tests/db/DatabaseHelperTest.php b/tests/db/DatabaseHelperTest.php index fa78158f..cd5fe26b 100644 --- a/tests/db/DatabaseHelperTest.php +++ b/tests/db/DatabaseHelperTest.php @@ -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(); } } From 8a4536501e58e92aab065575b368574b0f0229a5 Mon Sep 17 00:00:00 2001 From: Timo Triebensky <30630233+binsky08@users.noreply.github.com> Date: Sat, 27 Sep 2025 00:52:17 +0200 Subject: [PATCH 2/2] fix selection query in lib/Migration/ServerSideEncryption.php with executeQuery() usage Signed-off-by: Timo Triebensky <30630233+binsky08@users.noreply.github.com> --- lib/Migration/ServerSideEncryption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Migration/ServerSideEncryption.php b/lib/Migration/ServerSideEncryption.php index b7f0eb56..3726ec3f 100644 --- a/lib/Migration/ServerSideEncryption.php +++ b/lib/Migration/ServerSideEncryption.php @@ -79,7 +79,7 @@ class ServerSideEncryption implements IRepairStep { $qb = $this->db->getQueryBuilder(); $result = $qb->select('*') ->from($table) - ->executeStatement(); + ->executeQuery(); return $result->fetchAll(); }