1 files changed, 123 insertions, 113 deletions

diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index c5c056c7031..0c900f6edf7 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -1,93 +1,55 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Federation\Tests;
 
+use OCA\Federation\BackgroundJob\RequestSharedSecret;
 use OCA\Federation\DbHandler;
 use OCA\Federation\TrustedServers;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Federation\Events\TrustedServerRemovedEvent;
+use OCP\HintException;
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
 use OCP\IConfig;
 use OCP\Security\ISecureRandom;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class TrustedServersTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */
-	private $trustedServers;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | DbHandler */
-	private $dbHandler;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */
-	private $httpClientService;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | IClient */
-	private $httpClient;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | IResponse */
-	private $response;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | LoggerInterface */
-	private $logger;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | IJobList */
-	private $jobList;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | ISecureRandom */
-	private $secureRandom;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | IConfig */
-	private $config;
-
-	/** @var  \PHPUnit\Framework\MockObject\MockObject | IEventDispatcher */
-	private $dispatcher;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
-	private $timeFactory;
+	private TrustedServers $trustedServers;
+	private DbHandler&MockObject $dbHandler;
+	private IClientService&MockObject $httpClientService;
+	private IClient&MockObject $httpClient;
+	private IResponse&MockObject $response;
+	private LoggerInterface&MockObject $logger;
+	private IJobList&MockObject $jobList;
+	private ISecureRandom&MockObject $secureRandom;
+	private IConfig&MockObject $config;
+	private IEventDispatcher&MockObject $dispatcher;
+	private ITimeFactory&MockObject $timeFactory;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->dbHandler = $this->getMockBuilder(DbHandler::class)
-			->disableOriginalConstructor()->getMock();
-		$this->dispatcher = $this->getMockBuilder(IEventDispatcher::class)
-			->disableOriginalConstructor()->getMock();
-		$this->httpClientService = $this->getMockBuilder(IClientService::class)->getMock();
-		$this->httpClient = $this->getMockBuilder(IClient::class)->getMock();
-		$this->response = $this->getMockBuilder(IResponse::class)->getMock();
-		$this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
-		$this->jobList = $this->getMockBuilder(IJobList::class)->getMock();
-		$this->secureRandom = $this->getMockBuilder(ISecureRandom::class)->getMock();
-		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
+		$this->dbHandler = $this->createMock(DbHandler::class);
+		$this->dispatcher = $this->createMock(IEventDispatcher::class);
+		$this->httpClientService = $this->createMock(IClientService::class);
+		$this->httpClient = $this->createMock(IClient::class);
+		$this->response = $this->createMock(IResponse::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->jobList = $this->createMock(IJobList::class);
+		$this->secureRandom = $this->createMock(ISecureRandom::class);
+		$this->config = $this->createMock(IConfig::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 
 		$this->trustedServers = new TrustedServers(
@@ -103,8 +65,8 @@ class TrustedServersTest extends TestCase {
 	}
 
 	public function testAddServer(): void {
-		/** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers $trustedServers */
-		$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
+		/** @var TrustedServers&MockObject $trustedServers */
+		$trustedServers = $this->getMockBuilder(TrustedServers::class)
 			->setConstructorArgs(
 				[
 					$this->dbHandler,
@@ -117,10 +79,10 @@ class TrustedServersTest extends TestCase {
 					$this->timeFactory
 				]
 			)
-			->setMethods(['normalizeUrl', 'updateProtocol'])
+			->onlyMethods(['updateProtocol'])
 			->getMock();
 		$trustedServers->expects($this->once())->method('updateProtocol')
-				->with('url')->willReturn('https://url');
+			->with('url')->willReturn('https://url');
 		$this->timeFactory->method('getTime')
 			->willReturn(1234567);
 		$this->dbHandler->expects($this->once())->method('addServer')->with('https://url')
@@ -130,12 +92,12 @@ class TrustedServersTest extends TestCase {
 			->willReturn('token');
 		$this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token');
 		$this->jobList->expects($this->once())->method('add')
-			->with('OCA\Federation\BackgroundJob\RequestSharedSecret',
+			->with(RequestSharedSecret::class,
 				['url' => 'https://url', 'token' => 'token', 'created' => 1234567]);
 
 		$this->assertSame(
-			$trustedServers->addServer('url'),
-			1
+			1,
+			$trustedServers->addServer('url')
 		);
 	}
 
@@ -147,9 +109,9 @@ class TrustedServersTest extends TestCase {
 
 	public function testGetSharedSecret(): void {
 		$this->dbHandler->expects($this->once())
-				->method('getSharedSecret')
-				->with('url')
-				->willReturn('secret');
+			->method('getSharedSecret')
+			->with('url')
+			->willReturn('secret');
 		$this->assertSame(
 			$this->trustedServers->getSharedSecret('url'),
 			'secret'
@@ -164,8 +126,8 @@ class TrustedServersTest extends TestCase {
 			->willReturn($server);
 		$this->dispatcher->expects($this->once())->method('dispatchTyped')
 			->willReturnCallback(
-				function ($event) {
-					$this->assertSame(get_class($event), \OCP\Federation\Events\TrustedServerRemovedEvent::class);
+				function ($event): void {
+					$this->assertSame(get_class($event), TrustedServerRemovedEvent::class);
 					/** @var \OCP\Federated\Events\TrustedServerRemovedEvent $event */
 					$this->assertSame('url_hash', $event->getUrlHash());
 				}
@@ -182,6 +144,64 @@ class TrustedServersTest extends TestCase {
 		);
 	}
 
+	public static function dataTestGetServer() {
+		return [
+			[
+				15,
+				[
+					'id' => 15,
+					'otherData' => 'first server',
+				]
+			],
+			[
+				16,
+				[
+					'id' => 16,
+					'otherData' => 'second server',
+				]
+			],
+			[
+				42,
+				[
+					'id' => 42,
+					'otherData' => 'last server',
+				]
+			],
+			[
+				108,
+				null
+			],
+		];
+	}
+
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetServer')]
+	public function testGetServer(int $id, ?array $expectedServer): void {
+		$servers = [
+			[
+				'id' => 15,
+				'otherData' => 'first server',
+			],
+			[
+				'id' => 16,
+				'otherData' => 'second server',
+			],
+			[
+				'id' => 42,
+				'otherData' => 'last server',
+			],
+		];
+		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);
+
+		if ($expectedServer === null) {
+			$this->expectException(\Exception::class);
+			$this->expectExceptionMessage('No server found with ID: ' . $id);
+		}
+
+		$this->assertEquals(
+			$expectedServer,
+			$this->trustedServers->getServer($id)
+		);
+	}
 
 	public function testIsTrustedServer(): void {
 		$this->dbHandler->expects($this->once())
@@ -193,13 +213,13 @@ class TrustedServersTest extends TestCase {
 		);
 	}
 
-	public function testSetServerStatus() {
+	public function testSetServerStatus(): void {
 		$this->dbHandler->expects($this->once())->method('setServerStatus')
 			->with('url', 1);
 		$this->trustedServers->setServerStatus('url', 1);
 	}
 
-	public function testGetServerStatus() {
+	public function testGetServerStatus(): void {
 		$this->dbHandler->expects($this->once())->method('getServerStatus')
 			->with('url')->willReturn(1);
 		$this->assertSame(
@@ -208,14 +228,12 @@ class TrustedServersTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider dataTestIsNextcloudServer
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsNextcloudServer')]
 	public function testIsNextcloudServer(int $statusCode, bool $isValidNextcloudVersion, bool $expected): void {
 		$server = 'server1';
 
-		/** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers $trustedServers */
-		$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
+		/** @var TrustedServers&MockObject $trustedServers */
+		$trustedServers = $this->getMockBuilder(TrustedServers::class)
 			->setConstructorArgs(
 				[
 					$this->dbHandler,
@@ -228,7 +246,7 @@ class TrustedServersTest extends TestCase {
 					$this->timeFactory
 				]
 			)
-			->setMethods(['checkNextcloudVersion'])
+			->onlyMethods(['checkNextcloudVersion'])
 			->getMock();
 
 		$this->httpClientService->expects($this->once())->method('newClient')
@@ -254,7 +272,7 @@ class TrustedServersTest extends TestCase {
 		);
 	}
 
-	public function dataTestIsNextcloudServer(): array {
+	public static function dataTestIsNextcloudServer(): array {
 		return [
 			[200, true, true],
 			[200, false, false],
@@ -262,63 +280,55 @@ class TrustedServersTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedExceptionMessage simulated exception
-	 */
 	public function testIsNextcloudServerFail(): void {
 		$server = 'server1';
 
-		$this->httpClientService->expects($this->once())->method('newClient')
+		$this->httpClientService->expects($this->once())
+			->method('newClient')
 			->willReturn($this->httpClient);
 
-		$this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
-			->willReturnCallback(function () {
-				throw new \Exception('simulated exception');
-			});
+		$this->httpClient->expects($this->once())
+			->method('get')
+			->with($server . '/status.php')
+			->willThrowException(new \Exception('simulated exception'));
 
 		$this->assertFalse($this->trustedServers->isNextcloudServer($server));
 	}
 
-	/**
-	 * @dataProvider dataTestCheckNextcloudVersion
-	 */
-	public function testCheckNextcloudVersion($status): void {
-		$this->assertTrue($this->invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersion')]
+	public function testCheckNextcloudVersion(string $status): void {
+		$this->assertTrue(self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
 	}
 
-	public function dataTestCheckNextcloudVersion(): array {
+	public static function dataTestCheckNextcloudVersion(): array {
 		return [
 			['{"version":"9.0.0"}'],
 			['{"version":"9.1.0"}']
 		];
 	}
 
-	/**
-	 * @dataProvider dataTestCheckNextcloudVersionTooLow
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersionTooLow')]
 	public function testCheckNextcloudVersionTooLow(string $status): void {
-		$this->expectException(\OCP\HintException::class);
+		$this->expectException(HintException::class);
 		$this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
 
-		$this->invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
+		self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
 	}
 
-	public function dataTestCheckNextcloudVersionTooLow(): array {
+	public static function dataTestCheckNextcloudVersionTooLow(): array {
 		return [
 			['{"version":"8.2.3"}'],
 		];
 	}
 
-	/**
-	 * @dataProvider dataTestUpdateProtocol
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdateProtocol')]
 	public function testUpdateProtocol(string $url, string $expected): void {
 		$this->assertSame($expected,
-			$this->invokePrivate($this->trustedServers, 'updateProtocol', [$url])
+			self::invokePrivate($this->trustedServers, 'updateProtocol', [$url])
 		);
 	}
 
-	public function dataTestUpdateProtocol(): array {
+	public static function dataTestUpdateProtocol(): array {
 		return [
 			['http://owncloud.org', 'http://owncloud.org'],
 			['https://owncloud.org', 'https://owncloud.org'],