1 files changed, 28 insertions, 36 deletions

diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index 3da2e2e15e4..943bdf352de 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -75,14 +76,9 @@ class GetSharedSecretTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider dataTestExecute
-	 *
-	 * @param bool $isTrustedServer
-	 * @param bool $retainBackgroundJob
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestExecute')]
 	public function testExecute(bool $isTrustedServer, bool $retainBackgroundJob): void {
-		/** @var GetSharedSecret |\PHPUnit\Framework\MockObject\MockObject $getSharedSecret */
+		/** @var GetSharedSecret&MockObject $getSharedSecret */
 		$getSharedSecret = $this->getMockBuilder(GetSharedSecret::class)
 			->setConstructorArgs(
 				[
@@ -95,8 +91,10 @@ class GetSharedSecretTest extends TestCase {
 					$this->timeFactory,
 					$this->config,
 				]
-			)->setMethods(['parentStart'])->getMock();
-		$this->invokePrivate($getSharedSecret, 'argument', [['url' => 'url', 'token' => 'token']]);
+			)
+			->onlyMethods(['parentStart'])
+			->getMock();
+		self::invokePrivate($getSharedSecret, 'argument', [['url' => 'url', 'token' => 'token']]);
 
 		$this->trustedServers->expects($this->once())->method('isTrustedServer')
 			->with('url')->willReturn($isTrustedServer);
@@ -105,7 +103,7 @@ class GetSharedSecretTest extends TestCase {
 		} else {
 			$getSharedSecret->expects($this->never())->method('parentStart');
 		}
-		$this->invokePrivate($getSharedSecret, 'retainJob', [$retainBackgroundJob]);
+		self::invokePrivate($getSharedSecret, 'retainJob', [$retainBackgroundJob]);
 		$this->jobList->expects($this->once())->method('remove');
 
 		$this->timeFactory->method('getTime')->willReturn(42);
@@ -128,7 +126,7 @@ class GetSharedSecretTest extends TestCase {
 		$getSharedSecret->start($this->jobList);
 	}
 
-	public function dataTestExecute() {
+	public static function dataTestExecute(): array {
 		return [
 			[true, true],
 			[true, false],
@@ -136,12 +134,8 @@ class GetSharedSecretTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataTestRun
-	 *
-	 * @param int $statusCode
-	 */
-	public function testRun($statusCode): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestRun')]
+	public function testRun(int $statusCode): void {
 		$target = 'targetURL';
 		$source = 'sourceURL';
 		$token = 'token';
@@ -157,12 +151,11 @@ class GetSharedSecretTest extends TestCase {
 			->with(
 				$target . '/ocs/v2.php/apps/federation/api/v1/shared-secret',
 				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token,
-							'format' => 'json',
-						],
+					'query' => [
+						'url' => $source,
+						'token' => $token,
+						'format' => 'json',
+					],
 					'timeout' => 3,
 					'connect_timeout' => 3,
 					'verify' => true,
@@ -181,18 +174,18 @@ class GetSharedSecretTest extends TestCase {
 			$this->trustedServers->expects($this->never())->method('addSharedSecret');
 		}
 
-		$this->invokePrivate($this->getSharedSecret, 'run', [$argument]);
+		self::invokePrivate($this->getSharedSecret, 'run', [$argument]);
 		if (
 			$statusCode !== Http::STATUS_OK
 			&& $statusCode !== Http::STATUS_FORBIDDEN
 		) {
-			$this->assertTrue($this->invokePrivate($this->getSharedSecret, 'retainJob'));
+			$this->assertTrue(self::invokePrivate($this->getSharedSecret, 'retainJob'));
 		} else {
-			$this->assertFalse($this->invokePrivate($this->getSharedSecret, 'retainJob'));
+			$this->assertFalse(self::invokePrivate($this->getSharedSecret, 'retainJob'));
 		}
 	}
 
-	public function dataTestRun() {
+	public static function dataTestRun(): array {
 		return [
 			[Http::STATUS_OK],
 			[Http::STATUS_FORBIDDEN],
@@ -227,7 +220,7 @@ class GetSharedSecretTest extends TestCase {
 				TrustedServers::STATUS_FAILURE
 			);
 
-		$this->invokePrivate($this->getSharedSecret, 'run', [$argument]);
+		self::invokePrivate($this->getSharedSecret, 'run', [$argument]);
 	}
 
 	public function testRunConnectionError(): void {
@@ -249,12 +242,11 @@ class GetSharedSecretTest extends TestCase {
 			->with(
 				$target . '/ocs/v2.php/apps/federation/api/v1/shared-secret',
 				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token,
-							'format' => 'json',
-						],
+					'query' => [
+						'url' => $source,
+						'token' => $token,
+						'format' => 'json',
+					],
 					'timeout' => 3,
 					'connect_timeout' => 3,
 					'verify' => true,
@@ -263,8 +255,8 @@ class GetSharedSecretTest extends TestCase {
 
 		$this->trustedServers->expects($this->never())->method('addSharedSecret');
 
-		$this->invokePrivate($this->getSharedSecret, 'run', [$argument]);
+		self::invokePrivate($this->getSharedSecret, 'run', [$argument]);
 
-		$this->assertTrue($this->invokePrivate($this->getSharedSecret, 'retainJob'));
+		$this->assertTrue(self::invokePrivate($this->getSharedSecret, 'retainJob'));
 	}
 }