2 files changed, 26 insertions, 19 deletions

diff --git a/apps/encryption/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
index e5079b9a8af..d0af359183b 100644
--- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php
+++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2019 ownCloud GmbH
@@ -11,6 +13,12 @@ namespace OCA\Encryption\Tests\Command;
 use OC\Files\View;
 use OCA\Encryption\Command\FixEncryptedVersion;
 use OCA\Encryption\Util;
+use OCP\Files\IRootFolder;
+use OCP\IConfig;
+use OCP\ITempManager;
+use OCP\IUserManager;
+use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 use Test\TestCase;
@@ -29,21 +37,18 @@ class FixEncryptedVersionTest extends TestCase {
 	use EncryptionTrait;
 	use UserTrait;
 
-	private $userId;
+	private string $userId;
 
-	/** @var FixEncryptedVersion */
-	private $fixEncryptedVersion;
+	private FixEncryptedVersion $fixEncryptedVersion;
 
-	/** @var CommandTester */
-	private $commandTester;
+	private CommandTester $commandTester;
 
-	/** @var Util|\PHPUnit\Framework\MockObject\MockObject */
-	protected $util;
+	protected Util&MockObject $util;
 
 	public function setUp(): void {
 		parent::setUp();
 
-		\OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '1');
+		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
 
 		$this->util = $this->getMockBuilder(Util::class)
 			->disableOriginalConstructor()->getMock();
@@ -51,24 +56,24 @@ class FixEncryptedVersionTest extends TestCase {
 		$this->userId = $this->getUniqueId('user_');
 
 		$this->createUser($this->userId, 'foo12345678');
-		$tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
 		$this->registerMount($this->userId, '\OC\Files\Storage\Local', '/' . $this->userId, ['datadir' => $tmpFolder]);
 		$this->setupForUser($this->userId, 'foo12345678');
 		$this->loginWithEncryption($this->userId);
 
 		$this->fixEncryptedVersion = new FixEncryptedVersion(
-			\OC::$server->getConfig(),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getRootFolder(),
-			\OC::$server->getUserManager(),
+			Server::get(IConfig::class),
+			Server::get(LoggerInterface::class),
+			Server::get(IRootFolder::class),
+			Server::get(IUserManager::class),
 			$this->util,
 			new View('/')
 		);
 		$this->commandTester = new CommandTester($this->fixEncryptedVersion);
 
-		$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
-		$this->assertTrue(\OC::$server->getEncryptionManager()->isReady());
-		$this->assertTrue(\OC::$server->getEncryptionManager()->isReadyForUser($this->userId));
+		$this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isEnabled());
+		$this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReady());
+		$this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReadyForUser($this->userId));
 	}
 
 	/**
@@ -370,7 +375,7 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
 	 * Test commands without master key
 	 */
 	public function testExecuteWithNoMasterKey(): void {
-		\OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '0');
+		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(false);
 
diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php
index c4678b778bc..ead3dfd0195 100644
--- a/apps/encryption/tests/Command/TestEnableMasterKey.php
+++ b/apps/encryption/tests/Command/TestEnableMasterKey.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -53,11 +55,11 @@ class TestEnableMasterKey extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestExecute
 	 *
 	 * @param bool $isAlreadyEnabled
 	 * @param string $answer
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestExecute')]
 	public function testExecute($isAlreadyEnabled, $answer): void {
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn($isAlreadyEnabled);
@@ -79,7 +81,7 @@ class TestEnableMasterKey extends TestCase {
 		$this->invokePrivate($this->enableMasterKey, 'execute', [$this->input, $this->output]);
 	}
 
-	public function dataTestExecute() {
+	public static function dataTestExecute() {
 		return [
 			[true, ''],
 			[false, 'y'],