1 files changed, 19 insertions, 40 deletions

diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
index c721d174916..43203d489e6 100644
--- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
+++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
@@ -1,81 +1,60 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\Repair;
 
 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;
+	private AvatarManager&MockObject $avatarManager;
+	private IConfig&MockObject $config;
+	private IJobList&MockObject $jobList;
 
-	/** @var ClearGeneratedAvatarCache */
-	protected $repair;
+	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);
 
-		$this->repair = new ClearGeneratedAvatarCache($this->config, $this->avatarManager);
+		$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],
 			['13.0.5.2', true],
 			['12.0.0.0', true],
-			['16.0.0.1', false],
+			['26.0.0.1', true],
 			['15.0.0.2', true],
 			['13.0.0.0', true],
-			['15.0.0.5', false]
+			['27.0.0.5', false]
 		];
 	}
 
 	/**
-	 * @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('getSystemValue')
-			   ->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'));
 	}