chore: add batch

apps/dav/lib/Db/DirectMapper.php

@@ -45,6 +45,6 @@ public function deleteExpired(int $expiration) {
  $qb->expr()->lt('expiration', $qb->createNamedParameter($expiration))
  );
 
- $qb->execute();
+ $qb->executeStatement();
  }
 }

apps/dav/lib/Migration/FixBirthdayCalendarComponent.php

@@ -12,16 +12,9 @@
 
 class FixBirthdayCalendarComponent implements IRepairStep {
 
- /** @var IDBConnection */
- private $connection;
-
- /**
- * FixBirthdayCalendarComponent constructor.
- *
- * @param IDBConnection $connection
- */
- public function __construct(IDBConnection $connection) {
- $this->connection = $connection;
+ public function __construct(
+ private IDBConnection $connection,
+ ) {
  }
 
  /**
@@ -39,7 +32,7 @@ public function run(IOutput $output) {
  $updated = $query->update('calendars')
  ->set('components', $query->createNamedParameter('VEVENT'))
  ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
- ->execute();
+ ->executeStatement();
 
  $output->info("$updated birthday calendars updated.");
  }

apps/files_sharing/lib/Migration/SetAcceptedStatus.php

@@ -17,16 +17,10 @@
 
 class SetAcceptedStatus implements IRepairStep {
 
- /** @var IDBConnection */
- private $connection;
-
- /** @var IConfig */
- private $config;
-
-
- public function __construct(IDBConnection $connection, IConfig $config) {
- $this->connection = $connection;
- $this->config = $config;
+ public function __construct(
+ private IDBConnection $connection,
+ private IConfig $config,
+ ) {
  }
 
  /**
@@ -52,7 +46,7 @@ public function run(IOutput $output): void {
  ->update('share')
  ->set('accepted', $query->createNamedParameter(IShare::STATUS_ACCEPTED))
  ->where($query->expr()->in('share_type', $query->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY)));
- $query->execute();
+ $query->executeStatement();
  }
 
  protected function shouldRun() {

apps/files_sharing/lib/ShareBackend/File.php

@@ -27,10 +27,9 @@ class File implements Share_Backend_File_Dependent {
 
  private $path;
 
- /** @var FederatedShareProvider */
- private $federatedShareProvider;
-
- public function __construct(?FederatedShareProvider $federatedShareProvider = null) {
+ public function __construct(
+ private ?FederatedShareProvider $federatedShareProvider = null,
+ ) {
  if ($federatedShareProvider) {
  $this->federatedShareProvider = $federatedShareProvider;
  } else {
@@ -189,7 +188,7 @@ protected static function resolveReshares($source) {
  ->where(
  $qb->expr()->eq('id', $qb->createNamedParameter($parent))
  );
- $result = $qb->execute();
+ $result = $qb->executeQuery();
  $item = $result->fetch();
  $result->closeCursor();
  if (isset($item['parent'])) {

apps/files_trashbin/lib/Command/CleanUp.php

@@ -19,25 +19,12 @@
 
 class CleanUp extends Command {
 
- /** @var IUserManager */
- protected $userManager;
-
- /** @var IRootFolder */
- protected $rootFolder;
-
- /** @var \OCP\IDBConnection */
- protected $dbConnection;
-
- /**
- * @param IRootFolder $rootFolder
- * @param IUserManager $userManager
- * @param IDBConnection $dbConnection
- */
- public function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) {
+ public function __construct(
+ protected IRootFolder $rootFolder,
+ protected IUserManager $userManager,
+ protected IDBConnection $dbConnection,
+ ) {
  parent::__construct();
- $this->userManager = $userManager;
- $this->rootFolder = $rootFolder;
- $this->dbConnection = $dbConnection;
  }
 
  protected function configure() {
@@ -119,7 +106,7 @@ protected function removeDeletedFiles(string $uid, OutputInterface $output, bool
  $query->delete('files_trash')
  ->where($query->expr()->eq('user', $query->createParameter('uid')))
  ->setParameter('uid', $uid);
- $query->execute();
+ $query->executeStatement();
  } else {
  if ($verbose) {
  $output->writeln("No trash found for <info>$uid</info>");

apps/oauth2/lib/Migration/SetTokenExpiration.php

@@ -18,21 +18,15 @@
 
 class SetTokenExpiration implements IRepairStep {
 
- /** @var IDBConnection */
- private $connection;
-
  /** @var ITimeFactory */
  private $time;
 
- /** @var TokenProvider */
- private $tokenProvider;
-
- public function __construct(IDBConnection $connection,
+ public function __construct(
+ private IDBConnection $connection,
  ITimeFactory $timeFactory,
- TokenProvider $tokenProvider) {
-  $this->connection = $connection;
+ private TokenProvider $tokenProvider,
+ ) {
  $this->time = $timeFactory;
- $this->tokenProvider = $tokenProvider;
  }
 
  public function getName(): string {
@@ -44,7 +38,7 @@ public function run(IOutput $output) {
  $qb->select('*')
  ->from('oauth2_access_tokens');
 
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
 
  while ($row = $cursor->fetch()) {
  $token = AccessToken::fromRow($row);

build/psalm-baseline.xml

@@ -1792,12 +1792,8 @@
  </InvalidReturnType>
  </file>
  <file src="lib/private/DirectEditing/Manager.php">
- <InvalidReturnStatement>
- <code><![CDATA[$query->execute()]]></code>
- </InvalidReturnStatement>
  <InvalidReturnType>
  <code><![CDATA[TemplateResponse]]></code>
- <code><![CDATA[int]]></code>
  </InvalidReturnType>
  <UndefinedMethod>
  <code><![CDATA[$template]]></code>

lib/private/Collaboration/Resources/Collection.php

@@ -54,7 +54,7 @@ public function setName(string $name): void {
  $query->update(Manager::TABLE_COLLECTIONS)
  ->set('name', $query->createNamedParameter($name))
  ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
 
  $this->name = $name;
  }
@@ -118,7 +118,7 @@ public function removeResource(IResource $resource): void {
  ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
  ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
  ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
- $query->execute();
+ $query->executeStatement();
 
  if (empty($this->resources)) {
  $this->removeCollection();
@@ -172,7 +172,7 @@ protected function removeCollection(): void {
  $query = $this->connection->getQueryBuilder();
  $query->delete(Manager::TABLE_COLLECTIONS)
  ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
 
  $this->manager->invalidateAccessCacheForCollection($this);
  $this->id = 0;

lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php

@@ -30,18 +30,14 @@ class ExpressionBuilder implements IExpressionBuilder {
  /** @var QuoteHelper */
  protected $helper;
 
- /** @var IDBConnection */
- protected $connection;
-
- /** @var LoggerInterface */
- protected $logger;
-
  /** @var FunctionBuilder */
  protected $functionBuilder;
 
- public function __construct(ConnectionAdapter $connection, IQueryBuilder $queryBuilder, LoggerInterface $logger) {
- $this->connection = $connection;
- $this->logger = $logger;
+ public function __construct(
+ protected ConnectionAdapter $connection,
+ IQueryBuilder $queryBuilder,
+ protected LoggerInterface $logger,
+ ) {
  $this->helper = new QuoteHelper();
  $this->expressionBuilder = new DoctrineExpressionBuilder($connection->getInner());
  $this->functionBuilder = $queryBuilder->func();

lib/private/Files/Cache/Storage.php

@@ -157,7 +157,7 @@ public function setAvailability($isAvailable, int $delay = 0) {
  ->set('available', $query->createNamedParameter($available))
  ->set('last_checked', $query->createNamedParameter(time() + $delay))
  ->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
- $query->executeQuery();
+ $query->executeStatement();
  }
 
  /**

lib/private/Files/Config/UserMountCache.php

@@ -24,8 +24,6 @@
  * Cache mounts points per user in the cache so we can easily look them up
  */
 class UserMountCache implements IUserMountCache {
- private IDBConnection $connection;
- private IUserManager $userManager;
 
  /**
  * Cached mount info.
@@ -37,24 +35,18 @@ class UserMountCache implements IUserMountCache {
  * @var CappedMemoryCache<string>
  **/
  private CappedMemoryCache $internalPathCache;
- private LoggerInterface $logger;
  /** @var CappedMemoryCache<array> */
  private CappedMemoryCache $cacheInfoCache;
- private IEventLogger $eventLogger;
 
  /**
  * UserMountCache constructor.
  */
  public function __construct(
- IDBConnection $connection,
- IUserManager $userManager,
- LoggerInterface $logger,
- IEventLogger $eventLogger,
+ private IDBConnection $connection,
+ private IUserManager $userManager,
+ private LoggerInterface $logger,
+ private IEventLogger $eventLogger,
  ) {
- $this->connection = $connection;
- $this->userManager = $userManager;
- $this->logger = $logger;
- $this->eventLogger = $eventLogger;
  $this->cacheInfoCache = new CappedMemoryCache();
  $this->internalPathCache = new CappedMemoryCache();
  $this->mountsForUsers = new CappedMemoryCache();
@@ -177,7 +169,7 @@ private function updateCachedMount(ICachedMountInfo $mount) {
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
  ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
 
- $query->execute();
+ $query->executeStatement();
  }
 
  private function removeFromCache(ICachedMountInfo $mount) {
@@ -187,7 +179,7 @@ private function removeFromCache(ICachedMountInfo $mount) {
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
  ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
  ->andWhere($builder->expr()->eq('mount_point', $builder->createNamedParameter($mount->getMountPoint())));
- $query->execute();
+ $query->executeStatement();
  }
 
  /**
@@ -239,7 +231,7 @@ public function getMountsForUser(IUser $user) {
  ->from('mounts', 'm')
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID)));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $rows = $result->fetchAll();
  $result->closeCursor();
 
@@ -284,7 +276,7 @@ public function getMountsForStorageId($numericStorageId, $user = null) {
  $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
  }
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $rows = $result->fetchAll();
  $result->closeCursor();
 
@@ -302,7 +294,7 @@ public function getMountsForRootId($rootFileId) {
  ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
  ->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT)));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $rows = $result->fetchAll();
  $result->closeCursor();
 
@@ -321,7 +313,7 @@ private function getCacheInfoFromFileId($fileId): array {
  ->from('filecache')
  ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
  $row = $result->fetch();
  $result->closeCursor();
 
@@ -390,7 +382,7 @@ public function removeUserMounts(IUser $user) {
 
  $query = $builder->delete('mounts')
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
- $query->execute();
+ $query->executeStatement();
  }
 
  public function removeUserStorageMount($storageId, $userId) {
@@ -399,15 +391,15 @@ public function removeUserStorageMount($storageId, $userId) {
  $query = $builder->delete('mounts')
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
  ->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
  }
 
  public function remoteStorageMounts($storageId) {
  $builder = $this->connection->getQueryBuilder();
 
  $query = $builder->delete('mounts')
  ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
  }
 
  /**
@@ -438,7 +430,7 @@ public function getUsedSpaceForUsers(array $users) {
  ->where($builder->expr()->eq('m.mount_point', $mountPoint))
  ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
 
- $result = $query->execute();
+ $result = $query->executeQuery();
 
  $results = [];
  while ($row = $result->fetch()) {

lib/private/Security/CredentialsManager.php

@@ -60,7 +60,7 @@ public function retrieve(string $userId, string $identifier): mixed {
  $qb->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($userId)));
  }
 
- $qResult = $qb->execute();
+ $qResult = $qb->executeQuery();
  $result = $qResult->fetch();
  $qResult->closeCursor();
 
@@ -89,7 +89,7 @@ public function delete(string $userId, string $identifier): int {
  $qb->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($userId)));
  }
 
- return $qb->execute();
+ return $qb->executeStatement();
  }
 
  /**
@@ -102,6 +102,6 @@ public function erase(string $userId): int {
  $qb->delete(self::DB_TABLE)
  ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
  ;
- return $qb->execute();
+ return $qb->executeStatement();
  }
 }