1 files changed, 32 insertions, 53 deletions

diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index 74afc6d44a1..345311da4d0 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,24 +14,17 @@ use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class CryptTest extends TestCase {
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userSession;
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
+	protected LoggerInterface&MockObject $logger;
+	protected IUserSession&MockObject $userSession;
+	protected IConfig&MockObject $config;
+	protected IL10N&MockObject $l;
 
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l;
-
-	/** @var Crypt */
-	private $crypt;
+	protected Crypt $crypt;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -113,10 +108,7 @@ class CryptTest extends TestCase {
 		$this->crypt->generateHeader('unknown');
 	}
 
-	/**
-	 * @return array
-	 */
-	public function dataTestGenerateHeader() {
+	public static function dataTestGenerateHeader(): array {
 		return [
 			[null, 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash2:encoding:binary:HEND'],
 			['password', 'HBEGIN:cipher:AES-128-CFB:keyFormat:password:encoding:binary:HEND'],
@@ -155,10 +147,8 @@ class CryptTest extends TestCase {
 
 	/**
 	 * data provider for testGetCipher
-	 *
-	 * @return array
 	 */
-	public function dataProviderGetCipher() {
+	public static function dataProviderGetCipher(): array {
 		return [
 			['AES-128-CFB', 'AES-128-CFB'],
 			['AES-256-CFB', 'AES-256-CFB'],
@@ -201,7 +191,7 @@ class CryptTest extends TestCase {
 		$this->assertSame($expected['signature'], $result['signature']);
 	}
 
-	public function dataTestSplitMetaData() {
+	public static function dataTestSplitMetaData(): array {
 		return [
 			['encryptedContent00iv001234567890123456xx',
 				['encrypted' => 'encryptedContent', 'iv' => '1234567890123456', 'signature' => false]],
@@ -222,7 +212,7 @@ class CryptTest extends TestCase {
 		);
 	}
 
-	public function dataTestHasSignature() {
+	public static function dataTestHasSignature(): array {
 		return [
 			['encryptedContent00iv001234567890123456xx', false],
 			['encryptedContent00iv00123456789012345600sig00e1992521e437f6915f9173b190a512cfc38a00ac24502db44e0ba10c2bb0cc86xxx', true]
@@ -239,7 +229,7 @@ class CryptTest extends TestCase {
 		$this->invokePrivate($this->crypt, 'hasSignature', [$data, $cipher]);
 	}
 
-	public function dataTestHasSignatureFail() {
+	public static function dataTestHasSignatureFail(): array {
 		return [
 			['AES-256-CTR'],
 			['aes-256-ctr'],
@@ -270,10 +260,8 @@ class CryptTest extends TestCase {
 
 	/**
 	 * data provider for testRemovePadding
-	 *
-	 * @return array
 	 */
-	public function dataProviderRemovePadding() {
+	public static function dataProviderRemovePadding(): array {
 		return [
 			['dataxx', 'data'],
 			['data', false]
@@ -357,10 +345,7 @@ class CryptTest extends TestCase {
 		$this->invokePrivate($this->crypt, 'getKeySize', ['foo']);
 	}
 
-	/**
-	 * @return array
-	 */
-	public function dataTestGetKeySize() {
+	public static function dataTestGetKeySize(): array {
 		return [
 			['AES-256-CFB', 32],
 			['AES-128-CFB', 16],
@@ -374,28 +359,25 @@ class CryptTest extends TestCase {
 	 */
 	public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected): void {
 		$this->config->method('getSystemValueBool')
-			->withConsecutive(['encryption.legacy_format_support', false],
-				['encryption.use_legacy_base64_encoding', false])
-			->willReturnOnConsecutiveCalls(true, false);
+			->willReturnMap([
+				['encryption.legacy_format_support', false, true],
+				['encryption.use_legacy_base64_encoding', false, false],
+			]);
 
 		/** @var Crypt|\PHPUnit\Framework\MockObject\MockObject $crypt */
 		$crypt = $this->getMockBuilder(Crypt::class)
-			->setConstructorArgs(
-				[
-					$this->logger,
-					$this->userSession,
-					$this->config,
-					$this->l
-				]
-			)
-			->setMethods(
-				[
-					'parseHeader',
-					'generatePasswordHash',
-					'symmetricDecryptFileContent',
-					'isValidPrivateKey'
-				]
-			)
+			->setConstructorArgs([
+				$this->logger,
+				$this->userSession,
+				$this->config,
+				$this->l
+			])
+			->onlyMethods([
+				'parseHeader',
+				'generatePasswordHash',
+				'symmetricDecryptFileContent',
+				'isValidPrivateKey'
+			])
 			->getMock();
 
 		$crypt->expects($this->once())->method('parseHeader')->willReturn($header);
@@ -416,10 +398,7 @@ class CryptTest extends TestCase {
 		$this->assertSame($expected, $result);
 	}
 
-	/**
-	 * @return array
-	 */
-	public function dataTestDecryptPrivateKey() {
+	public static function dataTestDecryptPrivateKey(): array {
 		return [
 			[['cipher' => 'AES-128-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-128-CFB', true, 'key'],
 			[['cipher' => 'AES-256-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', true, 'key'],