1 files changed, 25 insertions, 21 deletions

diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
index a245845a674..10afdd7c5e1 100644
--- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php
+++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
@@ -82,7 +82,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->controller = $this->createMock(Controller::class);
 	}
 
-	public function testBeforeControllerNotLoggedIn() {
+	public function testBeforeControllerNotLoggedIn(): void {
 		$this->userSession->expects($this->once())
 			->method('isLoggedIn')
 			->willReturn(false);
@@ -93,7 +93,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, 'index');
 	}
 
-	public function testBeforeSetupController() {
+	public function testBeforeSetupController(): void {
 		$user = $this->createMock(IUser::class);
 		$controller = $this->createMock(ALoginSetupController::class);
 		$this->userSession->expects($this->any())
@@ -108,7 +108,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($controller, 'create');
 	}
 
-	public function testBeforeControllerNoTwoFactorCheckNeeded() {
+	public function testBeforeControllerNoTwoFactorCheckNeeded(): void {
 		$user = $this->createMock(IUser::class);
 
 		$this->userSession->expects($this->once())
@@ -126,7 +126,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 	}
 
 
-	public function testBeforeControllerTwoFactorAuthRequired() {
+	public function testBeforeControllerTwoFactorAuthRequired(): void {
 		$this->expectException(TwoFactorAuthRequiredException::class);
 
 		$user = $this->createMock(IUser::class);
@@ -150,7 +150,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 	}
 
 
-	public function testBeforeControllerUserAlreadyLoggedIn() {
+	public function testBeforeControllerUserAlreadyLoggedIn(): void {
 		$this->expectException(UserAlreadyLoggedInException::class);
 
 		$user = $this->createMock(IUser::class);
@@ -179,7 +179,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($twoFactorChallengeController, 'index');
 	}
 
-	public function testAfterExceptionTwoFactorAuthRequired() {
+	public function testAfterExceptionTwoFactorAuthRequired(): void {
 		$ex = new TwoFactorAuthRequiredException();
 
 		$this->urlGenerator->expects($this->once())
@@ -191,7 +191,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->assertEquals($expected, $this->middleware->afterException($this->controller, 'index', $ex));
 	}
 
-	public function testAfterException() {
+	public function testAfterException(): void {
 		$ex = new UserAlreadyLoggedInException();
 
 		$this->urlGenerator->expects($this->once())
@@ -203,7 +203,7 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->assertEquals($expected, $this->middleware->afterException($this->controller, 'index', $ex));
 	}
 
-	public function testRequires2FASetupDoneAnnotated() {
+	public function testRequires2FASetupDoneAnnotated(): void {
 		$user = $this->createMock(IUser::class);
 
 		$this->reflector
@@ -234,23 +234,27 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($twoFactorChallengeController, 'index');
 	}
 
-	public function dataRequires2FASetupDone() {
-		$provider = $this->createMock(IProvider::class);
-		$provider->method('getId')
-			->willReturn('2FAftw');
-
+	public static function dataRequires2FASetupDone(): array {
 		return [
-			[[], false, false],
-			[[],  true,  true],
-			[[$provider], false, true],
-			[[$provider], true,  true],
+			[false, false, false],
+			[false,  true,  true],
+			[true, false, true],
+			[true, true,  true],
 		];
 	}
 
-	/**
-	 * @dataProvider dataRequires2FASetupDone
-	 */
-	public function testRequires2FASetupDone(array $providers, bool $missingProviders, bool $expectEception) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataRequires2FASetupDone')]
+	public function testRequires2FASetupDone(bool $hasProvider, bool $missingProviders, bool $expectEception): void {
+		if ($hasProvider) {
+			$provider = $this->createMock(IProvider::class);
+			$provider->method('getId')
+				->willReturn('2FAftw');
+			$providers = [$provider];
+		} else {
+			$providers = [];
+		}
+
+
 		$user = $this->createMock(IUser::class);
 
 		$this->reflector