1 files changed, 19 insertions, 30 deletions

diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index 9f2d41a1072..25b0db94e21 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,7 @@
 namespace OCA\Federation\Tests\Controller;
 
 use OC\BackgroundJob\JobList;
+use OCA\Federation\BackgroundJob\GetSharedSecret;
 use OCA\Federation\Controller\OCSAuthAPIController;
 use OCA\Federation\DbHandler;
 use OCA\Federation\TrustedServers;
@@ -16,34 +18,19 @@ use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IRequest;
 use OCP\Security\Bruteforce\IThrottler;
 use OCP\Security\ISecureRandom;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class OCSAuthAPIControllerTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IRequest */
-	private $request;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|ISecureRandom */
-	private $secureRandom;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|JobList */
-	private $jobList;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */
-	private $trustedServers;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|DbHandler */
-	private $dbHandler;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|LoggerInterface */
-	private $logger;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
-	private $timeFactory;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IThrottler */
-	private $throttler;
-
+	private IRequest&MockObject $request;
+	private ISecureRandom&MockObject $secureRandom;
+	private JobList&MockObject $jobList;
+	private TrustedServers&MockObject $trustedServers;
+	private DbHandler&MockObject $dbHandler;
+	private LoggerInterface&MockObject $logger;
+	private ITimeFactory&MockObject $timeFactory;
+	private IThrottler&MockObject $throttler;
 	private OCSAuthAPIController $ocsAuthApi;
 
 	/** @var int simulated timestamp */
@@ -91,7 +78,7 @@ class OCSAuthAPIControllerTest extends TestCase {
 
 		if ($ok) {
 			$this->jobList->expects($this->once())->method('add')
-				->with('OCA\Federation\BackgroundJob\GetSharedSecret', ['url' => $url, 'token' => $token, 'created' => $this->currentTime]);
+				->with(GetSharedSecret::class, ['url' => $url, 'token' => $token, 'created' => $this->currentTime]);
 		} else {
 			$this->jobList->expects($this->never())->method('add');
 			$this->jobList->expects($this->never())->method('remove');
@@ -111,7 +98,7 @@ class OCSAuthAPIControllerTest extends TestCase {
 		}
 	}
 
-	public function dataTestRequestSharedSecret() {
+	public static function dataTestRequestSharedSecret(): array {
 		return [
 			['token2', 'token1', true, true],
 			['token1', 'token2', false, false],
@@ -126,8 +113,8 @@ class OCSAuthAPIControllerTest extends TestCase {
 		$url = 'url';
 		$token = 'token';
 
-		/** @var OCSAuthAPIController | \PHPUnit\Framework\MockObject\MockObject $ocsAuthApi */
-		$ocsAuthApi = $this->getMockBuilder('OCA\Federation\Controller\OCSAuthAPIController')
+		/** @var OCSAuthAPIController&MockObject $ocsAuthApi */
+		$ocsAuthApi = $this->getMockBuilder(OCSAuthAPIController::class)
 			->setConstructorArgs(
 				[
 					'federation',
@@ -140,7 +127,9 @@ class OCSAuthAPIControllerTest extends TestCase {
 					$this->timeFactory,
 					$this->throttler
 				]
-			)->setMethods(['isValidToken'])->getMock();
+			)
+			->onlyMethods(['isValidToken'])
+			->getMock();
 
 		$this->trustedServers
 			->expects($this->any())
@@ -171,7 +160,7 @@ class OCSAuthAPIControllerTest extends TestCase {
 		}
 	}
 
-	public function dataTestGetSharedSecret() {
+	public static function dataTestGetSharedSecret(): array {
 		return [
 			[true, true, true],
 			[false, true, false],