From 26c734abe4a5a524870a4ec95064958635eea888 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 1 Jun 2023 07:51:04 +0200
Subject: [PATCH] fix(tests): Specify all positional parameters again to fix
 tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../lib/Command/CleanupRemoteStorages.php     | 20 +++++++------
 .../Command/CleanupRemoteStoragesTest.php     | 28 +++++++++++--------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
index 3816a2a5124..de4c7862785 100644
--- a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
+++ b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
@@ -113,8 +113,9 @@ class CleanupRemoteStorages extends Command {
 				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
 				IQueryBuilder::PARAM_STR)
 			);
-		$result = $queryBuilder->execute();
+		$result = $queryBuilder->executeQuery();
 		$count = $result->fetchOne();
+		$result->closeCursor();
 		$output->writeln("$count files can be deleted for storage $numericId");
 	}
 
@@ -127,7 +128,7 @@ class CleanupRemoteStorages extends Command {
 				IQueryBuilder::PARAM_STR)
 			);
 		$output->write("deleting $id [$numericId] ... ");
-		$count = $queryBuilder->execute();
+		$count = $queryBuilder->executeStatement();
 		$output->writeln("deleted $count storage");
 		$this->deleteFiles($numericId, $output);
 	}
@@ -141,7 +142,7 @@ class CleanupRemoteStorages extends Command {
 				IQueryBuilder::PARAM_STR)
 			);
 		$output->write("deleting files for storage $numericId ... ");
-		$count = $queryBuilder->execute();
+		$count = $queryBuilder->executeStatement();
 		$output->writeln("deleted $count files");
 	}
 
@@ -160,14 +161,16 @@ class CleanupRemoteStorages extends Command {
 				// but not the ones starting with a '/', they are for normal shares
 				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
 				IQueryBuilder::PARAM_STR)
-			)->orderBy('numeric_id');
-		$query = $queryBuilder->execute();
+			)
+			->orderBy('numeric_id');
+		$result = $queryBuilder->executeQuery();
 
 		$remoteStorages = [];
 
-		while ($row = $query->fetch()) {
+		while ($row = $result->fetch()) {
 			$remoteStorages[$row['id']] = $row['numeric_id'];
 		}
+		$result->closeCursor();
 
 		return $remoteStorages;
 	}
@@ -176,16 +179,17 @@ class CleanupRemoteStorages extends Command {
 		$queryBuilder = $this->connection->getQueryBuilder();
 		$queryBuilder->select(['id', 'share_token', 'owner', 'remote'])
 			->from('share_external');
-		$query = $queryBuilder->execute();
+		$result = $queryBuilder->executeQuery();
 
 		$remoteShareIds = [];
 
-		while ($row = $query->fetch()) {
+		while ($row = $result->fetch()) {
 			$cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
 			$remote = $cloudId->getRemote();
 
 			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
 		}
+		$result->closeCursor();
 
 		return $remoteShareIds;
 	}
diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
index cc7fcabe5ac..5738610d0a5 100644
--- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
+++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
@@ -79,11 +79,11 @@ class CleanupRemoteStoragesTest extends TestCase {
 		$shareExternalQuery->insert('share_external')
 			->setValue('share_token', '?')
 			->setValue('remote', '?')
-			->setValue('name', '?')->setParameter(2, 'irrelevant')
-			->setValue('owner', '?')->setParameter(3, 'irrelevant')
+			->setValue('name', '?')
+			->setValue('owner', '?')
 			->setValue('user', '?')
-			->setValue('mountpoint', '?')->setParameter(5, 'irrelevant')
-			->setValue('mountpoint_hash', '?')->setParameter(6, 'irrelevant');
+			->setValue('mountpoint', '?')
+			->setValue('mountpoint_hash', '?');
 
 		$filesQuery = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$filesQuery->insert('filecache')
@@ -95,15 +95,19 @@ class CleanupRemoteStoragesTest extends TestCase {
 			if (isset($storage['id'])) {
 				$storageQuery->setParameter(0, $storage['id']);
 				$storageQuery->execute();
-				$storage['numeric_id'] = $this->connection->lastInsertId('*PREFIX*storages');
+				$storage['numeric_id'] = $storageQuery->getLastInsertId();
 			}
 
 			if (isset($storage['share_token'])) {
 				$shareExternalQuery
 					->setParameter(0, $storage['share_token'])
 					->setParameter(1, $storage['remote'])
-					->setParameter(4, $storage['user']);
-				$shareExternalQuery->execute();
+					->setParameter(2, 'irrelevant')
+					->setParameter(3, 'irrelevant')
+					->setParameter(4, $storage['user'])
+					->setParameter(5, 'irrelevant')
+					->setParameter(6, 'irrelevant');
+				$shareExternalQuery->executeStatement();
 			}
 
 			if (isset($storage['files_count'])) {
@@ -111,7 +115,7 @@ class CleanupRemoteStoragesTest extends TestCase {
 					$filesQuery->setParameter(0, $storage['numeric_id']);
 					$filesQuery->setParameter(1, 'file' . $i);
 					$filesQuery->setParameter(2, md5('file' . $i));
-					$filesQuery->execute();
+					$filesQuery->executeStatement();
 				}
 			}
 		}
@@ -153,8 +157,8 @@ class CleanupRemoteStoragesTest extends TestCase {
 			->from('storages')
 			->where($qb->expr()->eq('numeric_id', $qb->createNamedParameter($numericId)));
 
-		$qResult = $qb->execute();
-		$result = $qResult->fetchAll();
+		$qResult = $qb->executeQuery();
+		$result = $qResult->fetch();
 		$qResult->closeCursor();
 		if (!empty($result)) {
 			return true;
@@ -165,8 +169,8 @@ class CleanupRemoteStoragesTest extends TestCase {
 			->from('filecache')
 			->where($qb->expr()->eq('storage', $qb->createNamedParameter($numericId)));
 
-		$qResult = $qb->execute();
-		$result = $qResult->fetchAll();
+		$qResult = $qb->executeQuery();
+		$result = $qResult->fetch();
 		$qResult->closeCursor();
 		if (!empty($result)) {
 			return true;
-- 
2.39.5