test: Finish migrating tests/Core/ to PHPUnit 10 compatible code

tests/Core/Command/Apps/AppsDisableTest.php

@@ -50,7 +50,7 @@ public function testCommandInput($appId, $statusCode, $pattern): void {
 		$this->assertSame($statusCode, $this->commandTester->getStatusCode());
 	}
 
-	public function dataCommandInput(): array {
+	public static function dataCommandInput(): array {
 		return [
 			[['admin_audit'], 0, 'admin_audit ([\d\.]*) disabled'],
 			[['comments'], 0, 'comments ([\d\.]*) disabled'],

tests/Core/Command/Apps/AppsEnableTest.php

@@ -57,7 +57,7 @@ public function testCommandInput($appId, $groups, $statusCode, $pattern): void {
 		$this->assertSame($statusCode, $this->commandTester->getStatusCode());
 	}
 
-	public function dataCommandInput(): array {
+	public static function dataCommandInput(): array {
 		return [
 			[['admin_audit'], null, 0, 'admin_audit ([\d\.]*) enabled'],
 			[['comments'], null, 0, 'comments ([\d\.]*) enabled'],

tests/Core/Command/Config/ImportTest.php

@@ -38,7 +38,7 @@ protected function setUp(): void {
 		$this->command = new Import($config);
 	}
 
-	public function validateAppsArrayData() {
+	public static function validateAppsArrayData(): array {
 		return [
 			[0],
 			[1],
@@ -58,7 +58,7 @@ public function testValidateAppsArray($configValue): void {
 		$this->assertTrue(true, 'Asserting that no exception is thrown');
 	}
 
-	public function validateAppsArrayThrowsData() {
+	public static function validateAppsArrayThrowsData(): array {
 		return [
 			[false],
 			[true],
@@ -81,7 +81,7 @@ public function testValidateAppsArrayThrows($configValue): void {
 		}
 	}
 
-	public function checkTypeRecursivelyData() {
+	public static function checkTypeRecursivelyData(): array {
 		return [
 			[0],
 			[1],
@@ -107,7 +107,7 @@ public function testCheckTypeRecursively($configValue): void {
 		$this->assertTrue(true, 'Asserting that no exception is thrown');
 	}
 
-	public function checkTypeRecursivelyThrowsData() {
+	public static function checkTypeRecursivelyThrowsData(): array {
 		return [
 			[new \Exception()],
 			[[new \Exception()]],
@@ -130,7 +130,7 @@ public function testCheckTypeRecursivelyThrows($configValue): void {
 		}
 	}
 
-	public function validateArrayData() {
+	public static function validateArrayData(): array {
 		return [
 			[['system' => []]],
 			[['apps' => []]],
@@ -148,7 +148,7 @@ public function testValidateArray($configArray): void {
 		$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'],

tests/Core/Command/Config/ListConfigsTest.php

@@ -46,7 +46,7 @@ protected function setUp(): void {
 		$this->command = new ListConfigs($systemConfig, $appConfig);
 	}
 
-	public function listData() {
+	public static function listData(): array {
 		return [
 			[
 				'all',

tests/Core/Command/Config/System/DeleteConfigTest.php

@@ -38,7 +38,7 @@ protected function setUp(): void {
 		$this->command = new DeleteConfig($systemConfig);
 	}
 
-	public function deleteData() {
+	public static function deleteData(): array {
 		return [
 			[
 				'name1',
@@ -105,7 +105,7 @@ public function testDelete($configName, $configExists, $checkIfExists, $expected
 		$this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
 	}
 
-	public function deleteArrayData() {
+	public static function deleteArrayData(): array {
 		return [
 			[
 				['name', 'sub'],

tests/Core/Command/Config/System/GetConfigTest.php

@@ -39,7 +39,7 @@ protected function setUp(): void {
 	}
 
 
-	public function getData() {
+	public static function getData(): array {
 		return [
 			// String output as json
 			['name', 'newvalue', true, null, false, 'json', 0, json_encode('newvalue')],

tests/Core/Command/Config/System/SetConfigTest.php

@@ -76,7 +76,7 @@ public function testSet($configNames, $newValue, $existingData, $expectedValue):
 		$this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	public function setUpdateOnlyProvider() {
+	public static function setUpdateOnlyProvider(): array {
 		return [
 			[['name'], null],
 			[['a', 'b', 'c'], null],
@@ -113,7 +113,7 @@ public function testSetUpdateOnly($configNames, $existingData): void {
 		$this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	public function castValueProvider() {
+	public static function castValueProvider(): array {
 		return [
 			[null, 'string', ['value' => '', 'readable-value' => 'empty string']],
 
@@ -141,7 +141,7 @@ public function testCastValue($value, $type, $expectedValue): void {
 		);
 	}
 
-	public function castValueInvalidProvider() {
+	public static function castValueInvalidProvider(): array {
 		return [
 			['123', 'foobar'],
 

tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php

@@ -89,7 +89,7 @@ public function testExecute($newRoot, $answer, $successMoveKey): void {
 					$this->util,
 					$this->questionHelper
 				]
-			)->setMethods(['moveAllKeys'])->getMock();
+			)->onlyMethods(['moveAllKeys'])->getMock();
 
 		$this->util->expects($this->once())->method('getKeyStorageRoot')
 			->willReturn('');
@@ -122,7 +122,7 @@ public function testExecute($newRoot, $answer, $successMoveKey): void {
 		);
 	}
 
-	public function dataTestExecute() {
+	public static function dataTestExecute(): array {
 		return [
 			[null, true, true],
 			[null, true, false],
@@ -143,7 +143,7 @@ public function testMoveAllKeys(): void {
 					$this->util,
 					$this->questionHelper
 				]
-			)->setMethods(['prepareNewRoot', 'moveSystemKeys', 'moveUserKeys'])->getMock();
+			)->onlyMethods(['prepareNewRoot', 'moveSystemKeys', 'moveUserKeys'])->getMock();
 
 		$changeKeyStorageRoot->expects($this->once())->method('prepareNewRoot')->with('newRoot');
 		$changeKeyStorageRoot->expects($this->once())->method('moveSystemKeys')->with('oldRoot', 'newRoot');
@@ -179,7 +179,7 @@ public function testPrepareNewRootException($dirExists, $couldCreateFile): void
 		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
 	}
 
-	public function dataTestPrepareNewRootException() {
+	public static function dataTestPrepareNewRootException(): array {
 		return [
 			[true, false],
 			[true, null],
@@ -204,7 +204,7 @@ public function testMoveSystemKeys($dirExists, $targetExists, $executeRename): v
 					$this->util,
 					$this->questionHelper
 				]
-			)->setMethods(['targetExists'])->getMock();
+			)->onlyMethods(['targetExists'])->getMock();
 
 		$this->view->expects($this->once())->method('is_dir')
 			->with('oldRoot/files_encryption')->willReturn($dirExists);
@@ -221,7 +221,7 @@ public function testMoveSystemKeys($dirExists, $targetExists, $executeRename): v
 		$this->invokePrivate($changeKeyStorageRoot, 'moveSystemKeys', ['oldRoot', 'newRoot']);
 	}
 
-	public function dataTestMoveSystemKeys() {
+	public static function dataTestMoveSystemKeys(): array {
 		return [
 			[true, false, true],
 			[false, true, false],
@@ -241,7 +241,7 @@ public function testMoveUserKeys(): void {
 					$this->util,
 					$this->questionHelper
 				]
-			)->setMethods(['setupUserFS', 'moveUserEncryptionFolder'])->getMock();
+			)->onlyMethods(['setupUserFS', 'moveUserEncryptionFolder'])->getMock();
 
 		$this->userManager->expects($this->once())->method('getBackends')
 			->willReturn([$this->userInterface]);
@@ -271,7 +271,7 @@ public function testMoveUserEncryptionFolder($userExists, $isDir, $targetExists,
 					$this->util,
 					$this->questionHelper
 				]
-			)->setMethods(['targetExists', 'prepareParentFolder'])->getMock();
+			)->onlyMethods(['targetExists', 'prepareParentFolder'])->getMock();
 
 		$this->userManager->expects($this->once())->method('userExists')
 			->willReturn($userExists);
@@ -293,7 +293,7 @@ public function testMoveUserEncryptionFolder($userExists, $isDir, $targetExists,
 		$this->invokePrivate($changeKeyStorageRoot, 'moveUserEncryptionFolder', ['user1', 'oldRoot', 'newRoot']);
 	}
 
-	public function dataTestMoveUserEncryptionFolder() {
+	public static function dataTestMoveUserEncryptionFolder(): array {
 		return [
 			[true, true, false, true],
 			[true, false, true, false],
@@ -334,7 +334,7 @@ function ($fileExistsPath) use ($path, $pathExists) {
 		);
 	}
 
-	public function dataTestPrepareParentFolder() {
+	public static function dataTestPrepareParentFolder(): array {
 		return [
 			['/user/folder/sub_folder/keystorage', true],
 			['/user/folder/sub_folder/keystorage', false]

tests/Core/Command/Encryption/DecryptAllTest.php

@@ -73,12 +73,16 @@ protected function setUp(): void {
 	public function testMaintenanceAndTrashbin(): void {
 		// on construct we enable single-user-mode and disable the trash bin
 		// on destruct we disable single-user-mode again and enable the trash bin
+		$calls = [
+			['maintenance', true],
+			['maintenance', false],
+		];
 		$this->config->expects($this->exactly(2))
 			->method('setSystemValue')
-			->withConsecutive(
-				['maintenance', true],
-				['maintenance', false],
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 		$this->appManager->expects($this->once())
 			->method('disableApp')
 			->with('files_trashbin');
@@ -127,12 +131,16 @@ public function testExecute($encryptionEnabled, $continue): void {
 			->willReturn('user1');
 
 		if ($encryptionEnabled) {
+			$calls = [
+				['core', 'encryption_enabled', 'no'],
+				['core', 'encryption_enabled', 'yes'],
+			];
 			$this->config->expects($this->exactly(2))
 				->method('setAppValue')
-				->withConsecutive(
-					['core', 'encryption_enabled', 'no'],
-					['core', 'encryption_enabled', 'yes'],
-				);
+				->willReturnCallback(function () use (&$calls) {
+					$expected = array_shift($calls);
+					$this->assertEquals($expected, func_get_args());
+				});
 			$this->questionHelper->expects($this->once())
 				->method('ask')
 				->willReturn($continue);
@@ -152,7 +160,7 @@ public function testExecute($encryptionEnabled, $continue): void {
 		$this->invokePrivate($instance, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	public function dataTestExecute() {
+	public static function dataTestExecute(): array {
 		return [
 			[true, true],
 			[true, false],
@@ -174,13 +182,16 @@ public function testExecuteFailure(): void {
 		);
 
 		// make sure that we enable encryption again after a exception was thrown
+		$calls = [
+			['core', 'encryption_enabled', 'no'],
+			['core', 'encryption_enabled', 'yes'],
+		];
 		$this->config->expects($this->exactly(2))
 			->method('setAppValue')
-			->withConsecutive(
-				['core', 'encryption_enabled', 'no'],
-				['core', 'encryption_enabled', 'yes'],
-			);
-
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 		$this->encryptionManager->expects($this->once())
 			->method('isEnabled')
 			->willReturn(true);

tests/Core/Command/Encryption/DisableTest.php

@@ -38,7 +38,7 @@ protected function setUp(): void {
 	}
 
 
-	public function dataDisable() {
+	public static function dataDisable(): array {
 		return [
 			['yes', true, 'Encryption disabled'],
 			['no', false, 'Encryption is already disabled'],

tests/Core/Command/Encryption/EncryptAllTest.php

@@ -99,7 +99,7 @@ public function testExecute($answer, $askResult): void {
 		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	public function dataTestExecute() {
+	public static function dataTestExecute(): array {
 		return [
 			['y', true], ['Y', true], ['n', false], ['N', false], ['', false]
 		];

tests/Core/Command/Encryption/SetDefaultModuleTest.php

@@ -43,7 +43,7 @@ protected function setUp(): void {
 	}
 
 
-	public function dataSetDefaultModule() {
+	public static function dataSetDefaultModule(): array {
 		return [
 			['ID0', 'ID0', null, null, 'already'],
 			['ID0', 'ID1', 'ID1', true, 'info'],
@@ -113,12 +113,16 @@ public function testMaintenanceMode($oldModule, $newModule, $updateModule, $upda
 			->with('maintenance', false)
 			->willReturn(true);
 
+		$calls = [
+			'Maintenance mode must be disabled when setting default module,',
+			'in order to load the relevant encryption modules correctly.',
+		];
 		$this->consoleOutput->expects($this->exactly(2))
 			->method('writeln')
-			->withConsecutive(
-				[$this->stringContains('Maintenance mode must be disabled when setting default module,')],
-				[$this->stringContains('in order to load the relevant encryption modules correctly.')],
-			);
+			->willReturnCallback(function ($message) use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertStringContainsString($expected, $message);
+			});
 
 		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}

tests/Core/Command/Group/InfoTest.php

@@ -32,7 +32,7 @@ protected function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->command = $this->getMockBuilder(Info::class)
 			->setConstructorArgs([$this->groupManager])
-			->setMethods(['writeArrayInOutputFormat'])
+			->onlyMethods(['writeArrayInOutputFormat'])
 			->getMock();
 
 		$this->input = $this->createMock(InputInterface::class);

tests/Core/Command/Group/ListCommandTest.php

@@ -33,7 +33,7 @@ protected function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->command = $this->getMockBuilder(ListCommand::class)
 			->setConstructorArgs([$this->groupManager])
-			->setMethods(['writeArrayInOutputFormat'])
+			->onlyMethods(['writeArrayInOutputFormat'])
 			->getMock();
 
 		$this->input = $this->createMock(InputInterface::class);