chore: add batch

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

@@ -15,18 +15,11 @@
 
 class CalDAVRemoveEmptyValue implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	private LoggerInterface $logger;
-
-	public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, LoggerInterface $logger) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
+	public function __construct(
+		private IDBConnection $db,
+		private CalDavBackend $calDavBackend,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function getName() {
@@ -80,7 +73,7 @@ protected function getInvalidObjects($pattern) {
 			$query = $this->db->getQueryBuilder();
 			$query->select($query->func()->count('*', 'num_entries'))
 				->from('calendarobjects');
-			$result = $query->execute();
+			$result = $query->executeQuery();
 			$count = $result->fetchOne();
 			$result->closeCursor();
 
@@ -92,7 +85,7 @@ protected function getInvalidObjects($pattern) {
 				->setMaxResults($chunkSize);
 			for ($chunk = 0; $chunk < $numChunks; $chunk++) {
 				$query->setFirstResult($chunk * $chunkSize);
-				$result = $query->execute();
+				$result = $query->executeQuery();
 
 				while ($row = $result->fetch()) {
 					if (mb_strpos($row['calendardata'], $pattern) !== false) {
@@ -117,7 +110,7 @@ protected function getInvalidObjects($pattern) {
 				IQueryBuilder::PARAM_STR
 			));
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 

apps/dav/lib/Migration/RefreshWebcalJobRegistrar.php

@@ -42,7 +42,7 @@ public function run(IOutput $output) {
 		$query = $this->connection->getQueryBuilder();
 		$query->select(['principaluri', 'uri'])
 			->from('calendarsubscriptions');
-		$stmt = $query->executeQuery();
+		$stmt = $query->execute();
 
 		$count = 0;
 		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

@@ -450,7 +450,7 @@ private function unshare($id, array $notification) {
 				)
 			);
 
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$share = $result->fetch();
 		$result->closeCursor();
 
@@ -470,13 +470,13 @@ private function unshare($id, array $notification) {
 					)
 				);
 
-			$qb->execute();
+			$qb->executeStatement();
 
 			// delete all child in case of a group share
 			$qb = $this->connection->getQueryBuilder();
 			$qb->delete('share_external')
 				->where($qb->expr()->eq('parent', $qb->createNamedParameter((int)$share['id'])));
-			$qb->execute();
+			$qb->executeStatement();
 
 			$ownerDisplayName = $this->getUserDisplayName($owner->getId());
 
@@ -624,7 +624,7 @@ protected function updatePermissionsInDatabase(IShare $share, $permissions) {
 		$query->update('share')
 			->where($query->expr()->eq('id', $query->createNamedParameter($share->getId())))
 			->set('permissions', $query->createNamedParameter($permissions))
-			->execute();
+			->executeStatement();
 	}
 
 

apps/files_sharing/lib/ShareBackend/File.php

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

apps/settings/lib/SetupChecks/SupportedDatabase.php

@@ -45,7 +45,7 @@ public function run(): SetupResult {
 		$databasePlatform = $this->connection->getDatabasePlatform();
 		if ($databasePlatform instanceof MySQLPlatform) {
 			$statement = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
-			$result = $statement->executeQuery();
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['Value'];
 			$versionlc = strtolower($version);
@@ -91,7 +91,7 @@ public function run(): SetupResult {
 			}
 		} elseif ($databasePlatform instanceof PostgreSQLPlatform) {
 			$statement = $this->connection->prepare('SHOW server_version;');
-			$result = $statement->executeQuery();
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['server_version'];
 			$versionlc = strtolower($version);

apps/user_ldap/lib/Migration/RemoveRefreshTime.php

@@ -22,14 +22,10 @@
  */
 class RemoveRefreshTime implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IDBConnection $dbc, IConfig $config) {
-		$this->dbc = $dbc;
-		$this->config = $config;
+	public function __construct(
+		private IDBConnection $dbc,
+		private IConfig $config,
+	) {
 	}
 
 	public function getName() {
@@ -43,6 +39,6 @@ public function run(IOutput $output) {
 		$qb->delete('preferences')
 			->where($qb->expr()->eq('appid', $qb->createNamedParameter('user_ldap')))
 			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lastFeatureRefresh')))
-			->execute();
+			->executeStatement();
 	}
 }

core/Command/Db/ConvertType.php

@@ -298,7 +298,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 		$query->automaticTablePrefix(false);
 		$query->select($query->func()->count('*', 'num_entries'))
 			->from($table->getName());
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$count = $result->fetchOne();
 		$result->closeCursor();
 
@@ -337,7 +337,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
 			$query->setFirstResult($chunk * $chunkSize);
 
-			$result = $query->execute();
+			$result = $query->executeQuery();
 
 			try {
 				$toDB->beginTransaction();

lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php

@@ -37,7 +37,7 @@ public function getState(string $uid): array {
 		$query = $qb->select('provider_id', 'enabled')
 			->from(self::TABLE_NAME)
 			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$providers = [];
 		foreach ($result->fetchAll() as $row) {
 			$providers[(string)$row['provider_id']] = (int)$row['enabled'] === 1;
@@ -106,6 +106,6 @@ public function deleteAll(string $providerId): void {
 		$deleteQuery = $qb->delete(self::TABLE_NAME)
 			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
 
-		$deleteQuery->execute();
+		$deleteQuery->executeStatement();
 	}
 }

lib/private/DirectEditing/Manager.php

@@ -38,36 +38,21 @@ class Manager implements IManager {
 
 	/** @var IEditor[] */
 	private $editors = [];
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ISecureRandom */
-	private $random;
 	/** @var string|null */
 	private $userId;
-	/** @var IRootFolder */
-	private $rootFolder;
 	/** @var IL10N */
 	private $l10n;
-	/** @var EncryptionManager */
-	private $encryptionManager;
 
 	public function __construct(
-		ISecureRandom $random,
-		IDBConnection $connection,
-		IUserSession $userSession,
-		IRootFolder $rootFolder,
-		IFactory $l10nFactory,
-		EncryptionManager $encryptionManager,
+		private ISecureRandom $random,
+		private IDBConnection $connection,
+		private IUserSession $userSession,
+		private IRootFolder $rootFolder,
+		private IFactory $l10nFactory,
+		private EncryptionManager $encryptionManager,
 	) {
-		$this->random = $random;
-		$this->connection = $connection;
-		$this->userSession = $userSession;
 		$this->userId = $userSession->getUser() ? $userSession->getUser()->getUID() : null;
-		$this->rootFolder = $rootFolder;
 		$this->l10n = $l10nFactory->get('lib');
-		$this->encryptionManager = $encryptionManager;
 	}
 
 	public function registerDirectEditor(IEditor $directEditor): void {
@@ -209,7 +194,7 @@ public function getToken(string $token): IToken {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')->from(self::TABLE_TOKENS)
 			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		if ($tokenRow = $result->fetch(FetchMode::ASSOCIATIVE)) {
 			return new Token($this, $tokenRow);
 		}
@@ -220,15 +205,15 @@ public function cleanup(): int {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete(self::TABLE_TOKENS)
 			->where($query->expr()->lt('timestamp', $query->createNamedParameter(time() - self::TOKEN_CLEANUP_TIME)));
-		return $query->execute();
+		return $query->executeStatement();
 	}
 
 	public function refreshToken(string $token): bool {
 		$query = $this->connection->getQueryBuilder();
 		$query->update(self::TABLE_TOKENS)
 			->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
+		$result = $query->executeStatement();
 		return $result !== 0;
 	}
 
@@ -237,7 +222,7 @@ public function invalidateToken(string $token): bool {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete(self::TABLE_TOKENS)
 			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
+		$result = $query->executeStatement();
 		return $result !== 0;
 	}
 
@@ -247,7 +232,7 @@ public function accessToken(string $token): bool {
 			->set('accessed', $query->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
 			->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
+		$result = $query->executeStatement();
 		return $result !== 0;
 	}
 
@@ -272,7 +257,7 @@ public function createToken($editorId, File $file, string $filePath, ?IShare $sh
 				'share_id' => $query->createNamedParameter($share !== null ? $share->getId(): null),
 				'timestamp' => $query->createNamedParameter(time())
 			]);
-		$query->execute();
+		$query->executeStatement();
 		return $token;
 	}
 
@@ -303,7 +288,7 @@ public function isEnabled(): bool {
 			$moduleId = $this->encryptionManager->getDefaultEncryptionModuleId();
 			$module = $this->encryptionManager->getEncryptionModule($moduleId);
 			/** @var \OCA\Encryption\Util $util */
-			$util = \OC::$server->get(\OCA\Encryption\Util::class);
+			$util = \OCP\Server::get(\OCA\Encryption\Util::class);
 			if ($module->isReadyForUser($this->userId) && $util->isMasterKeyEnabled()) {
 				return true;
 			}

lib/private/Repair/CleanTags.php

@@ -19,21 +19,17 @@
  * @package OC\Repair
  */
 class CleanTags implements IRepairStep {
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
 
 	protected $deletedTags = 0;
 
 	/**
 	 * @param IDBConnection $connection
 	 * @param IUserManager $userManager
 	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
+	public function __construct(
+		protected IDBConnection $connection,
+		protected IUserManager $userManager,
+	) {
 	}
 
 	/**
@@ -73,7 +69,7 @@ protected function checkTags($offset) {
 			->orderBy('uid')
 			->setMaxResults(50)
 			->setFirstResult($offset);
-		$result = $query->execute();
+		$result = $query->executeQuery();
 
 		$users = [];
 		$hadResults = false;
@@ -94,7 +90,7 @@ protected function checkTags($offset) {
 			$query = $this->connection->getQueryBuilder();
 			$query->delete('vcategory')
 				->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
-			$this->deletedTags += $query->execute();
+			$this->deletedTags += $query->executeStatement();
 		}
 		return true;
 	}
@@ -162,7 +158,7 @@ protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTabl
 			->andWhere(
 				$qb->expr()->isNull('s.' . $sourceNullColumn)
 			);
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 
 		$orphanItems = [];
 		while ($row = $result->fetch()) {