test: Migrate files apptests/noid/federated-file-sharing

Signed-off-by: Joas Schilling <coding@schilljs.com>

12 files changed, 138 insertions, 200 deletions

diff --git a/apps/files/tests/Activity/Filter/GenericTest.php b/apps/files/tests/Activity/Filter/GenericTest.php
index dbb2538ed8a..f37a1cb2c9e 100644
--- a/apps/files/tests/Activity/Filter/GenericTest.php
+++ b/apps/files/tests/Activity/Filter/GenericTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -18,7 +20,7 @@ use Test\TestCase;
  * @group DB
  */
 class GenericTest extends TestCase {
-	public function dataFilters() {
+	public static function dataFilters(): array {
 		return [
 			[Favorites::class],
 			[FileChanges::class],
@@ -27,18 +29,16 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testImplementsInterface($filterClass): void {
+	public function testImplementsInterface(string $filterClass): void {
 		$filter = Server::get($filterClass);
 		$this->assertInstanceOf(IFilter::class, $filter);
 	}
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testGetIdentifier($filterClass): void {
+	public function testGetIdentifier(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$this->assertIsString($filter->getIdentifier());
@@ -46,9 +46,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testGetName($filterClass): void {
+	public function testGetName(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$this->assertIsString($filter->getName());
@@ -56,9 +55,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testGetPriority($filterClass): void {
+	public function testGetPriority(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$priority = $filter->getPriority();
@@ -69,9 +67,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testGetIcon($filterClass): void {
+	public function testGetIcon(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$this->assertIsString($filter->getIcon());
@@ -80,9 +77,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testFilterTypes($filterClass): void {
+	public function testFilterTypes(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$this->assertIsArray($filter->filterTypes([]));
@@ -90,9 +86,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataFilters
-	 * @param string $filterClass
 	 */
-	public function testAllowedApps($filterClass): void {
+	public function testAllowedApps(string $filterClass): void {
 		/** @var IFilter $filter */
 		$filter = Server::get($filterClass);
 		$this->assertIsArray($filter->allowedApps());
diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php
index 7b91e980842..ed52c76ba28 100644
--- a/apps/files/tests/Activity/ProviderTest.php
+++ b/apps/files/tests/Activity/ProviderTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -26,23 +28,14 @@ use Test\TestCase;
  * @package OCA\Files\Tests\Activity
  */
 class ProviderTest extends TestCase {
-
-	/** @var IFactory|MockObject */
-	protected $l10nFactory;
-	/** @var IURLGenerator|MockObject */
-	protected $url;
-	/** @var IManager|MockObject */
-	protected $activityManager;
-	/** @var IUserManager|MockObject */
-	protected $userManager;
-	/** @var IRootFolder|MockObject */
-	protected $rootFolder;
-	/** @var ICloudIdManager|MockObject */
-	protected $cloudIdManager;
-	/** @var IContactsManager|MockObject */
-	protected $contactsManager;
-	/** @var IEventMerger|MockObject */
-	protected $eventMerger;
+	protected IFactory&MockObject $l10nFactory;
+	protected IURLGenerator&MockObject $url;
+	protected IManager&MockObject $activityManager;
+	protected IUserManager&MockObject $userManager;
+	protected IRootFolder&MockObject $rootFolder;
+	protected ICloudIdManager&MockObject $cloudIdManager;
+	protected IContactsManager&MockObject $contactsManager;
+	protected IEventMerger&MockObject $eventMerger;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -74,7 +67,7 @@ class ProviderTest extends TestCase {
 					$this->contactsManager,
 					$this->eventMerger,
 				])
-				->setMethods($methods)
+				->onlyMethods($methods)
 				->getMock();
 		}
 		return new Provider(
@@ -89,7 +82,7 @@ class ProviderTest extends TestCase {
 		);
 	}
 
-	public function dataGetFile() {
+	public static function dataGetFile(): array {
 		return [
 			[[42 => '/FortyTwo.txt'], null, '42', 'FortyTwo.txt', 'FortyTwo.txt'],
 			[['23' => '/Twenty/Three.txt'], null, '23', 'Three.txt', 'Twenty/Three.txt'],
@@ -99,13 +92,8 @@ class ProviderTest extends TestCase {
 
 	/**
 	 * @dataProvider dataGetFile
-	 * @param mixed $parameter
-	 * @param mixed $eventId
-	 * @param int $id
-	 * @param string $name
-	 * @param string $path
 	 */
-	public function testGetFile($parameter, $eventId, $id, $name, $path): void {
+	public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void {
 		$provider = $this->getProvider();
 
 		if ($eventId !== null) {
@@ -139,7 +127,7 @@ class ProviderTest extends TestCase {
 		self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
 	}
 
-	public function dataGetUser() {
+	public static function dataGetUser(): array {
 		return [
 			['test', 'Test user', null, ['type' => 'user', 'id' => 'test', 'name' => 'Test user']],
 			['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => null], ['type' => 'user', 'id' => 'test', 'name' => 'test@localhost', 'server' => 'localhost']],
@@ -150,10 +138,6 @@ class ProviderTest extends TestCase {
 
 	/**
 	 * @dataProvider dataGetUser
-	 * @param string $uid
-	 * @param string|null $userDisplayName
-	 * @param array|null $cloudIdData
-	 * @param array $expected
 	 */
 	public function testGetUser(string $uid, ?string $userDisplayName, ?array $cloudIdData, array $expected): void {
 		$provider = $this->getProvider();
diff --git a/apps/files/tests/Activity/Setting/GenericTest.php b/apps/files/tests/Activity/Setting/GenericTest.php
index 1dc551be927..7e549ce9dc0 100644
--- a/apps/files/tests/Activity/Setting/GenericTest.php
+++ b/apps/files/tests/Activity/Setting/GenericTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,7 +14,7 @@ use OCP\Server;
 use Test\TestCase;
 
 class GenericTest extends TestCase {
-	public function dataSettings() {
+	public static function dataSettings(): array {
 		return [
 			[FavoriteAction::class],
 			[FileChanged::class],
@@ -22,18 +24,16 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testImplementsInterface($settingClass): void {
+	public function testImplementsInterface(string $settingClass): void {
 		$setting = Server::get($settingClass);
 		$this->assertInstanceOf(ISetting::class, $setting);
 	}
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testGetIdentifier($settingClass): void {
+	public function testGetIdentifier(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsString($setting->getIdentifier());
@@ -41,9 +41,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testGetName($settingClass): void {
+	public function testGetName(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsString($setting->getName());
@@ -51,9 +50,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testGetPriority($settingClass): void {
+	public function testGetPriority(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$priority = $setting->getPriority();
@@ -64,9 +62,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testCanChangeStream($settingClass): void {
+	public function testCanChangeStream(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->canChangeStream());
@@ -74,9 +71,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testIsDefaultEnabledStream($settingClass): void {
+	public function testIsDefaultEnabledStream(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->isDefaultEnabledStream());
@@ -84,9 +80,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testCanChangeMail($settingClass): void {
+	public function testCanChangeMail(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->canChangeMail());
@@ -94,9 +89,8 @@ class GenericTest extends TestCase {
 
 	/**
 	 * @dataProvider dataSettings
-	 * @param string $settingClass
 	 */
-	public function testIsDefaultEnabledMail($settingClass): void {
+	public function testIsDefaultEnabledMail(string $settingClass): void {
 		/** @var ISetting $setting */
 		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->isDefaultEnabledMail());
diff --git a/apps/files/tests/AdvancedCapabilitiesTest.php b/apps/files/tests/AdvancedCapabilitiesTest.php
index af38c51a4a2..8f4a845b708 100644
--- a/apps/files/tests/AdvancedCapabilitiesTest.php
+++ b/apps/files/tests/AdvancedCapabilitiesTest.php
@@ -18,6 +18,7 @@ class AdvancedCapabilitiesTest extends TestCase {
 	protected AdvancedCapabilities $capabilities;
 
 	protected function setUp(): void {
+		parent::setUp();
 		$this->service = $this->createMock(SettingsService::class);
 		$this->capabilities = new AdvancedCapabilities($this->service);
 	}
diff --git a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
index e31b1574815..3f811fca407 100644
--- a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
+++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -33,16 +34,16 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 		$this->logger = Server::get(LoggerInterface::class);
 	}
 
-	protected function cleanMapping($table) {
+	protected function cleanMapping(string $table): void {
 		$query = $this->connection->getQueryBuilder();
-		$query->delete($table)->execute();
+		$query->delete($table)->executeStatement();
 	}
 
-	protected function getMappings($table) {
+	protected function getMappings(string $table): array {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')
 			->from($table);
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$mapping = $result->fetchAll();
 		$result->closeCursor();
 
@@ -61,7 +62,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
 				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
 				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->execute();
+			])->executeStatement();
 		$fileId = $query->getLastInsertId();
 
 		// Existing file
@@ -71,7 +72,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'objectid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
 				'objecttype' => $query->createNamedParameter('files'),
 				'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		// Non-existing file
 		$query = $this->connection->getQueryBuilder();
@@ -80,13 +81,13 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'objectid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
 				'objecttype' => $query->createNamedParameter('files'),
 				'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		$mapping = $this->getMappings('systemtag_object_mapping');
 		$this->assertCount(2, $mapping);
 
 		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		$this->invokePrivate($job, 'cleanSystemTags');
+		self::invokePrivate($job, 'cleanSystemTags');
 
 		$mapping = $this->getMappings('systemtag_object_mapping');
 		$this->assertCount(1, $mapping);
@@ -94,7 +95,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 		$this->cleanMapping('systemtag_object_mapping');
 	}
 
@@ -110,7 +111,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
 				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
 				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->execute();
+			])->executeStatement();
 		$fileId = $query->getLastInsertId();
 
 		// Existing file
@@ -120,7 +121,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'objid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
 				'type' => $query->createNamedParameter('files'),
 				'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		// Non-existing file
 		$query = $this->connection->getQueryBuilder();
@@ -129,13 +130,13 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'objid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
 				'type' => $query->createNamedParameter('files'),
 				'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		$mapping = $this->getMappings('vcategory_to_object');
 		$this->assertCount(2, $mapping);
 
 		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		$this->invokePrivate($job, 'cleanUserTags');
+		self::invokePrivate($job, 'cleanUserTags');
 
 		$mapping = $this->getMappings('vcategory_to_object');
 		$this->assertCount(1, $mapping);
@@ -143,7 +144,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 		$this->cleanMapping('vcategory_to_object');
 	}
 
@@ -159,7 +160,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
 				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
 				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->execute();
+			])->executeStatement();
 		$fileId = $query->getLastInsertId();
 
 		// Existing file
@@ -170,7 +171,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'object_type' => $query->createNamedParameter('files'),
 				'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
 				'actor_type' => $query->createNamedParameter('users'),
-			])->execute();
+			])->executeStatement();
 
 		// Non-existing file
 		$query = $this->connection->getQueryBuilder();
@@ -180,13 +181,13 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'object_type' => $query->createNamedParameter('files'),
 				'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
 				'actor_type' => $query->createNamedParameter('users'),
-			])->execute();
+			])->executeStatement();
 
 		$mapping = $this->getMappings('comments');
 		$this->assertCount(2, $mapping);
 
 		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		$this->invokePrivate($job, 'cleanComments');
+		self::invokePrivate($job, 'cleanComments');
 
 		$mapping = $this->getMappings('comments');
 		$this->assertCount(1, $mapping);
@@ -194,7 +195,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 		$this->cleanMapping('comments');
 	}
 
@@ -210,7 +211,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
 				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
 				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->execute();
+			])->executeStatement();
 		$fileId = $query->getLastInsertId();
 
 		// Existing file
@@ -220,7 +221,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'object_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
 				'object_type' => $query->createNamedParameter('files'),
 				'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		// Non-existing file
 		$query = $this->connection->getQueryBuilder();
@@ -229,13 +230,13 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 				'object_id' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
 				'object_type' => $query->createNamedParameter('files'),
 				'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-			])->execute();
+			])->executeStatement();
 
 		$mapping = $this->getMappings('comments_read_markers');
 		$this->assertCount(2, $mapping);
 
 		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		$this->invokePrivate($job, 'cleanCommentMarkers');
+		self::invokePrivate($job, 'cleanCommentMarkers');
 
 		$mapping = $this->getMappings('comments_read_markers');
 		$this->assertCount(1, $mapping);
@@ -243,7 +244,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 		$this->cleanMapping('comments_read_markers');
 	}
 }
diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php
index ce602805aa2..00d9ed823f9 100644
--- a/apps/files/tests/BackgroundJob/ScanFilesTest.php
+++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -32,10 +33,8 @@ class ScanFilesTest extends TestCase {
 	use UserTrait;
 	use MountProviderTrait;
 
-	/** @var ScanFiles */
-	private $scanFiles;
-	/** @var IUserMountCache */
-	private $mountCache;
+	private ScanFiles $scanFiles;
+	private IUserMountCache $mountCache;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -46,7 +45,7 @@ class ScanFilesTest extends TestCase {
 		$connection = Server::get(IDBConnection::class);
 		$this->mountCache = Server::get(IUserMountCache::class);
 
-		$this->scanFiles = $this->getMockBuilder('\OCA\Files\BackgroundJob\ScanFiles')
+		$this->scanFiles = $this->getMockBuilder(ScanFiles::class)
 			->setConstructorArgs([
 				$config,
 				$dispatcher,
@@ -54,12 +53,12 @@ class ScanFilesTest extends TestCase {
 				$connection,
 				$this->createMock(ITimeFactory::class)
 			])
-			->setMethods(['runScanner'])
+			->onlyMethods(['runScanner'])
 			->getMock();
 	}
 
-	private function runJob() {
-		$this->invokePrivate($this->scanFiles, 'run', [[]]);
+	private function runJob(): void {
+		self::invokePrivate($this->scanFiles, 'run', [[]]);
 	}
 
 	private function getUser(string $userId): IUser {
diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
index 389ede2a74d..54b5ac6c12f 100644
--- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php
+++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -56,7 +57,7 @@ class DeleteOrphanedFilesTest extends TestCase {
 		parent::tearDown();
 	}
 
-	protected function getFile($fileId) {
+	protected function getFile(int $fileId): array {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')
 			->from('filecache')
@@ -64,7 +65,7 @@ class DeleteOrphanedFilesTest extends TestCase {
 		return $query->executeQuery()->fetchAll();
 	}
 
-	protected function getMounts($storageId) {
+	protected function getMounts(int $storageId): array {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')
 			->from('mounts')
@@ -76,12 +77,8 @@ class DeleteOrphanedFilesTest extends TestCase {
 	 * Test clearing orphaned files
 	 */
 	public function testClearFiles(): void {
-		$input = $this->getMockBuilder(InputInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$output = $this->getMockBuilder(OutputInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$input = $this->createMock(InputInterface::class);
+		$output = $this->createMock(OutputInterface::class);
 
 		$rootFolder = Server::get(IRootFolder::class);
 
@@ -112,14 +109,18 @@ class DeleteOrphanedFilesTest extends TestCase {
 		$this->assertSame(1, $deletedRows, 'Asserts that storage got deleted');
 
 		// parent folder, `files`, ´test` and `welcome.txt` => 4 elements
+		$calls = [
+			'3 orphaned file cache entries deleted',
+			'0 orphaned file cache extended entries deleted',
+			'1 orphaned mount entries deleted',
+		];
 		$output
 			->expects($this->exactly(3))
 			->method('writeln')
-			->withConsecutive(
-				['3 orphaned file cache entries deleted'],
-				['0 orphaned file cache extended entries deleted'],
-				['1 orphaned mount entries deleted'],
-			);
+			->willReturnCallback(function (string $message) use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertSame($expected, $message);
+			});
 
 		$this->command->execute($input, $output);
 
diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php
index 429d3c06f66..0c9d7a4fa6e 100644
--- a/apps/files/tests/Controller/ApiControllerTest.php
+++ b/apps/files/tests/Controller/ApiControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -31,6 +32,7 @@ use OCP\IUserSession;
 use OCP\Share\IAttributes;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
@@ -40,41 +42,25 @@ use Test\TestCase;
  * @package OCA\Files\Controller
  */
 class ApiControllerTest extends TestCase {
-	/** @var string */
-	private $appName = 'files';
-	/** @var IUser */
-	private $user;
-	/** @var IRequest */
-	private $request;
-	/** @var TagService */
-	private $tagService;
-	/** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */
-	private $preview;
-	/** @var ApiController */
-	private $apiController;
-	/** @var \OCP\Share\IManager */
-	private $shareManager;
-	/** @var IConfig */
-	private $config;
-	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */
-	private $userFolder;
-	/** @var UserConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $userConfig;
-	/** @var ViewConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $viewConfig;
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
+	private string $appName = 'files';
+	private IUser $user;
+	private IRequest $request;
+	private TagService $tagService;
+	private IPreview&MockObject $preview;
+	private ApiController $apiController;
+	private IManager $shareManager;
+	private IConfig $config;
+	private Folder&MockObject $userFolder;
+	private UserConfig&MockObject $userConfig;
+	private ViewConfig&MockObject $viewConfig;
+	private IL10N&MockObject $l10n;
+	private IRootFolder&MockObject $rootFolder;
+	private LoggerInterface&MockObject $logger;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->request = $this->createMock(IRequest::class);
 		$this->user = $this->createMock(IUser::class);
 		$this->user->expects($this->any())
 			->method('getUID')
@@ -83,19 +69,11 @@ class ApiControllerTest extends TestCase {
 		$userSession->expects($this->any())
 			->method('getUser')
 			->willReturn($this->user);
-		$this->tagService = $this->getMockBuilder(TagService::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->shareManager = $this->getMockBuilder(IManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->preview = $this->getMockBuilder(IPreview::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->tagService = $this->createMock(TagService::class);
+		$this->shareManager = $this->createMock(IManager::class);
+		$this->preview = $this->createMock(IPreview::class);
 		$this->config = $this->createMock(IConfig::class);
-		$this->userFolder = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->userFolder = $this->createMock(Folder::class);
 		$this->userConfig = $this->createMock(UserConfig::class);
 		$this->viewConfig = $this->createMock(ViewConfig::class);
 		$this->l10n = $this->createMock(IL10N::class);
diff --git a/apps/files/tests/Controller/ConversionApiControllerTest.php b/apps/files/tests/Controller/ConversionApiControllerTest.php
index a2f1fccd978..659fbe1a956 100644
--- a/apps/files/tests/Controller/ConversionApiControllerTest.php
+++ b/apps/files/tests/Controller/ConversionApiControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -60,12 +61,12 @@ class ConversionApiControllerTest extends TestCase {
 		);
 	}
 
-	public function testThrowsNotFoundException() {
+	public function testThrowsNotFoundException(): void {
 		$this->expectException(OCSNotFoundException::class);
 		$this->conversionApiController->convert(42, 'image/png');
 	}
 
-	public function testThrowsOcsException() {
+	public function testThrowsOcsException(): void {
 		$this->userFolder->method('getFirstNodeById')->with(42)->willReturn($this->file);
 		$this->fileConversionManager->method('convert')->willThrowException(new \Exception());
 
@@ -73,7 +74,7 @@ class ConversionApiControllerTest extends TestCase {
 		$this->conversionApiController->convert(42, 'image/png');
 	}
 
-	public function testConvert() {
+	public function testConvert(): void {
 		$convertedFileAbsolutePath = $this->user . '/files/test.png';
 
 		$this->userFolder->method('getFirstNodeById')->with(42)->willReturn($this->file);
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index dd76e814054..93ef98bdec7 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -192,7 +193,7 @@ class ViewControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView'));
 	}
 
-	public function dataTestShortRedirect(): array {
+	public static function dataTestShortRedirect(): array {
 		// openfile is true by default
 		// opendetails is undefined by default
 		// both will be evaluated as truthy
@@ -212,7 +213,7 @@ class ViewControllerTest extends TestCase {
 	/**
 	 * @dataProvider dataTestShortRedirect
 	 */
-	public function testShortRedirect($openfile, $opendetails, $result) {
+	public function testShortRedirect(?string $openfile, ?string $opendetails, string $result): void {
 		$this->appManager->expects($this->any())
 			->method('isEnabledForUser')
 			->with('files')
@@ -239,7 +240,7 @@ class ViewControllerTest extends TestCase {
 			->with(123456)
 			->willReturn($node);
 
-		$response = $this->viewController->showFile(123456, $opendetails, $openfile);
+		$response = $this->viewController->showFile('123456', $opendetails, $openfile);
 		$this->assertStringContainsString($result, $response->getHeaders()['Location']);
 	}
 
@@ -248,13 +249,13 @@ class ViewControllerTest extends TestCase {
 			->method('isEnabledForUser')
 			->willReturn(true);
 
-		$parentNode = $this->getMockBuilder(Folder::class)->getMock();
+		$parentNode = $this->createMock(Folder::class);
 		$parentNode->expects($this->once())
 			->method('getPath')
 			->willReturn('testuser1/files_trashbin/files/test.d1462861890/sub');
 
-		$baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
-		$baseFolderTrash = $this->getMockBuilder(Folder::class)->getMock();
+		$baseFolderFiles = $this->createMock(Folder::class);
+		$baseFolderTrash = $this->createMock(Folder::class);
 
 		$this->rootFolder->expects($this->any())
 			->method('getUserFolder')
@@ -270,7 +271,7 @@ class ViewControllerTest extends TestCase {
 			->with(123)
 			->willReturn(null);
 
-		$node = $this->getMockBuilder(File::class)->getMock();
+		$node = $this->createMock(File::class);
 		$node->expects($this->once())
 			->method('getParent')
 			->willReturn($parentNode);
diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php
index 5900e94215c..cb1fc5ed66d 100644
--- a/apps/files/tests/HelperTest.php
+++ b/apps/files/tests/HelperTest.php
@@ -1,15 +1,17 @@
 <?php
 
-use OC\Files\FileInfo;
-use OCA\Files\Helper;
-
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
+use OC\Files\FileInfo;
+use OCA\Files\Helper;
+
 class HelperTest extends \Test\TestCase {
-	private function makeFileInfo($name, $size, $mtime, $isDir = false) {
+	private static function makeFileInfo($name, $size, $mtime, $isDir = false): FileInfo {
 		return new FileInfo(
 			'/' . $name,
 			null,
@@ -28,7 +30,7 @@ class HelperTest extends \Test\TestCase {
 	/**
 	 * Returns a file list for testing
 	 */
-	private function getTestFileList() {
+	private static function getTestFileList(): array {
 		return [
 			self::makeFileInfo('a.txt', 4, 2.3 * pow(10, 9)),
 			self::makeFileInfo('q.txt', 5, 150),
@@ -39,7 +41,7 @@ class HelperTest extends \Test\TestCase {
 		];
 	}
 
-	public function sortDataProvider() {
+	public static function sortDataProvider(): array {
 		return [
 			[
 				'name',
diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php
index 79dcf110f8a..74e58e674bb 100644
--- a/apps/files/tests/Service/TagServiceTest.php
+++ b/apps/files/tests/Service/TagServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -10,6 +11,7 @@ namespace OCA\Files\Tests\Service;
 use OCA\Files\Service\TagService;
 use OCP\Activity\IManager;
 use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\ITagManager;
 use OCP\ITags;
@@ -17,6 +19,7 @@ use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class TagServiceTest
@@ -26,32 +29,12 @@ use OCP\Server;
  * @package OCA\Files
  */
 class TagServiceTest extends \Test\TestCase {
-
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userSession;
-
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $activityManager;
-
-	/**
-	 * @var Folder
-	 */
-	private $root;
-
-	/**
-	 * @var TagService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private $tagService;
-
-	/**
-	 * @var ITags
-	 */
-	private $tagger;
+	private string $user;
+	private IUserSession&MockObject $userSession;
+	private IManager&MockObject $activityManager;
+	private Folder $root;
+	private TagService&MockObject $tagService;
+	private ITags $tagger;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -70,17 +53,13 @@ class TagServiceTest extends \Test\TestCase {
 			->withAnyParameters()
 			->willReturn($user);
 
-		$this->root = \OC::$server->getUserFolder();
+		$this->root = \OCP\Server::get(IRootFolder::class)->getUserFolder($this->user);
 
 		$this->tagger = Server::get(ITagManager::class)->load('files');
-		$this->tagService = $this->getTagService(['addActivity']);
+		$this->tagService = $this->getTagService();
 	}
 
-	/**
-	 * @param array $methods
-	 * @return TagService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	protected function getTagService(array $methods = []) {
+	protected function getTagService(array $methods = []): TagService&MockObject {
 		return $this->getMockBuilder(TagService::class)
 			->setConstructorArgs([
 				$this->userSession,
@@ -88,7 +67,7 @@ class TagServiceTest extends \Test\TestCase {
 				$this->tagger,
 				$this->root,
 			])
-			->setMethods($methods)
+			->onlyMethods($methods)
 			->getMock();
 	}
 
@@ -98,6 +77,8 @@ class TagServiceTest extends \Test\TestCase {
 		if ($user !== null) {
 			$user->delete();
 		}
+
+		parent::tearDown();
 	}
 
 	public function testUpdateFileTags(): void {