1 files changed, 28 insertions, 49 deletions

diff --git a/apps/files/tests/Activity/Setting/GenericTest.php b/apps/files/tests/Activity/Setting/GenericTest.php
index 1cce876cbcf..df6b1e0f6d4 100644
--- a/apps/files/tests/Activity/Setting/GenericTest.php
+++ b/apps/files/tests/Activity/Setting/GenericTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -8,10 +10,11 @@ namespace OCA\Files\Tests\Activity\Setting;
 use OCA\Files\Activity\Settings\FavoriteAction;
 use OCA\Files\Activity\Settings\FileChanged;
 use OCP\Activity\ISetting;
+use OCP\Server;
 use Test\TestCase;
 
 class GenericTest extends TestCase {
-	public function dataSettings() {
+	public static function dataSettings(): array {
 		return [
 			[FavoriteAction::class],
 			[FileChanged::class],
@@ -19,85 +22,61 @@ class GenericTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testImplementsInterface($settingClass): void {
-		$setting = \OC::$server->query($settingClass);
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testImplementsInterface(string $settingClass): void {
+		$setting = Server::get($settingClass);
 		$this->assertInstanceOf(ISetting::class, $setting);
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testGetIdentifier($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testGetIdentifier(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsString($setting->getIdentifier());
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testGetName($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testGetName(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsString($setting->getName());
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testGetPriority($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testGetPriority(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$priority = $setting->getPriority();
 		$this->assertIsInt($setting->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testCanChangeStream($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testCanChangeStream(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->canChangeStream());
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testIsDefaultEnabledStream($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testIsDefaultEnabledStream(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->isDefaultEnabledStream());
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testCanChangeMail($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testCanChangeMail(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->canChangeMail());
 	}
 
-	/**
-	 * @dataProvider dataSettings
-	 * @param string $settingClass
-	 */
-	public function testIsDefaultEnabledMail($settingClass): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+	public function testIsDefaultEnabledMail(string $settingClass): void {
 		/** @var ISetting $setting */
-		$setting = \OC::$server->query($settingClass);
+		$setting = Server::get($settingClass);
 		$this->assertIsBool($setting->isDefaultEnabledMail());
 	}
 }