3 files changed, 24 insertions, 26 deletions

diff --git a/apps/files_external/tests/Command/ApplicableTest.php b/apps/files_external/tests/Command/ApplicableTest.php
index 8854e4ad485..59db18a42de 100644
--- a/apps/files_external/tests/Command/ApplicableTest.php
+++ b/apps/files_external/tests/Command/ApplicableTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -9,12 +11,13 @@ namespace OCA\Files_External\Tests\Command;
 use OCA\Files_External\Command\Applicable;
 use OCP\IGroupManager;
 use OCP\IUserManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
-class ApplicableTest extends CommandTest {
-	private function getInstance($storageService) {
-		/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject $userManager */
+class ApplicableTest extends CommandTestCase {
+	private function getInstance($storageService): Applicable {
+		/** @var IUserManager&MockObject $userManager */
 		$userManager = $this->createMock(IUserManager::class);
-		/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject $groupManager */
+		/** @var IGroupManager&MockObject $groupManager */
 		$groupManager = $this->createMock(IGroupManager::class);
 
 		$userManager->expects($this->any())
diff --git a/apps/files_external/tests/Command/CommandTest.php b/apps/files_external/tests/Command/CommandTestCase.php
index ed991fd784d..47985b687cd 100644
--- a/apps/files_external/tests/Command/CommandTest.php
+++ b/apps/files_external/tests/Command/CommandTestCase.php
@@ -9,21 +9,20 @@ namespace OCA\Files_External\Tests\Command;
 use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Test\TestCase;
 
-abstract class CommandTest extends TestCase {
+abstract class CommandTestCase extends TestCase {
 	/**
 	 * @param StorageConfig[] $mounts
-	 * @return GlobalStoragesService|\PHPUnit\Framework\MockObject\MockObject
+	 * @return GlobalStoragesService&MockObject
 	 */
 	protected function getGlobalStorageService(array $mounts = []) {
-		$mock = $this->getMockBuilder('OCA\Files_External\Service\GlobalStoragesService')
-			->disableOriginalConstructor()
-			->getMock();
+		$mock = $this->createMock(GlobalStoragesService::class);
 
 		$this->bindMounts($mock, $mounts);
 
@@ -31,10 +30,10 @@ abstract class CommandTest extends TestCase {
 	}
 
 	/**
-	 * @param \PHPUnit\Framework\MockObject\MockObject $mock
+	 * @param MockObject $mock
 	 * @param StorageConfig[] $mounts
 	 */
-	protected function bindMounts(\PHPUnit\Framework\MockObject\MockObject $mock, array $mounts) {
+	protected function bindMounts(MockObject $mock, array $mounts) {
 		$mock->expects($this->any())
 			->method('getStorage')
 			->willReturnCallback(function ($id) use ($mounts) {
@@ -70,7 +69,7 @@ abstract class CommandTest extends TestCase {
 		return $mount;
 	}
 
-	protected function getInput(Command $command, array $arguments = [], array $options = []) {
+	protected function getInput(Command $command, array $arguments = [], array $options = []): ArrayInput {
 		$input = new ArrayInput([]);
 		$input->bind($command->getDefinition());
 		foreach ($arguments as $key => $value) {
@@ -82,7 +81,7 @@ abstract class CommandTest extends TestCase {
 		return $input;
 	}
 
-	protected function executeCommand(Command $command, Input $input) {
+	protected function executeCommand(Command $command, Input $input): string {
 		$output = new BufferedOutput();
 		$this->invokePrivate($command, 'execute', [$input, $output]);
 		return $output->fetch();
diff --git a/apps/files_external/tests/Command/ListCommandTest.php b/apps/files_external/tests/Command/ListCommandTest.php
index bd4430b4116..5b84e500e3f 100644
--- a/apps/files_external/tests/Command/ListCommandTest.php
+++ b/apps/files_external/tests/Command/ListCommandTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -16,24 +18,20 @@ use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\UserStoragesService;
 use OCP\Authentication\LoginCredentials\IStore;
 use OCP\IL10N;
-use OCP\ISession;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\Security\ICrypto;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-class ListCommandTest extends CommandTest {
-	/**
-	 * @return ListCommand|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private function getInstance() {
-		/** @var GlobalStoragesService|\PHPUnit\Framework\MockObject\MockObject $globalService */
+class ListCommandTest extends CommandTestCase {
+	private function getInstance(): ListCommand {
+		/** @var GlobalStoragesService&MockObject $globalService */
 		$globalService = $this->createMock(GlobalStoragesService::class);
-		/** @var UserStoragesService|\PHPUnit\Framework\MockObject\MockObject $userService */
+		/** @var UserStoragesService&MockObject $userService */
 		$userService = $this->createMock(UserStoragesService::class);
-		/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject $userManager */
+		/** @var IUserManager&MockObject $userManager */
 		$userManager = $this->createMock(IUserManager::class);
-		/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject $userSession */
+		/** @var IUserSession&MockObject $userSession */
 		$userSession = $this->createMock(IUserSession::class);
 
 		return new ListCommand($globalService, $userService, $userSession, $userManager);
@@ -41,8 +39,6 @@ class ListCommandTest extends CommandTest {
 
 	public function testListAuthIdentifier(): void {
 		$l10n = $this->createMock(IL10N::class);
-		$session = $this->createMock(ISession::class);
-		$crypto = $this->createMock(ICrypto::class);
 		$instance = $this->getInstance();
 		$mount1 = new StorageConfig();
 		$mount1->setAuthMechanism(new Password($l10n));