chore: add batch

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

@@ -13,26 +13,11 @@
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
- /** @var IDBConnection */
- private $db;
-
- /** @var IJobList */
- private $jobList;
-
- /** @var IConfig */
- private $config;
-
- /**
- * @param IDBConnection $db
- * @param IJobList $jobList
- * @param IConfig $config
- */
- public function __construct(IDBConnection $db,
- IJobList $jobList,
- IConfig $config) {
- $this->db = $db;
- $this->jobList = $jobList;
- $this->config = $config;
+ public function __construct(
+ private IDBConnection $db,
+ private IJobList $jobList,
+ private IConfig $config,
+ ) {
  }
 
  /**
@@ -55,7 +40,7 @@ public function run(IOutput $output) {
  $query = $this->db->getQueryBuilder();
  $query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
  ->from('calendarobjects');
- $result = $query->execute();
+ $result = $query->executeQuery();
  $maxId = (int)$result->fetchOne();
  $result->closeCursor();
 

apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php

@@ -36,7 +36,7 @@ public function run($argument) {
  $qb->selectDistinct('remote')
  ->from('share_external');
 
- $result = $qb->execute();
+ $result = $qb->executeQuery();
  while ($row = $result->fetch()) {
  $this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true);
  try {

apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php

@@ -16,11 +16,9 @@
 
 class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
 
- /** @var IDBConnection */
- private $dbc;
-
- public function __construct(IDBConnection $dbc) {
- $this->dbc = $dbc;
+ public function __construct(
+ private IDBConnection $dbc,
+ ) {
  }
 
  public function getName() {
@@ -41,7 +39,7 @@ protected function populateScopeTable(IResult $ids): void {
  $insertQuery = $qb->insert('flow_operations_scope');
  while (($id = $ids->fetchOne()) !== false) {
  $insertQuery->values(['operation_id' => $qb->createNamedParameter($id), 'type' => IManager::SCOPE_ADMIN]);
- $insertQuery->execute();
+ $insertQuery->executeStatement();
  }
  }
 
@@ -55,7 +53,7 @@ protected function getIdsWithoutScope(): IResult {
  // in case the repair step is executed multiple times for whatever reason.
 
  /** @var IResult $result */
- $result = $selectQuery->execute();
+ $result = $selectQuery->executeQuery();
  return $result;
  }
 }

lib/private/Group/Database.php

@@ -44,15 +44,15 @@ class Database extends ABackend implements
  INamedBackend {
  /** @var array<string, array{gid: string, displayname: string}> */
  private $groupCache = [];
- private ?IDBConnection $dbConn;
 
  /**
  * \OC\Group\Database constructor.
  *
  * @param IDBConnection|null $dbConn
  */
- public function __construct(?IDBConnection $dbConn = null) {
- $this->dbConn = $dbConn;
+ public function __construct(
+ private ?IDBConnection $dbConn = null,
+ ) {
  }
 
  /**
@@ -102,19 +102,19 @@ public function deleteGroup(string $gid): bool {
  $qb = $this->dbConn->getQueryBuilder();
  $qb->delete('groups')
  ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
 
  // Delete the group-user relation
  $qb = $this->dbConn->getQueryBuilder();
  $qb->delete('group_user')
  ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
 
  // Delete the group-groupadmin relation
  $qb = $this->dbConn->getQueryBuilder();
  $qb->delete('group_admin')
  ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
 
  // Delete from cache
  unset($this->groupCache[$gid]);
@@ -139,7 +139,7 @@ public function inGroup($uid, $gid) {
  ->from('group_user')
  ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
  ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
 
  $result = $cursor->fetch();
  $cursor->closeCursor();
@@ -164,7 +164,7 @@ public function addToGroup(string $uid, string $gid): bool {
  $qb->insert('group_user')
  ->setValue('uid', $qb->createNamedParameter($uid))
  ->setValue('gid', $qb->createNamedParameter($gid))
- ->execute();
+ ->executeStatement();
  return true;
  } else {
  return false;
@@ -186,7 +186,7 @@ public function removeFromGroup(string $uid, string $gid): bool {
  $qb->delete('group_user')
  ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
  ->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
 
  return true;
  }
@@ -213,7 +213,7 @@ public function getUserGroups($uid) {
  ->from('group_user', 'gu')
  ->leftJoin('gu', 'groups', 'g', $qb->expr()->eq('gu.gid', 'g.gid'))
  ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
 
  $groups = [];
  while ($row = $cursor->fetch()) {
@@ -260,7 +260,7 @@ public function getGroups(string $search = '', int $limit = -1, int $offset = 0)
  if ($offset > 0) {
  $query->setFirstResult($offset);
  }
- $result = $query->execute();
+ $result = $query->executeQuery();
 
  $groups = [];
  while ($row = $result->fetch()) {
@@ -292,7 +292,7 @@ public function groupExists($gid) {
  $cursor = $qb->select('gid', 'displayname')
  ->from('groups')
  ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeQuery();
  $result = $cursor->fetch();
  $cursor->closeCursor();
 
@@ -423,7 +423,7 @@ public function countUsersInGroup(string $gid, string $search = ''): int {
  )));
  }
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $count = $result->fetchOne();
  $result->closeCursor();
 
@@ -455,7 +455,7 @@ public function countDisabledInGroup(string $gid): int {
  ->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
  ->andWhere($query->expr()->eq('gid', $query->createNamedParameter($gid), IQueryBuilder::PARAM_STR));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $count = $result->fetchOne();
  $result->closeCursor();
 
@@ -484,7 +484,7 @@ public function getDisplayName(string $gid): string {
  ->from('groups')
  ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $displayName = $result->fetchOne();
  $result->closeCursor();
 
@@ -555,7 +555,7 @@ public function setDisplayName(string $gid, string $displayName): bool {
  $query->update('groups')
  ->set('displayname', $query->createNamedParameter($displayName))
  ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
- $query->execute();
+ $query->executeStatement();
 
  return true;
  }

lib/private/Repair/OldGroupMembershipShares.php

@@ -65,7 +65,7 @@ public function run(IOutput $output) {
  while ($row = $result->fetch()) {
  if (!$this->isMember($row['group'], $row['user'])) {
  $deletedEntries += $deleteQuery->setParameter('share', (int)$row['id'])
- ->execute();
+ ->executeStatement();
  }
  }
  $result->closeCursor();

lib/private/Repair/RepairInvalidShares.php

@@ -7,10 +7,10 @@
  */
 namespace OC\Repair;
 
-use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
 use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
 
 /**
  * Repairs shares with invalid data