chore: run rectorrector-phpunit10

Signed-off-by: Robin Appelman <robin@icewind.nl>

6 files changed, 22 insertions, 42 deletions

diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index bf7d0324b8c..979e12e03b3 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -45,7 +45,7 @@ class DecryptAllTest extends TestCase {
 	/** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Output\OutputInterface */
 	protected $outputInterface;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\UserInterface */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|UserInterface */
 	protected $userInterface;
 
 	/** @var DecryptAll */
@@ -94,11 +94,11 @@ class DecryptAllTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataDecryptAll
 	 * @param bool $prepareResult
 	 * @param string $user
 	 * @param bool $userExistsChecked
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataDecryptAll')]
 	public function testDecryptAll($prepareResult, $user, $userExistsChecked): void {
 		if ($userExistsChecked) {
 			$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
@@ -154,9 +154,9 @@ class DecryptAllTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTrueFalse
 	 * @param bool $success
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTrueFalse')]
 	public function testPrepareEncryptionModules($success): void {
 		$user = 'user1';
 
@@ -186,9 +186,7 @@ class DecryptAllTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider dataTestDecryptAllUsersFiles
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestDecryptAllUsersFiles')]
 	public function testDecryptAllUsersFiles($user): void {
 		/** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject |  $instance */
 		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
@@ -318,9 +316,7 @@ class DecryptAllTest extends TestCase {
 		$this->invokePrivate($instance, 'decryptUsersFiles', ['user1', $progressBar, '']);
 	}
 
-	/**
-	 * @dataProvider dataTrueFalse
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTrueFalse')]
 	public function testDecryptFile($isEncrypted): void {
 		$path = 'test.txt';
 
diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php
index 8930b62eacf..58bf5aff005 100644
--- a/tests/lib/Encryption/EncryptionWrapperTest.php
+++ b/tests/lib/Encryption/EncryptionWrapperTest.php
@@ -29,7 +29,7 @@ class EncryptionWrapperTest extends TestCase {
 	/** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Encryption\Manager */
 	private $manager;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Memcache\ArrayCache */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|ArrayCache */
 	private $arrayCache;
 
 	protected function setUp(): void {
@@ -43,9 +43,7 @@ class EncryptionWrapperTest extends TestCase {
 	}
 
 
-	/**
-	 * @dataProvider provideWrapStorage
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('provideWrapStorage')]
 	public function testWrapStorage($expectedWrapped, $wrappedStorages): void {
 		$storage = $this->getMockBuilder(IStorage::class)
 			->disableOriginalConstructor()
diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php
index 348b0ecf10d..333d8d8ce21 100644
--- a/tests/lib/Encryption/Keys/StorageTest.php
+++ b/tests/lib/Encryption/Keys/StorageTest.php
@@ -124,13 +124,13 @@ class StorageTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestGetFileKey
 	 *
 	 * @param string $path
 	 * @param string $strippedPartialName
 	 * @param bool $originalKeyExists
 	 * @param string $expectedKeyContent
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetFileKey')]
 	public function testGetFileKey($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent): void {
 		$this->config->method('getSystemValueString')
 			->with('version')
@@ -408,9 +408,7 @@ class StorageTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider dataProviderCopyRename
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataProviderCopyRename')]
 	public function testRenameKeys($source, $target, $systemWideMountSource, $systemWideMountTarget, $expectedSource, $expectedTarget): void {
 		$this->view->expects($this->any())
 			->method('file_exists')
@@ -439,9 +437,7 @@ class StorageTest extends TestCase {
 		$this->storage->renameKeys($source, $target);
 	}
 
-	/**
-	 * @dataProvider dataProviderCopyRename
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataProviderCopyRename')]
 	public function testCopyKeys($source, $target, $systemWideMountSource, $systemWideMountTarget, $expectedSource, $expectedTarget): void {
 		$this->view->expects($this->any())
 			->method('file_exists')
@@ -510,13 +506,13 @@ class StorageTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestGetPathToKeys
 	 *
 	 * @param string $path
 	 * @param boolean $systemWideMountPoint
 	 * @param string $storageRoot
 	 * @param string $expected
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetPathToKeys')]
 	public function testGetPathToKeys($path, $systemWideMountPoint, $storageRoot, $expected): void {
 		$this->invokePrivate($this->storage, 'root_dir', [$storageRoot]);
 
@@ -569,9 +565,9 @@ class StorageTest extends TestCase {
 
 
 	/**
-	 * @dataProvider dataTestBackupUserKeys
 	 * @param bool $createBackupDir
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestBackupUserKeys')]
 	public function testBackupUserKeys($createBackupDir): void {
 		$storage = $this->getMockBuilder('OC\Encryption\Keys\Storage')
 			->setConstructorArgs([$this->view, $this->util, $this->crypto, $this->config])
diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php
index 5e158a2b82e..e9b6ddae8a0 100644
--- a/tests/lib/Encryption/ManagerTest.php
+++ b/tests/lib/Encryption/ManagerTest.php
@@ -266,7 +266,7 @@ class ManagerTest extends TestCase {
 		$encryptionModule->expects($this->any())
 			->method('getDisplayName')
 			->willReturn('TestDummyModule' . $id);
-		/** @var \OCP\Encryption\IEncryptionModule $encryptionModule */
+		/** @var IEncryptionModule $encryptionModule */
 		$manager->registerEncryptionModule('ID' . $id, 'TestDummyModule' . $id, function () use ($encryptionModule) {
 			return $encryptionModule;
 		});
diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php
index 4f3de2b495d..04ca224c0a1 100644
--- a/tests/lib/Encryption/UpdateTest.php
+++ b/tests/lib/Encryption/UpdateTest.php
@@ -77,13 +77,13 @@ class UpdateTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestUpdate
 	 *
 	 * @param string $path
 	 * @param boolean $isDir
 	 * @param array $allFiles
 	 * @param integer $numberOfFiles
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdate')]
 	public function testUpdate($path, $isDir, $allFiles, $numberOfFiles): void {
 		$updateMock = $this->getUpdateMock(['getOwnerPath']);
 		$updateMock->expects($this->once())->method('getOwnerPath')
@@ -121,11 +121,11 @@ class UpdateTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestPostRename
 	 *
 	 * @param string $source
 	 * @param string $target
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestPostRename')]
 	public function testPostRename($source, $target): void {
 		$updateMock = $this->getUpdateMock(['update','getOwnerPath']);
 
diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php
index db74eef0f16..d1fefee872a 100644
--- a/tests/lib/Encryption/UtilTest.php
+++ b/tests/lib/Encryption/UtilTest.php
@@ -55,9 +55,7 @@ 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);
@@ -71,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);
@@ -104,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')
@@ -145,9 +139,7 @@ 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)
@@ -167,11 +159,11 @@ 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));
@@ -186,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);
@@ -214,12 +204,12 @@ class UtilTest extends TestCase {
 	}
 
 	/**
-	 * @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';