1 files changed, 18 insertions, 34 deletions

diff --git a/apps/user_ldap/tests/Jobs/CleanUpTest.php b/apps/user_ldap/tests/Jobs/CleanUpTest.php
index f70d65a6ea2..5a1e563a1e8 100644
--- a/apps/user_ldap/tests/Jobs/CleanUpTest.php
+++ b/apps/user_ldap/tests/Jobs/CleanUpTest.php
@@ -1,26 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\User_LDAP\Tests\Jobs;
 
@@ -29,20 +13,19 @@ use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\Jobs\CleanUp;
 use OCA\User_LDAP\User\DeletedUsersIndex;
 use OCA\User_LDAP\User_Proxy;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use Test\TestCase;
 
 class CleanUpTest extends TestCase {
-	/** @var CleanUp */
-	protected $bgJob;
-
-	/** @var array */
-	protected $mocks;
+	protected CleanUp $bgJob;
+	protected array $mocks;
 
 	public function setUp(): void {
+		parent::setUp();
 		$this->createMocks();
-		$this->bgJob = new CleanUp($this->mocks['userBackend'], $this->mocks['deletedUsersIndex']);
+		$this->bgJob = new CleanUp($this->mocks['timeFactory'], $this->mocks['userBackend'], $this->mocks['deletedUsersIndex']);
 		$this->bgJob->setArguments($this->mocks);
 	}
 
@@ -53,12 +36,13 @@ class CleanUpTest extends TestCase {
 		$this->mocks['ocConfig'] = $this->createMock(IConfig::class);
 		$this->mocks['db'] = $this->createMock(IDBConnection::class);
 		$this->mocks['helper'] = $this->createMock(Helper::class);
+		$this->mocks['timeFactory'] = $this->createMock(ITimeFactory::class);
 	}
 
 	/**
 	 * clean up job must not run when there are disabled configurations
 	 */
-	public function test_runNotAllowedByDisabledConfigurations() {
+	public function test_runNotAllowedByDisabledConfigurations(): void {
 		$this->mocks['helper']->expects($this->once())
 			->method('haveDisabledConfigurations')
 			->willReturn(true);
@@ -74,10 +58,10 @@ class CleanUpTest extends TestCase {
 	 * clean up job must not run when LDAP Helper is broken i.e.
 	 * returning unexpected results
 	 */
-	public function test_runNotAllowedByBrokenHelper() {
+	public function test_runNotAllowedByBrokenHelper(): void {
 		$this->mocks['helper']->expects($this->once())
 			->method('haveDisabledConfigurations')
-			->will($this->throwException(new Exception()));
+			->willThrowException(new Exception());
 
 		$this->mocks['ocConfig']->expects($this->never())
 			->method('getSystemValue');
@@ -89,7 +73,7 @@ class CleanUpTest extends TestCase {
 	/**
 	 * clean up job must not run when it is not enabled
 	 */
-	public function test_runNotAllowedBySysConfig() {
+	public function test_runNotAllowedBySysConfig(): void {
 		$this->mocks['helper']->expects($this->once())
 			->method('haveDisabledConfigurations')
 			->willReturn(false);
@@ -105,7 +89,7 @@ class CleanUpTest extends TestCase {
 	/**
 	 * clean up job is allowed to run
 	 */
-	public function test_runIsAllowed() {
+	public function test_runIsAllowed(): void {
 		$this->mocks['helper']->expects($this->once())
 			->method('haveDisabledConfigurations')
 			->willReturn(false);
@@ -121,7 +105,7 @@ class CleanUpTest extends TestCase {
 	/**
 	 * check whether offset will be reset when it needs to
 	 */
-	public function test_OffsetResetIsNecessary() {
+	public function test_OffsetResetIsNecessary(): void {
 		$result = $this->bgJob->isOffsetResetNecessary($this->bgJob->getChunkSize() - 1);
 		$this->assertSame(true, $result);
 	}
@@ -129,7 +113,7 @@ class CleanUpTest extends TestCase {
 	/**
 	 * make sure offset is not reset when it is not due
 	 */
-	public function test_OffsetResetIsNotNecessary() {
+	public function test_OffsetResetIsNotNecessary(): void {
 		$result = $this->bgJob->isOffsetResetNecessary($this->bgJob->getChunkSize());
 		$this->assertSame(false, $result);
 	}