refactor: adjust updater code to match code style

Co-authored-by: Joas Schilling <[email protected]>

Signed-off-by: Ferdinand Thiessen <[email protected]>

Signed-off-by: Louis Chmn <[email protected]>

[skip ci]

Author: artonge

apps/updatenotification/lib/BackgroundJob/ResetToken.php

@@ -43,8 +43,8 @@ protected function run($argument) {
 			return;
 		}
 
-		$secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created', $this->time->getTime());
-		// Delete old tokens after 2 days
+		$secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created');
+		// Delete old tokens after 2 days and also tokens without any created date
 		$secretCreatedDiff = $this->time->getTime() - $secretCreated;
 		if ($secretCreatedDiff >= 172800) {
 			$this->config->deleteSystemValue('updater.secret');

apps/updatenotification/tests/BackgroundJob/ResetTokenTest.php

@@ -36,15 +36,18 @@ protected function setUp(): void {
 		);
 	}
 
-	public function testRunWithNotExpiredToken(): void { // Affirm if updater.secret.created <48 hours ago then `updater.secret` is left alone
+	/**
+	 * Affirm if updater.secret.created <48 hours ago then `updater.secret` is left alone.
+	 */
+	public function testKeepSecretWhenCreatedRecently(): void {
 		$this->timeFactory
 			->expects($this->atLeastOnce())
 			->method('getTime')
 			->willReturn(1733069649); // "Sun, 01 Dec 2024 16:14:09 +0000"
 		$this->appConfig
 			->expects($this->once())
 			->method('getValueInt')
-			->with('core', 'updater.secret.created', 1733069649)
+			->with('core', 'updater.secret.created')
 			->willReturn(1733069649 - 1 * 24 * 60 * 60); // 24h prior: "Sat, 30 Nov 2024 16:14:09 +0000"
 		$this->config
 			->expects($this->once())
@@ -64,18 +67,21 @@ public function testRunWithNotExpiredToken(): void { // Affirm if updater.secret
 			->expects($this->once())
 			->method('debug');
 
-		$this->invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
+		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
 	}
 
-	public function testRunWithExpiredToken(): void { // Affirm if updater.secret.created >48 hours ago then `updater.secret` is removed
+	/**
+	 * Affirm if updater.secret.created >48 hours ago then `updater.secret` is removed
+	 */
+	public function testSecretIsRemovedWhenOutdated(): void {
 		$this->timeFactory
 			->expects($this->atLeastOnce())
 			->method('getTime')
 			->willReturn(1455045234); // "Tue, 09 Feb 2016 19:13:54 +0000"
 		$this->appConfig
 			->expects($this->once())
 			->method('getValueInt')
-			->with('core', 'updater.secret.created', 1455045234)
+			->with('core', 'updater.secret.created')
 			->willReturn(1455045234 - 3 * 24 * 60 * 60); // 72h prior: "Sat, 06 Feb 2016 19:13:54 +0000"
 		$this->config
 			->expects($this->once())
@@ -102,8 +108,8 @@ public function testRunWithExpiredToken(): void { // Affirm if updater.secret.cr
 
 	public function testRunWithExpiredTokenAndReadOnlyConfigFile(): void { // Affirm if config_is_read_only is set that the secret is never reset
 		$this->timeFactory
-			->expects($this->never())
-			->method('getTime');
+				->expects($this->never())
+				->method('getTime');
 		$this->appConfig
 			->expects($this->never())
 			->method('getValueInt');