chore: run rectorrector-phpunit10

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

14 files changed, 28 insertions, 62 deletions

diff --git a/tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php b/tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php
index ac679238617..e0289fa7ca9 100644
--- a/tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php
+++ b/tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php
@@ -67,9 +67,7 @@ class MemoryCacheBackendTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataGetAttempts
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetAttempts')]
 	public function testGetAttempts(int $maxAge, ?string $action, ?array $metadata, int $expected): void {
 		$this->cache
 			->expects($this->once())
diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
index e40726fe56a..86f458d8ea8 100644
--- a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
+++ b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
@@ -11,9 +11,10 @@ declare(strict_types=1);
 namespace Test\Security\CSRF;
 
 use OC\Security\CSRF\CsrfTokenGenerator;
+use OCP\Security\ISecureRandom;
 
 class CsrfTokenGeneratorTest extends \Test\TestCase {
-	/** @var \OCP\Security\ISecureRandom */
+	/** @var ISecureRandom */
 	private $random;
 	/** @var \OC\Security\CSRF\CsrfTokenGenerator */
 	private $csrfTokenGenerator;
diff --git a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
index 0e8a36112e2..2b2c4af0444 100644
--- a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
+++ b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
@@ -14,7 +14,7 @@ use OC\Security\CSRF\TokenStorage\SessionStorage;
 use OCP\ISession;
 
 class SessionStorageTest extends \Test\TestCase {
-	/** @var \OCP\ISession */
+	/** @var ISession */
 	private $session;
 	/** @var \OC\Security\CSRF\TokenStorage\SessionStorage */
 	private $sessionStorage;
@@ -42,9 +42,9 @@ class SessionStorageTest extends \Test\TestCase {
 
 	/**
 	 * @param string $token
-	 * @dataProvider getTokenDataProvider
 	 *
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('getTokenDataProvider')]
 	public function testGetTokenWithEmptyToken($token): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Session does not contain a requesttoken');
diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php
index 3657eeb2f99..4dadc824ef6 100644
--- a/tests/lib/Security/CertificateManagerTest.php
+++ b/tests/lib/Security/CertificateManagerTest.php
@@ -114,9 +114,9 @@ class CertificateManagerTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider dangerousFileProvider
 	 * @param string $filename
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dangerousFileProvider')]
 	public function testAddDangerousFile($filename): void {
 		$this->expectException(InvalidPathException::class);
 		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename);
@@ -136,13 +136,13 @@ class CertificateManagerTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider dataTestNeedRebundling
 	 *
 	 * @param int $CaBundleMtime
 	 * @param int $targetBundleMtime
 	 * @param int $targetBundleExists
 	 * @param bool $expected
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestNeedRebundling')]
 	public function testNeedRebundling($CaBundleMtime,
 		$targetBundleMtime,
 		$targetBundleExists,
diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php
index d5e7a114667..4dfe8c5681d 100644
--- a/tests/lib/Security/CredentialsManagerTest.php
+++ b/tests/lib/Security/CredentialsManagerTest.php
@@ -17,9 +17,7 @@ use OCP\Server;
  * @group DB
  */
 class CredentialsManagerTest extends \Test\TestCase {
-	/**
-	 * @dataProvider credentialsProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('credentialsProvider')]
 	public function testWithDB($userId, $identifier): void {
 		$credentialsManager = Server::get(ICredentialsManager::class);
 
@@ -34,9 +32,7 @@ class CredentialsManagerTest extends \Test\TestCase {
 		$this->assertSame(1, $removedRows);
 	}
 
-	/**
-	 * @dataProvider credentialsProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('credentialsProvider')]
 	public function testUpdate($userId, $identifier): void {
 		$credentialsManager = Server::get(ICredentialsManager::class);
 
diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php
index b650e3ffc09..0f8575ab0b5 100644
--- a/tests/lib/Security/CryptoTest.php
+++ b/tests/lib/Security/CryptoTest.php
@@ -31,9 +31,7 @@ class CryptoTest extends \Test\TestCase {
 		$this->crypto = new Crypto(Server::get(IConfig::class));
 	}
 
-	/**
-	 * @dataProvider defaultEncryptionProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('defaultEncryptionProvider')]
 	public function testDefaultEncrypt($stringToEncrypt): void {
 		$ciphertext = $this->crypto->encrypt($stringToEncrypt);
 		$this->assertEquals($stringToEncrypt, $this->crypto->decrypt($ciphertext));
diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php
index 11b63e8ec88..33130f86a73 100644
--- a/tests/lib/Security/HasherTest.php
+++ b/tests/lib/Security/HasherTest.php
@@ -124,18 +124,14 @@ class HasherTest extends \Test\TestCase {
 		$this->assertNotNull($hash);
 	}
 
-	/**
-	 * @dataProvider versionHashProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('versionHashProvider')]
 	public function testSplitHash($hash, $expected): void {
 		$relativePath = self::invokePrivate($this->hasher, 'splitHash', [$hash]);
 		$this->assertSame($expected, $relativePath);
 	}
 
 
-	/**
-	 * @dataProvider hashProviders70_71
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('hashProviders70_71')]
 	public function testVerify($password, $hash, $expected): void {
 		$this->config
 			->expects($this->any())
@@ -151,9 +147,7 @@ class HasherTest extends \Test\TestCase {
 		$this->assertSame($expected, $result);
 	}
 
-	/**
-	 * @dataProvider hashProviders72
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('hashProviders72')]
 	public function testVerifyArgon2i($password, $hash, $expected): void {
 		if (!\defined('PASSWORD_ARGON2I')) {
 			$this->markTestSkipped('Need ARGON2 support to test ARGON2 hashes');
@@ -163,9 +157,7 @@ class HasherTest extends \Test\TestCase {
 		$this->assertSame($expected, $result);
 	}
 
-	/**
-	 * @dataProvider hashProviders73
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('hashProviders73')]
 	public function testVerifyArgon2id(string $password, string $hash, bool $expected): void {
 		if (!\defined('PASSWORD_ARGON2ID')) {
 			$this->markTestSkipped('Need ARGON2ID support to test ARGON2ID hashes');
diff --git a/tests/lib/Security/Ip/BruteforceAllowListTest.php b/tests/lib/Security/Ip/BruteforceAllowListTest.php
index efdb7c4034c..0cffc128d64 100644
--- a/tests/lib/Security/Ip/BruteforceAllowListTest.php
+++ b/tests/lib/Security/Ip/BruteforceAllowListTest.php
@@ -130,10 +130,9 @@ class BruteforceAllowListTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataIsBypassListed
-	 *
 	 * @param string[] $allowList
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataIsBypassListed')]
 	public function testIsBypassListed(
 		string $ip,
 		array $allowList,
diff --git a/tests/lib/Security/Ip/RemoteAddressTest.php b/tests/lib/Security/Ip/RemoteAddressTest.php
index 63c1b452294..a6619cffe8e 100644
--- a/tests/lib/Security/Ip/RemoteAddressTest.php
+++ b/tests/lib/Security/Ip/RemoteAddressTest.php
@@ -25,8 +25,8 @@ class RemoteAddressTest extends \Test\TestCase {
 
 	/**
 	 * @param mixed $allowedRanges
-	 * @dataProvider dataProvider
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
 	public function testAllowedIps(string $remoteIp, $allowedRanges, bool $expected): void {
 		$this->request
 			->method('getRemoteAddress')
diff --git a/tests/lib/Security/Normalizer/IpAddressTest.php b/tests/lib/Security/Normalizer/IpAddressTest.php
index 29067596c98..f7adfb4a0dd 100644
--- a/tests/lib/Security/Normalizer/IpAddressTest.php
+++ b/tests/lib/Security/Normalizer/IpAddressTest.php
@@ -55,11 +55,11 @@ class IpAddressTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider subnetDataProvider
 	 *
 	 * @param string $input
 	 * @param string $expected
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('subnetDataProvider')]
 	public function testGetSubnet($input, $expected): void {
 		$this->assertSame($expected, (new IpAddress($input))->getSubnet());
 	}
diff --git a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php
index 3d319e828ff..913acfa054d 100644
--- a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php
+++ b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php
@@ -73,9 +73,7 @@ class RemoteHostValidatorIntegrationTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider localHostsData
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('localHostsData')]
 	public function testLocalHostsWhenNotAllowed(string $host): void {
 		$this->config
 			->method('getSystemValueBool')
@@ -87,9 +85,7 @@ class RemoteHostValidatorIntegrationTest extends TestCase {
 		self::assertFalse($isValid);
 	}
 
-	/**
-	 * @dataProvider localHostsData
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('localHostsData')]
 	public function testLocalHostsWhenAllowed(string $host): void {
 		$this->config
 			->method('getSystemValueBool')
@@ -111,9 +107,7 @@ class RemoteHostValidatorIntegrationTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider externalAddressesData
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('externalAddressesData')]
 	public function testExternalHost(string $host): void {
 		$this->config
 			->method('getSystemValueBool')
diff --git a/tests/lib/Security/RemoteHostValidatorTest.php b/tests/lib/Security/RemoteHostValidatorTest.php
index 46c969d28c1..b048b9dafd1 100644
--- a/tests/lib/Security/RemoteHostValidatorTest.php
+++ b/tests/lib/Security/RemoteHostValidatorTest.php
@@ -51,9 +51,7 @@ class RemoteHostValidatorTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataValid
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataValid')]
 	public function testValid(string $host, bool $expected): void {
 		$this->hostnameClassifier
 			->method('isLocalHostname')
diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/lib/Security/SecureRandomTest.php
index 490045a4c52..954fd85eaf1 100644
--- a/tests/lib/Security/SecureRandomTest.php
+++ b/tests/lib/Security/SecureRandomTest.php
@@ -40,34 +40,26 @@ class SecureRandomTest extends \Test\TestCase {
 		$this->rng = new SecureRandom();
 	}
 
-	/**
-	 * @dataProvider stringGenerationProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('stringGenerationProvider')]
 	public function testGetLowStrengthGeneratorLength($length, $expectedLength): void {
 		$generator = $this->rng;
 
 		$this->assertEquals($expectedLength, strlen($generator->generate($length)));
 	}
 
-	/**
-	 * @dataProvider stringGenerationProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('stringGenerationProvider')]
 	public function testMediumLowStrengthGeneratorLength($length, $expectedLength): void {
 		$generator = $this->rng;
 
 		$this->assertEquals($expectedLength, strlen($generator->generate($length)));
 	}
 
-	/**
-	 * @dataProvider stringGenerationProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('stringGenerationProvider')]
 	public function testUninitializedGenerate($length, $expectedLength): void {
 		$this->assertEquals($expectedLength, strlen($this->rng->generate($length)));
 	}
 
-	/**
-	 * @dataProvider charCombinations
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('charCombinations')]
 	public function testScheme($charName, $chars): void {
 		$generator = $this->rng;
 		$scheme = constant('OCP\Security\ISecureRandom::' . $charName);
@@ -83,9 +75,7 @@ class SecureRandomTest extends \Test\TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider invalidLengths
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('invalidLengths')]
 	public function testInvalidLengths($length): void {
 		$this->expectException(\LengthException::class);
 		$generator = $this->rng;
diff --git a/tests/lib/Security/TrustedDomainHelperTest.php b/tests/lib/Security/TrustedDomainHelperTest.php
index 1b9ba20a906..8b671a93d06 100644
--- a/tests/lib/Security/TrustedDomainHelperTest.php
+++ b/tests/lib/Security/TrustedDomainHelperTest.php
@@ -27,11 +27,11 @@ class TrustedDomainHelperTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider trustedDomainDataProvider
 	 * @param string $trustedDomains
 	 * @param string $testDomain
 	 * @param bool $result
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('trustedDomainDataProvider')]
 	public function testIsTrustedUrl($trustedDomains, $testDomain, $result): void {
 		$this->config->method('getSystemValue')
 			->willReturnMap([
@@ -44,11 +44,11 @@ class TrustedDomainHelperTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider trustedDomainDataProvider
 	 * @param string $trustedDomains
 	 * @param string $testDomain
 	 * @param bool $result
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('trustedDomainDataProvider')]
 	public function testIsTrustedDomain($trustedDomains, $testDomain, $result): void {
 		$this->config->method('getSystemValue')
 			->willReturnMap([