1 files changed, 27 insertions, 17 deletions

diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
index beee7151264..90e801ca471 100644
--- a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,31 +11,38 @@ use OC\AppFramework\Middleware\Security\Exceptions\NotConfirmedException;
 use OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware;
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OC\Authentication\Token\IProvider;
+use OC\User\Manager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Authentication\Token\IToken;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
 use Test\AppFramework\Middleware\Security\Mock\PasswordConfirmationMiddlewareController;
 use Test\TestCase;
 
 class PasswordConfirmationMiddlewareTest extends TestCase {
 	/** @var ControllerMethodReflector */
 	private $reflector;
-	/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ISession&\PHPUnit\Framework\MockObject\MockObject */
 	private $session;
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IUserSession&\PHPUnit\Framework\MockObject\MockObject */
 	private $userSession;
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IUser&\PHPUnit\Framework\MockObject\MockObject */
 	private $user;
 	/** @var PasswordConfirmationMiddleware */
 	private $middleware;
 	/** @var PasswordConfirmationMiddlewareController */
 	private $controller;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ITimeFactory&\PHPUnit\Framework\MockObject\MockObject */
 	private $timeFactory;
-	private IProvider|\PHPUnit\Framework\MockObject\MockObject $tokenProvider;
+	private IProvider&\PHPUnit\Framework\MockObject\MockObject $tokenProvider;
+	private LoggerInterface $logger;
+	/** @var IRequest&\PHPUnit\Framework\MockObject\MockObject */
+	private IRequest $request;
+	/** @var Manager&\PHPUnit\Framework\MockObject\MockObject */
+	private Manager $userManager;
 
 	protected function setUp(): void {
 		$this->reflector = new ControllerMethodReflector();
@@ -43,6 +51,9 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		$this->user = $this->createMock(IUser::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->tokenProvider = $this->createMock(IProvider::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->request = $this->createMock(IRequest::class);
+		$this->userManager = $this->createMock(Manager::class);
 		$this->controller = new PasswordConfirmationMiddlewareController(
 			'test',
 			$this->createMock(IRequest::class)
@@ -54,10 +65,13 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 			$this->userSession,
 			$this->timeFactory,
 			$this->tokenProvider,
+			$this->logger,
+			$this->request,
+			$this->userManager,
 		);
 	}
 
-	public function testNoAnnotationNorAttribute() {
+	public function testNoAnnotationNorAttribute(): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 		$this->session->expects($this->never())
 			->method($this->anything());
@@ -67,7 +81,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, __FUNCTION__);
 	}
 
-	public function testDifferentAnnotation() {
+	public function testDifferentAnnotation(): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 		$this->session->expects($this->never())
 			->method($this->anything());
@@ -77,10 +91,8 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, __FUNCTION__);
 	}
 
-	/**
-	 * @dataProvider dataProvider
-	 */
-	public function testAnnotation($backend, $lastConfirm, $currentTime, $exception) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+	public function testAnnotation($backend, $lastConfirm, $currentTime, $exception): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 
 		$this->user->method('getBackendClassName')
@@ -112,10 +124,8 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		$this->assertSame($exception, $thrown);
 	}
 
-	/**
-	 * @dataProvider dataProvider
-	 */
-	public function testAttribute($backend, $lastConfirm, $currentTime, $exception) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+	public function testAttribute($backend, $lastConfirm, $currentTime, $exception): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 
 		$this->user->method('getBackendClassName')
@@ -149,7 +159,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 
 
 
-	public function dataProvider() {
+	public static function dataProvider(): array {
 		return [
 			['foo', 2000, 4000, true],
 			['foo', 2000, 3000, false],
@@ -160,7 +170,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		];
 	}
 
-	public function testSSO() {
+	public function testSSO(): void {
 		static $sessionId = 'mySession1d';
 
 		$this->reflector->reflect($this->controller, __FUNCTION__);