1 files changed, 14 insertions, 18 deletions

diff --git a/tests/Core/Command/Config/ImportTest.php b/tests/Core/Command/Config/ImportTest.php
index 0077f84f82b..14cdd714d12 100644
--- a/tests/Core/Command/Config/ImportTest.php
+++ b/tests/Core/Command/Config/ImportTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -34,11 +35,11 @@ class ImportTest extends TestCase {
 		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
 		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
 
-		/** @var \OCP\IConfig $config */
+		/** @var IConfig $config */
 		$this->command = new Import($config);
 	}
 
-	public function validateAppsArrayData() {
+	public static function validateAppsArrayData(): array {
 		return [
 			[0],
 			[1],
@@ -49,16 +50,15 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider validateAppsArrayData
-	 *
 	 * @param mixed $configValue
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('validateAppsArrayData')]
 	public function testValidateAppsArray($configValue): void {
 		$this->invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]);
 		$this->assertTrue(true, 'Asserting that no exception is thrown');
 	}
 
-	public function validateAppsArrayThrowsData() {
+	public static function validateAppsArrayThrowsData(): array {
 		return [
 			[false],
 			[true],
@@ -68,10 +68,9 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider validateAppsArrayThrowsData
-	 *
 	 * @param mixed $configValue
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('validateAppsArrayThrowsData')]
 	public function testValidateAppsArrayThrows($configValue): void {
 		try {
 			$this->invokePrivate($this->command, 'validateAppsArray', [['app' => ['name' => $configValue]]]);
@@ -81,7 +80,7 @@ class ImportTest extends TestCase {
 		}
 	}
 
-	public function checkTypeRecursivelyData() {
+	public static function checkTypeRecursivelyData(): array {
 		return [
 			[0],
 			[1],
@@ -98,16 +97,15 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider checkTypeRecursivelyData
-	 *
 	 * @param mixed $configValue
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('checkTypeRecursivelyData')]
 	public function testCheckTypeRecursively($configValue): void {
 		$this->invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']);
 		$this->assertTrue(true, 'Asserting that no exception is thrown');
 	}
 
-	public function checkTypeRecursivelyThrowsData() {
+	public static function checkTypeRecursivelyThrowsData(): array {
 		return [
 			[new \Exception()],
 			[[new \Exception()]],
@@ -117,10 +115,9 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider checkTypeRecursivelyThrowsData
-	 *
 	 * @param mixed $configValue
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('checkTypeRecursivelyThrowsData')]
 	public function testCheckTypeRecursivelyThrows($configValue): void {
 		try {
 			$this->invokePrivate($this->command, 'checkTypeRecursively', [$configValue, 'name']);
@@ -130,7 +127,7 @@ class ImportTest extends TestCase {
 		}
 	}
 
-	public function validateArrayData() {
+	public static function validateArrayData(): array {
 		return [
 			[['system' => []]],
 			[['apps' => []]],
@@ -139,16 +136,15 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider validateArrayData
-	 *
 	 * @param array $configArray
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('validateArrayData')]
 	public function testValidateArray($configArray): void {
 		$this->invokePrivate($this->command, 'validateArray', [$configArray]);
 		$this->assertTrue(true, 'Asserting that no exception is thrown');
 	}
 
-	public function validateArrayThrowsData() {
+	public static function validateArrayThrowsData(): array {
 		return [
 			[[], 'At least one key of the following is expected:'],
 			[[0 => []], 'Found invalid entries in root'],
@@ -157,11 +153,11 @@ class ImportTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider validateArrayThrowsData
 	 *
 	 * @param mixed $configArray
 	 * @param string $expectedException
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('validateArrayThrowsData')]
 	public function testValidateArrayThrows($configArray, $expectedException): void {
 		try {
 			$this->invokePrivate($this->command, 'validateArray', [$configArray]);