mirror of
https://github.com/nextcloud/passman.git
synced 2025-11-10 22:22:38 +08:00
Merge pull request #844 from nextcloud/carl/port-away-execute
refactor: Port away from deprecated IQueryBuilder::execute
This commit is contained in:
commit
a8e48902d2
3 changed files with 8 additions and 8 deletions
|
|
@ -99,7 +99,7 @@ class ShareRequestMapper extends QBMapper {
|
||||||
return $qb->delete(self::TABLE_NAME)
|
return $qb->delete(self::TABLE_NAME)
|
||||||
->where($qb->expr()->eq('item_id', $qb->createNamedParameter($item_id, IQueryBuilder::PARAM_INT)))
|
->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)))
|
->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))
|
->set('permissions', $qb->createNamedParameter($permissions, IQueryBuilder::PARAM_INT))
|
||||||
->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR)))
|
->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)))
|
->andWhere($qb->expr()->eq('target_user_id', $qb->createNamedParameter($user_id, IQueryBuilder::PARAM_STR)))
|
||||||
->execute();
|
->executeStatement();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -75,22 +75,22 @@ class ServerSideEncryption implements IRepairStep {
|
||||||
* @return mixed[]
|
* @return mixed[]
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private function fetchAll(string $table) {
|
private function fetchAll(string $table): array {
|
||||||
$qb = $this->db->getQueryBuilder();
|
$qb = $this->db->getQueryBuilder();
|
||||||
$result = $qb->select('*')
|
$result = $qb->select('*')
|
||||||
->from($table)
|
->from($table)
|
||||||
->execute();
|
->executeQuery();
|
||||||
return $result->fetchAll();
|
return $result->fetchAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
private function encryptCredentials() {
|
private function encryptCredentials(): void {
|
||||||
$credentials = $this->fetchAll('passman_credentials');
|
$credentials = $this->fetchAll('passman_credentials');
|
||||||
foreach ($credentials as $credential) {
|
foreach ($credentials as $credential) {
|
||||||
$this->credentialService->updateCredential($credential);
|
$this->credentialService->updateCredential($credential);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function encryptRevisions() {
|
private function encryptRevisions(): void {
|
||||||
$revisions = $this->fetchAll('passman_revisions');
|
$revisions = $this->fetchAll('passman_revisions');
|
||||||
foreach ($revisions as $_revision) {
|
foreach ($revisions as $_revision) {
|
||||||
$revision = new CredentialRevision();
|
$revision = new CredentialRevision();
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase {
|
||||||
$qb->setValue($key, $value);
|
$qb->setValue($key, $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
$qb->execute();
|
$qb->executeStatement();
|
||||||
$this->db->lastInsertId();
|
$this->db->lastInsertId();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue