1 files changed, 11 insertions, 18 deletions

diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
index 1545085f977..43203d489e6 100644
--- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
+++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,27 +11,19 @@ use OC\Avatar\AvatarManager;
 use OC\Repair\ClearGeneratedAvatarCache;
 use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
-use OCP\Migration\IOutput;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ClearGeneratedAvatarCacheTest extends \Test\TestCase {
-	/** @var AvatarManager */
-	private $avatarManager;
-
-	/** @var IOutput */
-	private $outputMock;
-
-	/** @var IConfig */
-	private $config;
 
-	/** @var IJobList */
-	private $jobList;
+	private AvatarManager&MockObject $avatarManager;
+	private IConfig&MockObject $config;
+	private IJobList&MockObject $jobList;
 
 	protected ClearGeneratedAvatarCache $repair;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->outputMock = $this->createMock(IOutput::class);
 		$this->avatarManager = $this->createMock(AvatarManager::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->jobList = $this->createMock(IJobList::class);
@@ -38,7 +31,7 @@ class ClearGeneratedAvatarCacheTest extends \Test\TestCase {
 		$this->repair = new ClearGeneratedAvatarCache($this->config, $this->avatarManager, $this->jobList);
 	}
 
-	public function shouldRunDataProvider() {
+	public static function shouldRunDataProvider(): array {
 		return [
 			['11.0.0.0', true],
 			['15.0.0.3', true],
@@ -52,16 +45,16 @@ class ClearGeneratedAvatarCacheTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider shouldRunDataProvider
 	 *
 	 * @param string $from
 	 * @param boolean $expected
 	 */
-	public function testShouldRun($from, $expected) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('shouldRunDataProvider')]
+	public function testShouldRun($from, $expected): void {
 		$this->config->expects($this->any())
-			   ->method('getSystemValueString')
-			   ->with('version', '0.0.0.0')
-			   ->willReturn($from);
+			->method('getSystemValueString')
+			->with('version', '0.0.0.0')
+			->willReturn($from);
 
 		$this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun'));
 	}