fix(updatenotification): spread the use of new iappconfig

ArtificialOwl · ArtificialOwl · commit ffa611e0e46f · 2024-03-12T15:47:35.000-01:00
Signed-off-by: Maxence Lange &lt;maxence@artificial-owl.com&gt;
diff --git a/apps/settings/lib/Settings/Admin/Server.php b/apps/settings/lib/Settings/Admin/Server.php
@@ -30,6 +30,7 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
@@ -39,28 +40,16 @@
 class Server implements IDelegatedSettings {
 	use TProfileHelper;
 
-	private IDBConnection $connection;
-	private IInitialState $initialStateService;
-	private ProfileManager $profileManager;
-	private ITimeFactory $timeFactory;
-	private IConfig $config;
-	private IL10N $l;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(IDBConnection $connection,
-		IInitialState $initialStateService,
-		ProfileManager $profileManager,
-		ITimeFactory $timeFactory,
-		IURLGenerator $urlGenerator,
-		IConfig $config,
-		IL10N $l) {
-		$this->connection = $connection;
-		$this->initialStateService = $initialStateService;
-		$this->profileManager = $profileManager;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IDBConnection $connection,
+		private IInitialState $initialStateService,
+		private ProfileManager $profileManager,
+		private ITimeFactory $timeFactory,
+		private IURLGenerator $urlGenerator,
+		private IConfig $config,
+		private IAppConfig $appConfig,
+		private IL10N $l,
+	) {
 	}
 
 	/**
@@ -69,7 +58,7 @@ public function __construct(IDBConnection $connection,
 	public function getForm() {
 		// Background jobs
 		$this->initialStateService->provideInitialState('backgroundJobsMode', $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax'));
-		$this->initialStateService->provideInitialState('lastCron', (int)$this->config->getAppValue('core', 'lastcron', '0'));
+		$this->initialStateService->provideInitialState('lastCron', $this->appConfig->getValueInt('core', 'lastcron', 0));
 		$this->initialStateService->provideInitialState('cronMaxAge', $this->cronMaxAge());
 		$this->initialStateService->provideInitialState('cronErrors', $this->config->getAppValue('core', 'cronErrors'));
 		$this->initialStateService->provideInitialState('cliBasedCronPossible', function_exists('posix_getpwuid'));
diff --git a/apps/settings/lib/SetupChecks/CronInfo.php b/apps/settings/lib/SetupChecks/CronInfo.php
@@ -26,6 +26,7 @@
 
 namespace OCA\Settings\SetupChecks;
 
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
 use OCP\IL10N;
@@ -37,6 +38,7 @@ class CronInfo implements ISetupCheck {
 	public function __construct(
 		private IL10N $l10n,
 		private IConfig $config,
+		private IAppConfig $appConfig,
 		private IURLGenerator $urlGenerator,
 		private IDateTimeFormatter $dateTimeFormatter,
 	) {
@@ -51,7 +53,7 @@ public function getName(): string {
 	}
 
 	public function run(): SetupResult {
-		$lastCronRun = (int)$this->config->getAppValue('core', 'lastcron', '0');
+		$lastCronRun = $this->appConfig->getValueInt('core', 'lastcron', 0);
 		$relativeTime = $this->dateTimeFormatter->formatTimeSpan($lastCronRun);
 
 		if ((time() - $lastCronRun) > 3600) {
diff --git a/apps/updatenotification/lib/Settings/Admin.php b/apps/updatenotification/lib/Settings/Admin.php
@@ -33,6 +33,7 @@
 use OCA\UpdateNotification\UpdateChecker;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
 use OCP\IGroupManager;
@@ -45,40 +46,22 @@
 use Psr\Log\LoggerInterface;
 
 class Admin implements ISettings {
-	private IConfig $config;
-	private UpdateChecker $updateChecker;
-	private IGroupManager $groupManager;
-	private IDateTimeFormatter $dateTimeFormatter;
-	private IFactory $l10nFactory;
-	private IRegistry $subscriptionRegistry;
-	private IUserManager $userManager;
-	private LoggerInterface $logger;
-	private IInitialState $initialState;
-
 	public function __construct(
-		IConfig $config,
-		UpdateChecker $updateChecker,
-		IGroupManager $groupManager,
-		IDateTimeFormatter $dateTimeFormatter,
-		IFactory $l10nFactory,
-		IRegistry $subscriptionRegistry,
-		IUserManager $userManager,
-		LoggerInterface $logger,
-		IInitialState $initialState
+		private IConfig $config,
+		private IAppConfig $appConfig,
+		private UpdateChecker $updateChecker,
+		private IGroupManager $groupManager,
+		private IDateTimeFormatter $dateTimeFormatter,
+		private IFactory $l10nFactory,
+		private IRegistry $subscriptionRegistry,
+		private IUserManager $userManager,
+		private LoggerInterface $logger,
+		private IInitialState $initialState
 	) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->groupManager = $groupManager;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->l10nFactory = $l10nFactory;
-		$this->subscriptionRegistry = $subscriptionRegistry;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->initialState = $initialState;
 	}
 
 	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = (int)$this->config->getAppValue('core', 'lastupdatedat');
+		$lastUpdateCheckTimestamp = $this->appConfig->getValueInt('core', 'lastupdatedat');
 		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
 
 		$channels = [
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -34,6 +34,7 @@
 use OCA\UpdateNotification\UpdateChecker;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
 use OCP\IGroup;
@@ -55,6 +56,8 @@ class AdminTest extends TestCase {
 	private $admin;
 	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
 	private $config;
+	/** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */
+	private $appConfig;
 	/** @var UpdateChecker|\PHPUnit\Framework\MockObject\MockObject */
 	private $updateChecker;
 	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
@@ -74,6 +77,7 @@ protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
+		$this->appConfig = $this->createMock(IAppConfig::class);
 		$this->updateChecker = $this->createMock(UpdateChecker::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->dateTimeFormatter = $this->createMock(IDateTimeFormatter::class);
@@ -85,6 +89,7 @@ protected function setUp(): void {
 
 		$this->admin = new Admin(
 			$this->config,
+			$this->appConfig,
 			$this->updateChecker,
 			$this->groupManager,
 			$this->dateTimeFormatter,
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
@@ -62,6 +62,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\Defaults;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IGroup;
 use OCP\IGroupManager;
@@ -382,7 +383,8 @@ public function install(array $options, ?IOutput $output = null): array {
 
 		$config = Server::get(IConfig::class);
 		$config->setAppValue('core', 'installedat', (string)microtime(true));
-		$config->setAppValue('core', 'lastupdatedat', (string)microtime(true));
+		$appConfig = Server::get(IAppConfig::class);
+		$appConfig->setValueInt('core', 'lastupdatedat', time());
 
 		$vendorData = $this->getVendorData();
 		$config->setAppValue('core', 'vendor', $vendorData['vendor']);
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
@@ -59,6 +59,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\HintException;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\Util;
@@ -74,34 +75,21 @@
  *  - failure(string $message)
  */
 class Updater extends BasicEmitter {
-	/** @var LoggerInterface */
-	private $log;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var Checker */
-	private $checker;
-
-	/** @var Installer */
-	private $installer;
-
-	private $logLevelNames = [
+	private array $logLevelNames = [
 		0 => 'Debug',
 		1 => 'Info',
 		2 => 'Warning',
 		3 => 'Error',
 		4 => 'Fatal',
 	];
 
-	public function __construct(IConfig $config,
-		Checker $checker,
-		?LoggerInterface $log,
-		Installer $installer) {
-		$this->log = $log;
-		$this->config = $config;
-		$this->checker = $checker;
-		$this->installer = $installer;
+	public function __construct(
+		private IConfig $config,
+		private IAppConfig $appConfig,
+		private Checker $checker,
+		private ?LoggerInterface $log,
+		private Installer $installer
+	) {
 	}
 
 	/**
@@ -303,7 +291,7 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
 		$repair->run();
 
 		//Invalidate update feed
-		$this->config->setAppValue('core', 'lastupdatedat', '0');
+		$this->appConfig->setValueInt('core', 'lastupdatedat', 0);
 
 		// Check for code integrity if not disabled
 		if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
@@ -27,6 +27,7 @@
 namespace OC\Updater;
 
 use OCP\Http\Client\IClientService;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\Support\Subscription\IRegistry;
@@ -37,6 +38,7 @@ class VersionCheck {
 	public function __construct(
 		private IClientService $clientService,
 		private IConfig $config,
+		private IAppConfig $appConfig,
 		private IUserManager $userManager,
 		private IRegistry $registry,
 		private LoggerInterface $logger,
@@ -56,21 +58,21 @@ public function check() {
 		}
 
 		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+		if (($this->appConfig->getValueInt('core', 'lastupdatedat') + 1800) > time()) {
 			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
 		}
 
 		$updaterUrl = $this->config->getSystemValueString('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
 
-		$this->config->setAppValue('core', 'lastupdatedat', (string)time());
+		$this->appConfig->setValueInt('core', 'lastupdatedat', time());
 
 		if ($this->config->getAppValue('core', 'installedat', '') === '') {
 			$this->config->setAppValue('core', 'installedat', (string)microtime(true));
 		}
 
 		$version = Util::getVersion();
 		$version['installed'] = $this->config->getAppValue('core', 'installedat');
-		$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
+		$version['updated'] = $this->appConfig->getValueInt('core', 'lastupdatedat');
 		$version['updatechannel'] = \OC_Util::getChannel();
 		$version['edition'] = '';
 		$version['build'] = \OC_Util::getBuild();
diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
@@ -24,6 +24,7 @@
 
 use OC\Updater\VersionCheck;
 use OCP\Http\Client\IClientService;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\Support\Subscription\IRegistry;
@@ -33,6 +34,8 @@
 class VersionCheckTest extends \Test\TestCase {
 	/** @var IConfig| \PHPUnit\Framework\MockObject\MockObject */
 	private $config;
+	/** @var IAppConfig| \PHPUnit\Framework\MockObject\MockObject */
+	private $appConfig;
 	/** @var VersionCheck | \PHPUnit\Framework\MockObject\MockObject*/
 	private $updater;
 	/** @var IRegistry | \PHPUnit\Framework\Mo2ckObject\MockObject*/
@@ -45,6 +48,9 @@ protected function setUp(): void {
 		$this->config = $this->getMockBuilder(IConfig::class)
 			->disableOriginalConstructor()
 			->getMock();
+		$this->appConfig = $this->getMockBuilder(IAppConfig::class)
+			->disableOriginalConstructor()
+			->getMock();
 		$clientService = $this->getMockBuilder(IClientService::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -59,6 +65,7 @@ protected function setUp(): void {
 			->setConstructorArgs([
 				$clientService,
 				$this->config,
+				$this->appConfig,
 				$this->createMock(IUserManager::class),
 				$this->registry,
 				$this->logger,
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php
@@ -25,13 +25,16 @@
 use OC\Installer;
 use OC\IntegrityCheck\Checker;
 use OC\Updater;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 
 class UpdaterTest extends TestCase {
 	/** @var IConfig|MockObject */
 	private $config;
+	/** @var IAppConfig|MockObject */
+	private $appConfig;
 	/** @var LoggerInterface|MockObject */
 	private $logger;
 	/** @var Updater */
@@ -46,6 +49,9 @@ protected function setUp(): void {
 		$this->config = $this->getMockBuilder(IConfig::class)
 			->disableOriginalConstructor()
 			->getMock();
+		$this->appConfig = $this->getMockBuilder(IAppConfig::class)
+			->disableOriginalConstructor()
+			->getMock();
 		$this->logger = $this->getMockBuilder(LoggerInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -58,6 +64,7 @@ protected function setUp(): void {
 
 		$this->updater = new Updater(
 			$this->config,
+			$this->appConfig,
 			$this->checker,
 			$this->logger,
 			$this->installer
