1 files changed, 25 insertions, 33 deletions

diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php
index 62ef809a867..d1fefee872a 100644
--- a/tests/lib/Encryption/UtilTest.php
+++ b/tests/lib/Encryption/UtilTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -6,6 +7,7 @@
  */
 namespace Test\Encryption;
 
+use OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException;
 use OC\Encryption\Util;
 use OC\Files\View;
 use OCP\Encryption\IEncryptionModule;
@@ -20,7 +22,7 @@ class UtilTest extends TestCase {
 	 *
 	 * @see https://bugs.php.net/bug.php?id=21641
 	 */
-	protected int $headerSize = 8192;
+	protected static int $headerSize = 8192;
 
 	/** @var \PHPUnit\Framework\MockObject\MockObject */
 	protected $view;
@@ -53,15 +55,13 @@ class UtilTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider providesHeadersForEncryptionModule
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesHeadersForEncryptionModule')]
 	public function testGetEncryptionModuleId($expected, $header): void {
 		$id = $this->util->getEncryptionModuleId($header);
 		$this->assertEquals($expected, $id);
 	}
 
-	public function providesHeadersForEncryptionModule() {
+	public static function providesHeadersForEncryptionModule(): array {
 		return [
 			['', []],
 			['', ['1']],
@@ -69,9 +69,7 @@ class UtilTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider providesHeaders
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesHeaders')]
 	public function testCreateHeader($expected, $header, $moduleId): void {
 		$em = $this->createMock(IEncryptionModule::class);
 		$em->expects($this->any())->method('getId')->willReturn($moduleId);
@@ -80,18 +78,18 @@ class UtilTest extends TestCase {
 		$this->assertEquals($expected, $result);
 	}
 
-	public function providesHeaders() {
+	public static function providesHeaders(): array {
 		return [
-			[str_pad('HBEGIN:oc_encryption_module:0:HEND', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
 				, [], '0'],
-			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
 				, ['custom_header' => 'foo'], '0'],
 		];
 	}
 
 
 	public function testCreateHeaderFailed(): void {
-		$this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
+		$this->expectException(EncryptionHeaderKeyExistsException::class);
 
 
 		$header = ['header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo'];
@@ -102,9 +100,7 @@ class UtilTest extends TestCase {
 		$this->util->createHeader($header, $em);
 	}
 
-	/**
-	 * @dataProvider providePathsForTestIsExcluded
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('providePathsForTestIsExcluded')]
 	public function testIsExcluded($path, $keyStorageRoot, $expected): void {
 		$this->config->expects($this->once())
 			->method('getAppValue')
@@ -120,7 +116,7 @@ class UtilTest extends TestCase {
 		);
 	}
 
-	public function providePathsForTestIsExcluded() {
+	public static function providePathsForTestIsExcluded(): array {
 		return [
 			['/files_encryption', '', true],
 			['files_encryption/foo.txt', '', true],
@@ -143,16 +139,14 @@ class UtilTest extends TestCase {
 		return false;
 	}
 
-	/**
-	 * @dataProvider dataTestIsFile
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsFile')]
 	public function testIsFile($path, $expected): void {
 		$this->assertSame($expected,
 			$this->util->isFile($path)
 		);
 	}
 
-	public function dataTestIsFile() {
+	public static function dataTestIsFile(): array {
 		return [
 			['/user/files/test.txt', true],
 			['/user/files', true],
@@ -165,17 +159,17 @@ class UtilTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestStripPartialFileExtension
 	 *
 	 * @param string $path
 	 * @param string $expected
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestStripPartialFileExtension')]
 	public function testStripPartialFileExtension($path, $expected): void {
 		$this->assertSame($expected,
 			$this->util->stripPartialFileExtension($path));
 	}
 
-	public function dataTestStripPartialFileExtension() {
+	public static function dataTestStripPartialFileExtension(): array {
 		return [
 			['/foo/test.txt', '/foo/test.txt'],
 			['/foo/test.txt.part', '/foo/test.txt'],
@@ -184,9 +178,7 @@ class UtilTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataTestParseRawHeader
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestParseRawHeader')]
 	public function testParseRawHeader($rawHeader, $expected): void {
 		$result = $this->util->parseRawHeader($rawHeader);
 		$this->assertSameSize($expected, $result);
@@ -196,28 +188,28 @@ class UtilTest extends TestCase {
 		}
 	}
 
-	public function dataTestParseRawHeader() {
+	public static function dataTestParseRawHeader(): array {
 		return [
-			[str_pad('HBEGIN:oc_encryption_module:0:HEND', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
 				, [Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
-			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
 				, ['custom_header' => 'foo', Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
-			[str_pad('HelloWorld', $this->headerSize, '-', STR_PAD_RIGHT), []],
+			[str_pad('HelloWorld', self::$headerSize, '-', STR_PAD_RIGHT), []],
 			['', []],
-			[str_pad('HBEGIN:oc_encryption_module:0', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('HBEGIN:oc_encryption_module:0', self::$headerSize, '-', STR_PAD_RIGHT)
 				, []],
-			[str_pad('oc_encryption_module:0:HEND', $this->headerSize, '-', STR_PAD_RIGHT)
+			[str_pad('oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
 				, []],
 		];
 	}
 
 	/**
-	 * @dataProvider dataTestGetFileKeyDir
 	 *
 	 * @param bool $isSystemWideMountPoint
 	 * @param string $storageRoot
 	 * @param string $expected
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetFileKeyDir')]
 	public function testGetFileKeyDir($isSystemWideMountPoint, $storageRoot, $expected): void {
 		$path = '/user1/files/foo/bar.txt';
 		$owner = 'user1';
@@ -245,7 +237,7 @@ class UtilTest extends TestCase {
 		);
 	}
 
-	public function dataTestGetFileKeyDir() {
+	public static function dataTestGetFileKeyDir(): array {
 		return [
 			[false, '', '/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
 			[true, '', '/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],