2 files changed, 33 insertions, 33 deletions

diff --git a/tests/Core/Command/Log/FileTest.php b/tests/Core/Command/Log/FileTest.php
index 9c7e0297d53..1aaf398b875 100644
--- a/tests/Core/Command/Log/FileTest.php
+++ b/tests/Core/Command/Log/FileTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -62,7 +63,7 @@ class FileTest extends TestCase {
 		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	public function changeRotateSizeProvider() {
+	public static function changeRotateSizeProvider(): array {
 		return [
 			['42', 42],
 			['0', 0],
@@ -71,9 +72,7 @@ class FileTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider changeRotateSizeProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('changeRotateSizeProvider')]
 	public function testChangeRotateSize($optionValue, $configValue): void {
 		$this->config->method('getSystemValue')->willReturnArgument(1);
 		$this->consoleInput->method('getOption')
@@ -96,13 +95,17 @@ class FileTest extends TestCase {
 				['log_rotate_size', 100 * 1024 * 1024, 5 * 1024 * 1024],
 			]);
 
+		$calls = [
+			['Log backend file: disabled'],
+			['Log file: /var/log/nextcloud.log'],
+			['Rotate at: 5 MB'],
+		];
 		$this->consoleOutput->expects($this->exactly(3))
 			->method('writeln')
-			->withConsecutive(
-				['Log backend file: disabled'],
-				['Log file: /var/log/nextcloud.log'],
-				['Rotate at: 5 MB'],
-			);
+			->willReturnCallback(function (string $message) use (&$calls): void {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected[0], $message);
+			});
 
 		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/Core/Command/Log/ManageTest.php
index b354bb17076..8b307048719 100644
--- a/tests/Core/Command/Log/ManageTest.php
+++ b/tests/Core/Command/Log/ManageTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -87,7 +88,7 @@ class ManageTest extends TestCase {
 		self::invokePrivate($this->command, 'validateTimezone', ['Mars/OlympusMons']);
 	}
 
-	public function convertLevelStringProvider() {
+	public static function dataConvertLevelString(): array {
 		return [
 			['dEbug', 0],
 			['inFO', 1],
@@ -99,10 +100,8 @@ class ManageTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider convertLevelStringProvider
-	 */
-	public function testConvertLevelString($levelString, $expectedInt): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataConvertLevelString')]
+	public function testConvertLevelString(string $levelString, int $expectedInt): void {
 		$this->assertEquals($expectedInt,
 			self::invokePrivate($this->command, 'convertLevelString', [$levelString])
 		);
@@ -115,7 +114,7 @@ class ManageTest extends TestCase {
 		self::invokePrivate($this->command, 'convertLevelString', ['abc']);
 	}
 
-	public function convertLevelNumberProvider() {
+	public static function dataConvertLevelNumber(): array {
 		return [
 			[0, 'Debug'],
 			[1, 'Info'],
@@ -125,10 +124,8 @@ class ManageTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider convertLevelNumberProvider
-	 */
-	public function testConvertLevelNumber($levelNum, $expectedString): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataConvertLevelNumber')]
+	public function testConvertLevelNumber(int $levelNum, string $expectedString): void {
 		$this->assertEquals($expectedString,
 			self::invokePrivate($this->command, 'convertLevelNumber', [$levelNum])
 		);
@@ -144,23 +141,23 @@ class ManageTest extends TestCase {
 	public function testGetConfiguration(): void {
 		$this->config->expects($this->exactly(3))
 			->method('getSystemValue')
-			->withConsecutive(
-				['log_type', 'file'],
-				['loglevel', 2],
-				['logtimezone', 'UTC'],
-			)->willReturnOnConsecutiveCalls(
-				'log_type_value',
-				0,
-				'logtimezone_value'
-			);
+			->willReturnMap([
+				['log_type', 'file', 'log_type_value'],
+				['loglevel', 2, 0],
+				['logtimezone', 'UTC', 'logtimezone_value'],
+			]);
 
+		$calls = [
+			['Enabled logging backend: log_type_value'],
+			['Log level: Debug (0)'],
+			['Log timezone: logtimezone_value'],
+		];
 		$this->consoleOutput->expects($this->exactly(3))
 			->method('writeln')
-			->withConsecutive(
-				['Enabled logging backend: log_type_value'],
-				['Log level: Debug (0)'],
-				['Log timezone: logtimezone_value'],
-			);
+			->willReturnCallback(function (string $message) use (&$calls): void {
+				$call = array_shift($calls);
+				$this->assertStringContainsString($call[0], $message);
+			});
 
 		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}