nextcloud / server

apps/updatenotification/lib/Settings/Admin.php

Indentation +123 added lines, -123 removed lines

@@ -23,127 +23,127 @@
 use Psr\Log\LoggerInterface;
 
 class Admin implements ISettings {
-	public function __construct(
-		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,
-	) {
-	}
-
-	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = $this->appConfig->getValueInt('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-		$defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
-
-		$isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
-			|| strpos($updateServerURL, $defaultCustomerUpdateServerURLPrefix) === 0;
-
-		$hasValidSubscription = $this->subscriptionRegistry->delegateHasValidSubscription();
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
-			'lastChecked' => $lastUpdateCheck,
-			'currentChannel' => $currentChannel,
-			'channels' => $channels,
-			'newVersion' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
-			'newVersionString' => empty($updateState['updateVersionString']) ? '' : $updateState['updateVersionString'],
-			'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
-			'changes' => $this->filterChanges($updateState['changes'] ?? []),
-			'webUpdaterEnabled' => !$this->config->getSystemValue('upgrade.disable-web', false),
-			'isWebUpdaterRecommended' => $this->isWebUpdaterRecommended(),
-			'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
-			'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
-			'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notifyGroups' => $this->getSelectedGroups($notifyGroups),
-			'hasValidSubscription' => $hasValidSubscription,
-		];
-		$this->initialState->provideInitialState('data', $params);
-
-		return new TemplateResponse('updatenotification', 'admin', [], '');
-	}
-
-	protected function filterChanges(array $changes): array {
-		$filtered = [];
-		if (isset($changes['changelogURL'])) {
-			$filtered['changelogURL'] = $changes['changelogURL'];
-		}
-		if (!isset($changes['whatsNew'])) {
-			return $filtered;
-		}
-
-		$iterator = $this->l10nFactory->getLanguageIterator();
-		do {
-			$lang = $iterator->current();
-			if (isset($changes['whatsNew'][$lang])) {
-				$filtered['whatsNew'] = $changes['whatsNew'][$lang];
-				return $filtered;
-			}
-			$iterator->next();
-		} while ($lang !== 'en' && $iterator->valid());
-
-		return $filtered;
-	}
-
-	/**
-	 * @param list<string> $groupIds
-	 * @return list<array{id: string, displayname: string}>
-	 */
-	protected function getSelectedGroups(array $groupIds): array {
-		$result = [];
-		foreach ($groupIds as $groupId) {
-			$group = $this->groupManager->get($groupId);
-
-			if ($group === null) {
-				continue;
-			}
-
-			$result[] = ['id' => $group->getGID(), 'displayname' => $group->getDisplayName()];
-		}
-
-		return $result;
-	}
-
-	public function getSection(): ?string {
-		if (!$this->config->getSystemValueBool('updatechecker', true)) {
-			// update checker is disabled so we do not show the section at all
-			return null;
-		}
-
-		return 'overview';
-	}
-
-	public function getPriority(): int {
-		return 11;
-	}
-
-	private function isWebUpdaterRecommended(): bool {
-		return (int)$this->userManager->countUsersTotal(100) < 100;
-	}
+    public function __construct(
+        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,
+    ) {
+    }
+
+    public function getForm(): TemplateResponse {
+        $lastUpdateCheckTimestamp = $this->appConfig->getValueInt('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+        $defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
+
+        $isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
+            || strpos($updateServerURL, $defaultCustomerUpdateServerURLPrefix) === 0;
+
+        $hasValidSubscription = $this->subscriptionRegistry->delegateHasValidSubscription();
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
+            'lastChecked' => $lastUpdateCheck,
+            'currentChannel' => $currentChannel,
+            'channels' => $channels,
+            'newVersion' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+            'newVersionString' => empty($updateState['updateVersionString']) ? '' : $updateState['updateVersionString'],
+            'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
+            'changes' => $this->filterChanges($updateState['changes'] ?? []),
+            'webUpdaterEnabled' => !$this->config->getSystemValue('upgrade.disable-web', false),
+            'isWebUpdaterRecommended' => $this->isWebUpdaterRecommended(),
+            'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
+            'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
+            'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notifyGroups' => $this->getSelectedGroups($notifyGroups),
+            'hasValidSubscription' => $hasValidSubscription,
+        ];
+        $this->initialState->provideInitialState('data', $params);
+
+        return new TemplateResponse('updatenotification', 'admin', [], '');
+    }
+
+    protected function filterChanges(array $changes): array {
+        $filtered = [];
+        if (isset($changes['changelogURL'])) {
+            $filtered['changelogURL'] = $changes['changelogURL'];
+        }
+        if (!isset($changes['whatsNew'])) {
+            return $filtered;
+        }
+
+        $iterator = $this->l10nFactory->getLanguageIterator();
+        do {
+            $lang = $iterator->current();
+            if (isset($changes['whatsNew'][$lang])) {
+                $filtered['whatsNew'] = $changes['whatsNew'][$lang];
+                return $filtered;
+            }
+            $iterator->next();
+        } while ($lang !== 'en' && $iterator->valid());
+
+        return $filtered;
+    }
+
+    /**
+     * @param list<string> $groupIds
+     * @return list<array{id: string, displayname: string}>
+     */
+    protected function getSelectedGroups(array $groupIds): array {
+        $result = [];
+        foreach ($groupIds as $groupId) {
+            $group = $this->groupManager->get($groupId);
+
+            if ($group === null) {
+                continue;
+            }
+
+            $result[] = ['id' => $group->getGID(), 'displayname' => $group->getDisplayName()];
+        }
+
+        return $result;
+    }
+
+    public function getSection(): ?string {
+        if (!$this->config->getSystemValueBool('updatechecker', true)) {
+            // update checker is disabled so we do not show the section at all
+            return null;
+        }
+
+        return 'overview';
+    }
+
+    public function getPriority(): int {
+        return 11;
+    }
+
+    private function isWebUpdaterRecommended(): bool {
+        return (int)$this->userManager->countUsersTotal(100) < 100;
+    }
 }

apps/updatenotification/lib/BackgroundJob/UpdateAvailableNotifications.php

Indentation +214 added lines, -214 removed lines

@@ -21,218 +21,218 @@
 use OCP\ServerVersion;
 
 class UpdateAvailableNotifications extends TimedJob {
-	protected $connectionNotifications = [3, 7, 14, 30];
-
-	/** @var string[] */
-	protected $users;
-
-	public function __construct(
-		ITimeFactory $timeFactory,
-		protected ServerVersion $serverVersion,
-		protected IConfig $config,
-		protected IAppConfig $appConfig,
-		protected IManager $notificationManager,
-		protected IGroupManager $groupManager,
-		protected IAppManager $appManager,
-		protected Installer $installer,
-		protected VersionCheck $versionCheck,
-	) {
-		parent::__construct($timeFactory);
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument) {
-		// Do not check for updates if not connected to the internet
-		if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
-			return;
-		}
-
-		if (\OC::$CLI && !$this->config->getSystemValueBool('debug', false)) {
-			try {
-				// Jitter the pinging of the updater server and the appstore a bit.
-				// Otherwise all Nextcloud installations are pinging the servers
-				// in one of 288
-				sleep(random_int(1, 180));
-			} catch (\Exception $e) {
-			}
-		}
-
-		$this->checkCoreUpdate();
-		$this->checkAppUpdates();
-	}
-
-	/**
-	 * Check for Nextcloud server update
-	 */
-	protected function checkCoreUpdate() {
-		if (!$this->config->getSystemValueBool('updatechecker', true)) {
-			// update checker is disabled so no core update check!
-			return;
-		}
-
-		if (\in_array($this->serverVersion->getChannel(), ['daily', 'git'], true)) {
-			// "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
-			return;
-		}
-
-		$status = $this->versionCheck->check();
-		if ($status === false) {
-			$errors = 1 + $this->appConfig->getAppValueInt('update_check_errors', 0);
-			$this->appConfig->setAppValueInt('update_check_errors', $errors);
-
-			if (\in_array($errors, $this->connectionNotifications, true)) {
-				$this->sendErrorNotifications($errors);
-			}
-		} elseif (\is_array($status)) {
-			$this->appConfig->setAppValueInt('update_check_errors', 0);
-			$this->clearErrorNotifications();
-
-			if (isset($status['version'])) {
-				$this->createNotifications('core', $status['version'], $status['versionstring']);
-			}
-		}
-	}
-
-	/**
-	 * Send a message to the admin when the update server could not be reached
-	 * @param int $numDays
-	 */
-	protected function sendErrorNotifications($numDays) {
-		$this->clearErrorNotifications();
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setDateTime(new \DateTime())
-				->setObject('updatenotification', 'error')
-				->setSubject('connection_error', ['days' => $numDays]);
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-	}
-
-	/**
-	 * Remove error notifications again
-	 */
-	protected function clearErrorNotifications() {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setSubject('connection_error')
-				->setObject('updatenotification', 'error');
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * Check all installed apps for updates
-	 */
-	protected function checkAppUpdates() {
-		$apps = $this->appManager->getEnabledApps();
-		foreach ($apps as $app) {
-			$update = $this->isUpdateAvailable($app);
-			if ($update !== false) {
-				$this->createNotifications($app, $update);
-			}
-		}
-	}
-
-	/**
-	 * Create notifications for this app version
-	 *
-	 * @param string $app
-	 * @param string $version
-	 * @param string $visibleVersion
-	 */
-	protected function createNotifications($app, $version, $visibleVersion = '') {
-		$lastNotification = $this->appConfig->getAppValueString($app, '');
-		if ($lastNotification === $version) {
-			// We already notified about this update
-			return;
-		}
-
-		if ($lastNotification !== '') {
-			// Delete old updates
-			$this->deleteOutdatedNotifications($app, $lastNotification);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setDateTime(new \DateTime())
-				->setObject($app, $version);
-
-			if ($visibleVersion !== '') {
-				$notification->setSubject('update_available', ['version' => $visibleVersion]);
-			} else {
-				$notification->setSubject('update_available');
-			}
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-
-		$this->appConfig->setAppValueString($app, $version);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getUsersToNotify(): array {
-		if ($this->users !== null) {
-			return $this->users;
-		}
-
-		$notifyGroups = $this->appConfig->getAppValueArray('notify_groups', ['admin']);
-		$this->users = [];
-		foreach ($notifyGroups as $group) {
-			$groupToNotify = $this->groupManager->get($group);
-			if ($groupToNotify instanceof IGroup) {
-				foreach ($groupToNotify->getUsers() as $user) {
-					$this->users[] = $user->getUID();
-				}
-			}
-		}
-
-		$this->users = array_values(array_unique($this->users));
-		return $this->users;
-	}
-
-	/**
-	 * Delete notifications for old updates
-	 *
-	 * @param string $app
-	 * @param string $version
-	 */
-	protected function deleteOutdatedNotifications($app, $version) {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setObject($app, $version);
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * @param string $app
-	 * @return string|false
-	 */
-	protected function isUpdateAvailable($app) {
-		return $this->installer->isUpdateAvailable($app);
-	}
+    protected $connectionNotifications = [3, 7, 14, 30];
+
+    /** @var string[] */
+    protected $users;
+
+    public function __construct(
+        ITimeFactory $timeFactory,
+        protected ServerVersion $serverVersion,
+        protected IConfig $config,
+        protected IAppConfig $appConfig,
+        protected IManager $notificationManager,
+        protected IGroupManager $groupManager,
+        protected IAppManager $appManager,
+        protected Installer $installer,
+        protected VersionCheck $versionCheck,
+    ) {
+        parent::__construct($timeFactory);
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument) {
+        // Do not check for updates if not connected to the internet
+        if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
+            return;
+        }
+
+        if (\OC::$CLI && !$this->config->getSystemValueBool('debug', false)) {
+            try {
+                // Jitter the pinging of the updater server and the appstore a bit.
+                // Otherwise all Nextcloud installations are pinging the servers
+                // in one of 288
+                sleep(random_int(1, 180));
+            } catch (\Exception $e) {
+            }
+        }
+
+        $this->checkCoreUpdate();
+        $this->checkAppUpdates();
+    }
+
+    /**
+     * Check for Nextcloud server update
+     */
+    protected function checkCoreUpdate() {
+        if (!$this->config->getSystemValueBool('updatechecker', true)) {
+            // update checker is disabled so no core update check!
+            return;
+        }
+
+        if (\in_array($this->serverVersion->getChannel(), ['daily', 'git'], true)) {
+            // "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
+            return;
+        }
+
+        $status = $this->versionCheck->check();
+        if ($status === false) {
+            $errors = 1 + $this->appConfig->getAppValueInt('update_check_errors', 0);
+            $this->appConfig->setAppValueInt('update_check_errors', $errors);
+
+            if (\in_array($errors, $this->connectionNotifications, true)) {
+                $this->sendErrorNotifications($errors);
+            }
+        } elseif (\is_array($status)) {
+            $this->appConfig->setAppValueInt('update_check_errors', 0);
+            $this->clearErrorNotifications();
+
+            if (isset($status['version'])) {
+                $this->createNotifications('core', $status['version'], $status['versionstring']);
+            }
+        }
+    }
+
+    /**
+     * Send a message to the admin when the update server could not be reached
+     * @param int $numDays
+     */
+    protected function sendErrorNotifications($numDays) {
+        $this->clearErrorNotifications();
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setDateTime(new \DateTime())
+                ->setObject('updatenotification', 'error')
+                ->setSubject('connection_error', ['days' => $numDays]);
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+    }
+
+    /**
+     * Remove error notifications again
+     */
+    protected function clearErrorNotifications() {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setSubject('connection_error')
+                ->setObject('updatenotification', 'error');
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * Check all installed apps for updates
+     */
+    protected function checkAppUpdates() {
+        $apps = $this->appManager->getEnabledApps();
+        foreach ($apps as $app) {
+            $update = $this->isUpdateAvailable($app);
+            if ($update !== false) {
+                $this->createNotifications($app, $update);
+            }
+        }
+    }
+
+    /**
+     * Create notifications for this app version
+     *
+     * @param string $app
+     * @param string $version
+     * @param string $visibleVersion
+     */
+    protected function createNotifications($app, $version, $visibleVersion = '') {
+        $lastNotification = $this->appConfig->getAppValueString($app, '');
+        if ($lastNotification === $version) {
+            // We already notified about this update
+            return;
+        }
+
+        if ($lastNotification !== '') {
+            // Delete old updates
+            $this->deleteOutdatedNotifications($app, $lastNotification);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setDateTime(new \DateTime())
+                ->setObject($app, $version);
+
+            if ($visibleVersion !== '') {
+                $notification->setSubject('update_available', ['version' => $visibleVersion]);
+            } else {
+                $notification->setSubject('update_available');
+            }
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+
+        $this->appConfig->setAppValueString($app, $version);
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getUsersToNotify(): array {
+        if ($this->users !== null) {
+            return $this->users;
+        }
+
+        $notifyGroups = $this->appConfig->getAppValueArray('notify_groups', ['admin']);
+        $this->users = [];
+        foreach ($notifyGroups as $group) {
+            $groupToNotify = $this->groupManager->get($group);
+            if ($groupToNotify instanceof IGroup) {
+                foreach ($groupToNotify->getUsers() as $user) {
+                    $this->users[] = $user->getUID();
+                }
+            }
+        }
+
+        $this->users = array_values(array_unique($this->users));
+        return $this->users;
+    }
+
+    /**
+     * Delete notifications for old updates
+     *
+     * @param string $app
+     * @param string $version
+     */
+    protected function deleteOutdatedNotifications($app, $version) {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setObject($app, $version);
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * @param string $app
+     * @return string|false
+     */
+    protected function isUpdateAvailable($app) {
+        return $this->installer->isUpdateAvailable($app);
+    }
 }

apps/updatenotification/tests/Settings/AdminTest.php

Indentation +448 added lines, -448 removed lines

@@ -26,452 +26,452 @@
 use Test\TestCase;
 
 class AdminTest extends TestCase {
-	/** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $l10nFactory;
-	/** @var Admin */
-	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 */
-	private $groupManager;
-	/** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */
-	private $dateTimeFormatter;
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	private $subscriptionRegistry;
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-	/** IInitialState|\PHPUnit\Framework\MockObject\MockObject */
-	private $initialState;
-
-	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);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->subscriptionRegistry = $this->createMock(IRegistry::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-
-		$this->admin = new Admin(
-			$this->config,
-			$this->appConfig,
-			$this->updateChecker,
-			$this->groupManager,
-			$this->dateTimeFormatter,
-			$this->l10nFactory,
-			$this->subscriptionRegistry,
-			$this->userManager,
-			$this->logger,
-			$this->initialState
-		);
-	}
-
-	public function testGetFormWithUpdate(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('updatenotification', 'notify_groups', '["admin"]')
-			->willReturn('["admin"]');
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server/'],
-				['upgrade.disable-web', false, false],
-			]);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with(12345)
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => Util::getChannel(),
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => true,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => true,
-				'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse('updatenotification', 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndChangedUpdateServer(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('updatenotification', 'notify_groups', '["admin"]')
-			->willReturn('["admin"]');
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server_changed/'],
-				['upgrade.disable-web', false, true],
-			]);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with('12345')
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => Util::getChannel(),
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => false,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => false,
-				'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse('updatenotification', 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('updatenotification', 'notify_groups', '["admin"]')
-			->willReturn('["admin"]');
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/customers/ABC-DEF/'],
-				['upgrade.disable-web', false, false],
-			]);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with('12345')
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => Util::getChannel(),
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => true,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => true,
-				'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse('updatenotification', 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-
-	public function testGetSection(): void {
-		$this->config
-			->expects(self::atLeastOnce())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-
-		$this->assertSame('overview', $this->admin->getSection());
-	}
-
-	public function testGetSectionDisabled(): void {
-		$this->config
-			->expects(self::atLeastOnce())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(false);
-
-		$this->assertNull($this->admin->getSection());
-	}
-
-	public function testGetPriority(): void {
-		$this->assertSame(11, $this->admin->getPriority());
-	}
-
-	public function changesProvider() {
-		return [
-			[ #0, all info, en
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'en' => [
-							'regular' => ['content'],
-						],
-						'de' => [
-							'regular' => ['inhalt'],
-						]
-					],
-				],
-				'en',
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'regular' => ['content'],
-					],
-				]
-			],
-			[ #1, all info, de
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'en' => [
-							'regular' => ['content'],
-						],
-						'de' => [
-							'regular' => ['inhalt'],
-						]
-					],
-				],
-				'de',
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'regular' => ['inhalt'],
-					]
-				],
-			],
-			[ #2, just changelog
-				[ 'changelogURL' => 'https://go.to.changelog' ],
-				'en',
-				[ 'changelogURL' => 'https://go.to.changelog' ],
-			],
-			[ #3 nothing
-				[],
-				'ru',
-				[]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider changesProvider
-	 */
-	public function testFilterChanges($changes, $userLang, $expectation): void {
-		$iterator = $this->createMock(ILanguageIterator::class);
-		$iterator->expects($this->any())
-			->method('current')
-			->willReturnOnConsecutiveCalls('es', $userLang, 'it', 'en');
-		$iterator->expects($this->any())
-			->method('valid')
-			->willReturn(true);
-
-		$this->l10nFactory->expects($this->atMost(1))
-			->method('getLanguageIterator')
-			->willReturn($iterator);
-		$result = $this->invokePrivate($this->admin, 'filterChanges', [$changes]);
-		$this->assertSame($expectation, $result);
-	}
+    /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $l10nFactory;
+    /** @var Admin */
+    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 */
+    private $groupManager;
+    /** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */
+    private $dateTimeFormatter;
+    /** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
+    private $subscriptionRegistry;
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $logger;
+    /** IInitialState|\PHPUnit\Framework\MockObject\MockObject */
+    private $initialState;
+
+    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);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->subscriptionRegistry = $this->createMock(IRegistry::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+
+        $this->admin = new Admin(
+            $this->config,
+            $this->appConfig,
+            $this->updateChecker,
+            $this->groupManager,
+            $this->dateTimeFormatter,
+            $this->l10nFactory,
+            $this->subscriptionRegistry,
+            $this->userManager,
+            $this->logger,
+            $this->initialState
+        );
+    }
+
+    public function testGetFormWithUpdate(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('updatenotification', 'notify_groups', '["admin"]')
+            ->willReturn('["admin"]');
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server/'],
+                ['upgrade.disable-web', false, false],
+            ]);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with(12345)
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => Util::getChannel(),
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => true,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => true,
+                'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse('updatenotification', 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndChangedUpdateServer(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('updatenotification', 'notify_groups', '["admin"]')
+            ->willReturn('["admin"]');
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server_changed/'],
+                ['upgrade.disable-web', false, true],
+            ]);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with('12345')
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => Util::getChannel(),
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => false,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => false,
+                'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse('updatenotification', 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('updatenotification', 'notify_groups', '["admin"]')
+            ->willReturn('["admin"]');
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/customers/ABC-DEF/'],
+                ['upgrade.disable-web', false, false],
+            ]);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with('12345')
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => Util::getChannel(),
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => true,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => true,
+                'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse('updatenotification', 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+
+    public function testGetSection(): void {
+        $this->config
+            ->expects(self::atLeastOnce())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+
+        $this->assertSame('overview', $this->admin->getSection());
+    }
+
+    public function testGetSectionDisabled(): void {
+        $this->config
+            ->expects(self::atLeastOnce())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(false);
+
+        $this->assertNull($this->admin->getSection());
+    }
+
+    public function testGetPriority(): void {
+        $this->assertSame(11, $this->admin->getPriority());
+    }
+
+    public function changesProvider() {
+        return [
+            [ #0, all info, en
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'en' => [
+                            'regular' => ['content'],
+                        ],
+                        'de' => [
+                            'regular' => ['inhalt'],
+                        ]
+                    ],
+                ],
+                'en',
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'regular' => ['content'],
+                    ],
+                ]
+            ],
+            [ #1, all info, de
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'en' => [
+                            'regular' => ['content'],
+                        ],
+                        'de' => [
+                            'regular' => ['inhalt'],
+                        ]
+                    ],
+                ],
+                'de',
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'regular' => ['inhalt'],
+                    ]
+                ],
+            ],
+            [ #2, just changelog
+                [ 'changelogURL' => 'https://go.to.changelog' ],
+                'en',
+                [ 'changelogURL' => 'https://go.to.changelog' ],
+            ],
+            [ #3 nothing
+                [],
+                'ru',
+                []
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider changesProvider
+     */
+    public function testFilterChanges($changes, $userLang, $expectation): void {
+        $iterator = $this->createMock(ILanguageIterator::class);
+        $iterator->expects($this->any())
+            ->method('current')
+            ->willReturnOnConsecutiveCalls('es', $userLang, 'it', 'en');
+        $iterator->expects($this->any())
+            ->method('valid')
+            ->willReturn(true);
+
+        $this->l10nFactory->expects($this->atMost(1))
+            ->method('getLanguageIterator')
+            ->willReturn($iterator);
+        $result = $this->invokePrivate($this->admin, 'filterChanges', [$changes]);
+        $this->assertSame($expectation, $result);
+    }
 }

apps/updatenotification/tests/BackgroundJob/UpdateAvailableNotificationsTest.php

Indentation +444 added lines, -444 removed lines

@@ -25,448 +25,448 @@
 use Test\TestCase;
 
 class UpdateAvailableNotificationsTest extends TestCase {
-	private ServerVersion&MockObject $serverVersion;
-	private IConfig|MockObject $config;
-	private IManager|MockObject $notificationManager;
-	private IGroupManager|MockObject $groupManager;
-	private IAppManager|MockObject $appManager;
-	private IAppConfig|MockObject $appConfig;
-	private ITimeFactory|MockObject $timeFactory;
-	private Installer|MockObject $installer;
-	private VersionCheck|MockObject $versionCheck;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->installer = $this->createMock(Installer::class);
-		$this->versionCheck = $this->createMock(VersionCheck::class);
-	}
-
-	/**
-	 * @param array $methods
-	 * @return UpdateAvailableNotifications|MockObject
-	 */
-	protected function getJob(array $methods = []) {
-		if (empty($methods)) {
-			return new UpdateAvailableNotifications(
-				$this->timeFactory,
-				$this->serverVersion,
-				$this->config,
-				$this->appConfig,
-				$this->notificationManager,
-				$this->groupManager,
-				$this->appManager,
-				$this->installer,
-				$this->versionCheck,
-			);
-		}
-		{
-			return $this->getMockBuilder(UpdateAvailableNotifications::class)
-				->setConstructorArgs([
-					$this->timeFactory,
-					$this->serverVersion,
-					$this->config,
-					$this->appConfig,
-					$this->notificationManager,
-					$this->groupManager,
-					$this->appManager,
-					$this->installer,
-					$this->versionCheck,
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-	}
-
-	public function testRun(): void {
-		$job = $this->getJob([
-			'checkCoreUpdate',
-			'checkAppUpdates',
-		]);
-
-		$job->expects($this->once())
-			->method('checkCoreUpdate');
-		$job->expects($this->once())
-			->method('checkAppUpdates');
-
-		$this->config->expects(self::exactly(2))
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['debug', false, true],
-				['has_internet_connection', true, true],
-			]);
-		self::invokePrivate($job, 'run', [null]);
-	}
-
-	public function testRunNoInternet(): void {
-		$job = $this->getJob([
-			'checkCoreUpdate',
-			'checkAppUpdates',
-		]);
-
-		$job->expects($this->never())
-			->method('checkCoreUpdate');
-		$job->expects($this->never())
-			->method('checkAppUpdates');
-
-		$this->config
-			->expects(self::once())
-			->method('getSystemValueBool')
-			->with('has_internet_connection', true)
-			->willReturn(false);
-
-		self::invokePrivate($job, 'run', [null]);
-	}
-
-	public function dataCheckCoreUpdate(): array {
-		return [
-			['daily', null, null, null, null],
-			['git', null, null, null, null],
-			['beta', [], null, null, null],
-			['beta', false, false, null, null],
-			['beta', false, false, null, 13],
-			['beta', [
-				'version' => '9.2.0',
-				'versionstring' => 'Nextcloud 11.0.0',
-			], '9.2.0', 'Nextcloud 11.0.0', null],
-			['stable', [], null, null, null],
-			['stable', false, false, null, null],
-			['stable', false, false, null, 6],
-			['stable', [
-				'version' => '9.2.0',
-				'versionstring' => 'Nextcloud 11.0.0',
-			], '9.2.0', 'Nextcloud 11.0.0', null],
-			['production', [], null, null, null],
-			['production', false, false, null, null],
-			['production', false, false, null, 2],
-			['production', [
-				'version' => '9.2.0',
-				'versionstring' => 'Nextcloud 11.0.0',
-			], '9.2.0', 'Nextcloud 11.0.0', null],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCheckCoreUpdate
-	 *
-	 * @param string $channel
-	 * @param mixed $versionCheck
-	 * @param null|string $version
-	 * @param null|string $readableVersion
-	 * @param null|int $errorDays
-	 */
-	public function testCheckCoreUpdate(string $channel, $versionCheck, $version, $readableVersion, $errorDays): void {
-		$job = $this->getJob([
-			'createNotifications',
-			'clearErrorNotifications',
-			'sendErrorNotifications',
-		]);
-
-		$this->serverVersion->expects($this->once())
-			->method('getChannel')
-			->willReturn($channel);
-
-		if ($versionCheck === null) {
-			$this->versionCheck->expects($this->never())
-				->method('check');
-		} else {
-			$this->versionCheck->expects($this->once())
-				->method('check')
-				->willReturn($versionCheck);
-		}
-
-		if ($version === null) {
-			$job->expects($this->never())
-				->method('createNotifications');
-			$job->expects($versionCheck === null ? $this->never() : $this->once())
-				->method('clearErrorNotifications');
-		} elseif ($version === false) {
-			$job->expects($this->never())
-				->method('createNotifications');
-			$job->expects($this->never())
-				->method('clearErrorNotifications');
-
-			$this->appConfig->expects($this->once())
-				->method('getAppValueInt')
-				->willReturn($errorDays ?? 0);
-			$this->appConfig->expects($this->once())
-				->method('setAppValueInt')
-				->with('update_check_errors', $errorDays + 1);
-			$job->expects($errorDays !== null ? $this->once() : $this->never())
-				->method('sendErrorNotifications')
-				->with($errorDays + 1);
-		} else {
-			$this->appConfig->expects($this->once())
-				->method('setAppValueInt')
-				->with('update_check_errors', 0);
-			$job->expects($this->once())
-				->method('clearErrorNotifications');
-			$job->expects($this->once())
-				->method('createNotifications')
-				->with('core', $version, $readableVersion);
-		}
-
-		$this->config->expects(self::any())
-			->method('getSystemValueBool')
-			->willReturnMap([
-				['updatechecker', true, true],
-				['has_internet_connection', true, true],
-			]);
-
-		self::invokePrivate($job, 'checkCoreUpdate');
-	}
-
-	public function dataCheckAppUpdates(): array {
-		return [
-			[
-				['app1', 'app2'],
-				[
-					['app1', false],
-					['app2', '1.9.2'],
-				],
-				[
-					['app2', '1.9.2', ''],
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCheckAppUpdates
-	 *
-	 * @param string[] $apps
-	 * @param array $isUpdateAvailable
-	 * @param array $notifications
-	 */
-	public function testCheckAppUpdates(array $apps, array $isUpdateAvailable, array $notifications): void {
-		$job = $this->getJob([
-			'isUpdateAvailable',
-			'createNotifications',
-		]);
-
-		$this->appManager->expects($this->once())
-			->method('getEnabledApps')
-			->willReturn($apps);
-
-		$job->expects($this->exactly(\count($apps)))
-			->method('isUpdateAvailable')
-			->willReturnMap($isUpdateAvailable);
-
-		$i = 0;
-		$job->expects($this->exactly(\count($notifications)))
-			->method('createNotifications')
-			->willReturnCallback(function () use ($notifications, &$i): void {
-				$this->assertEquals($notifications[$i], func_get_args());
-				$i++;
-			});
-
-
-		self::invokePrivate($job, 'checkAppUpdates');
-	}
-
-	public function dataCreateNotifications(): array {
-		return [
-			['app1', '1.0.0', '1.0.0', false, false, null, null],
-			['app2', '1.0.1', '1.0.0', '1.0.0', true, ['user1'], [['user1']]],
-			['app3', '1.0.1', false, false, true, ['user2', 'user3'], [['user2'], ['user3']]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCreateNotifications
-	 *
-	 * @param string $app
-	 * @param string $version
-	 * @param string|false $lastNotification
-	 * @param string|false $callDelete
-	 * @param bool $createNotification
-	 * @param string[]|null $users
-	 * @param array|null $userNotifications
-	 */
-	public function testCreateNotifications(string $app, string $version, $lastNotification, $callDelete, $createNotification, $users, $userNotifications): void {
-		$job = $this->getJob([
-			'deleteOutdatedNotifications',
-			'getUsersToNotify',
-		]);
-
-		$this->appConfig->expects($this->once())
-			->method('getAppValueString')
-			->with($app, '')
-			->willReturn($lastNotification ?: '');
-
-		if ($lastNotification !== $version) {
-			$this->appConfig->expects($this->once())
-				->method('setAppValueString')
-				->with($app, $version);
-		}
-
-		if ($callDelete === false) {
-			$job->expects($this->never())
-				->method('deleteOutdatedNotifications');
-		} else {
-			$job->expects($this->once())
-				->method('deleteOutdatedNotifications')
-				->with($app, $callDelete);
-		}
-
-		if ($users === null) {
-			$job->expects($this->never())
-				->method('getUsersToNotify');
-		} else {
-			$job->expects($this->once())
-				->method('getUsersToNotify')
-				->willReturn($users);
-		}
-
-		if ($createNotification) {
-			$notification = $this->createMock(INotification::class);
-			$notification->expects($this->once())
-				->method('setApp')
-				->with('updatenotification')
-				->willReturnSelf();
-			$notification->expects($this->once())
-				->method('setDateTime')
-				->willReturnSelf();
-			$notification->expects($this->once())
-				->method('setObject')
-				->with($app, $version)
-				->willReturnSelf();
-			$notification->expects($this->once())
-				->method('setSubject')
-				->with('update_available')
-				->willReturnSelf();
-
-			if ($userNotifications !== null) {
-				$notification->expects($this->exactly(\count($userNotifications)))
-					->method('setUser')
-					->willReturnSelf();
-
-				$this->notificationManager->expects($this->exactly(\count($userNotifications)))
-					->method('notify');
-			}
-
-			$this->notificationManager->expects($this->once())
-				->method('createNotification')
-				->willReturn($notification);
-		} else {
-			$this->notificationManager->expects($this->never())
-				->method('createNotification');
-		}
-
-		self::invokePrivate($job, 'createNotifications', [$app, $version]);
-	}
-
-	public function dataGetUsersToNotify(): array {
-		return [
-			[['g1', 'g2'], ['g1' => null, 'g2' => ['u1', 'u2']], ['u1', 'u2']],
-			[['g3', 'g4'], ['g3' => ['u1', 'u2'], 'g4' => ['u2', 'u3']], ['u1', 'u2', 'u3']],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetUsersToNotify
-	 * @param string[] $groups
-	 * @param array $groupUsers
-	 * @param string[] $expected
-	 */
-	public function testGetUsersToNotify(array $groups, array $groupUsers, array $expected): void {
-		$job = $this->getJob();
-
-		$this->appConfig->expects($this->once())
-			->method('getAppValueArray')
-			->with('notify_groups', ['admin'])
-			->willReturn($groups);
-
-		$groupMap = [];
-		foreach ($groupUsers as $gid => $uids) {
-			if ($uids === null) {
-				$group = null;
-			} else {
-				$group = $this->getGroup($gid);
-				$group->expects($this->any())
-					->method('getUsers')
-					->willReturn($this->getUsers($uids));
-			}
-			$groupMap[] = [$gid, $group];
-		}
-		$this->groupManager->expects($this->exactly(\count($groups)))
-			->method('get')
-			->willReturnMap($groupMap);
-
-		$result = self::invokePrivate($job, 'getUsersToNotify');
-		$this->assertEquals($expected, $result);
-
-		// Test caching
-		$result = self::invokePrivate($job, 'getUsersToNotify');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function dataDeleteOutdatedNotifications(): array {
-		return [
-			['app1', '1.1.0'],
-			['app2', '1.2.0'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataDeleteOutdatedNotifications
-	 * @param string $app
-	 * @param string $version
-	 */
-	public function testDeleteOutdatedNotifications(string $app, string $version): void {
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->once())
-			->method('setApp')
-			->with('updatenotification')
-			->willReturnSelf();
-		$notification->expects($this->once())
-			->method('setObject')
-			->with($app, $version)
-			->willReturnSelf();
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->once())
-			->method('markProcessed')
-			->with($notification);
-
-		$job = $this->getJob();
-		self::invokePrivate($job, 'deleteOutdatedNotifications', [$app, $version]);
-	}
-
-	/**
-	 * @param string[] $userIds
-	 * @return IUser[]|MockObject[]
-	 */
-	protected function getUsers(array $userIds): array {
-		$users = [];
-		foreach ($userIds as $uid) {
-			$user = $this->createMock(IUser::class);
-			$user->expects($this->any())
-				->method('getUID')
-				->willReturn($uid);
-			$users[] = $user;
-		}
-		return $users;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return IGroup|MockObject
-	 */
-	protected function getGroup(string $gid) {
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn($gid);
-		return $group;
-	}
+    private ServerVersion&MockObject $serverVersion;
+    private IConfig|MockObject $config;
+    private IManager|MockObject $notificationManager;
+    private IGroupManager|MockObject $groupManager;
+    private IAppManager|MockObject $appManager;
+    private IAppConfig|MockObject $appConfig;
+    private ITimeFactory|MockObject $timeFactory;
+    private Installer|MockObject $installer;
+    private VersionCheck|MockObject $versionCheck;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->installer = $this->createMock(Installer::class);
+        $this->versionCheck = $this->createMock(VersionCheck::class);
+    }
+
+    /**
+     * @param array $methods
+     * @return UpdateAvailableNotifications|MockObject
+     */
+    protected function getJob(array $methods = []) {
+        if (empty($methods)) {
+            return new UpdateAvailableNotifications(
+                $this->timeFactory,
+                $this->serverVersion,
+                $this->config,
+                $this->appConfig,
+                $this->notificationManager,
+                $this->groupManager,
+                $this->appManager,
+                $this->installer,
+                $this->versionCheck,
+            );
+        }
+        {
+            return $this->getMockBuilder(UpdateAvailableNotifications::class)
+                ->setConstructorArgs([
+                    $this->timeFactory,
+                    $this->serverVersion,
+                    $this->config,
+                    $this->appConfig,
+                    $this->notificationManager,
+                    $this->groupManager,
+                    $this->appManager,
+                    $this->installer,
+                    $this->versionCheck,
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+        }
+    }
+
+    public function testRun(): void {
+        $job = $this->getJob([
+            'checkCoreUpdate',
+            'checkAppUpdates',
+        ]);
+
+        $job->expects($this->once())
+            ->method('checkCoreUpdate');
+        $job->expects($this->once())
+            ->method('checkAppUpdates');
+
+        $this->config->expects(self::exactly(2))
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['debug', false, true],
+                ['has_internet_connection', true, true],
+            ]);
+        self::invokePrivate($job, 'run', [null]);
+    }
+
+    public function testRunNoInternet(): void {
+        $job = $this->getJob([
+            'checkCoreUpdate',
+            'checkAppUpdates',
+        ]);
+
+        $job->expects($this->never())
+            ->method('checkCoreUpdate');
+        $job->expects($this->never())
+            ->method('checkAppUpdates');
+
+        $this->config
+            ->expects(self::once())
+            ->method('getSystemValueBool')
+            ->with('has_internet_connection', true)
+            ->willReturn(false);
+
+        self::invokePrivate($job, 'run', [null]);
+    }
+
+    public function dataCheckCoreUpdate(): array {
+        return [
+            ['daily', null, null, null, null],
+            ['git', null, null, null, null],
+            ['beta', [], null, null, null],
+            ['beta', false, false, null, null],
+            ['beta', false, false, null, 13],
+            ['beta', [
+                'version' => '9.2.0',
+                'versionstring' => 'Nextcloud 11.0.0',
+            ], '9.2.0', 'Nextcloud 11.0.0', null],
+            ['stable', [], null, null, null],
+            ['stable', false, false, null, null],
+            ['stable', false, false, null, 6],
+            ['stable', [
+                'version' => '9.2.0',
+                'versionstring' => 'Nextcloud 11.0.0',
+            ], '9.2.0', 'Nextcloud 11.0.0', null],
+            ['production', [], null, null, null],
+            ['production', false, false, null, null],
+            ['production', false, false, null, 2],
+            ['production', [
+                'version' => '9.2.0',
+                'versionstring' => 'Nextcloud 11.0.0',
+            ], '9.2.0', 'Nextcloud 11.0.0', null],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCheckCoreUpdate
+     *
+     * @param string $channel
+     * @param mixed $versionCheck
+     * @param null|string $version
+     * @param null|string $readableVersion
+     * @param null|int $errorDays
+     */
+    public function testCheckCoreUpdate(string $channel, $versionCheck, $version, $readableVersion, $errorDays): void {
+        $job = $this->getJob([
+            'createNotifications',
+            'clearErrorNotifications',
+            'sendErrorNotifications',
+        ]);
+
+        $this->serverVersion->expects($this->once())
+            ->method('getChannel')
+            ->willReturn($channel);
+
+        if ($versionCheck === null) {
+            $this->versionCheck->expects($this->never())
+                ->method('check');
+        } else {
+            $this->versionCheck->expects($this->once())
+                ->method('check')
+                ->willReturn($versionCheck);
+        }
+
+        if ($version === null) {
+            $job->expects($this->never())
+                ->method('createNotifications');
+            $job->expects($versionCheck === null ? $this->never() : $this->once())
+                ->method('clearErrorNotifications');
+        } elseif ($version === false) {
+            $job->expects($this->never())
+                ->method('createNotifications');
+            $job->expects($this->never())
+                ->method('clearErrorNotifications');
+
+            $this->appConfig->expects($this->once())
+                ->method('getAppValueInt')
+                ->willReturn($errorDays ?? 0);
+            $this->appConfig->expects($this->once())
+                ->method('setAppValueInt')
+                ->with('update_check_errors', $errorDays + 1);
+            $job->expects($errorDays !== null ? $this->once() : $this->never())
+                ->method('sendErrorNotifications')
+                ->with($errorDays + 1);
+        } else {
+            $this->appConfig->expects($this->once())
+                ->method('setAppValueInt')
+                ->with('update_check_errors', 0);
+            $job->expects($this->once())
+                ->method('clearErrorNotifications');
+            $job->expects($this->once())
+                ->method('createNotifications')
+                ->with('core', $version, $readableVersion);
+        }
+
+        $this->config->expects(self::any())
+            ->method('getSystemValueBool')
+            ->willReturnMap([
+                ['updatechecker', true, true],
+                ['has_internet_connection', true, true],
+            ]);
+
+        self::invokePrivate($job, 'checkCoreUpdate');
+    }
+
+    public function dataCheckAppUpdates(): array {
+        return [
+            [
+                ['app1', 'app2'],
+                [
+                    ['app1', false],
+                    ['app2', '1.9.2'],
+                ],
+                [
+                    ['app2', '1.9.2', ''],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCheckAppUpdates
+     *
+     * @param string[] $apps
+     * @param array $isUpdateAvailable
+     * @param array $notifications
+     */
+    public function testCheckAppUpdates(array $apps, array $isUpdateAvailable, array $notifications): void {
+        $job = $this->getJob([
+            'isUpdateAvailable',
+            'createNotifications',
+        ]);
+
+        $this->appManager->expects($this->once())
+            ->method('getEnabledApps')
+            ->willReturn($apps);
+
+        $job->expects($this->exactly(\count($apps)))
+            ->method('isUpdateAvailable')
+            ->willReturnMap($isUpdateAvailable);
+
+        $i = 0;
+        $job->expects($this->exactly(\count($notifications)))
+            ->method('createNotifications')
+            ->willReturnCallback(function () use ($notifications, &$i): void {
+                $this->assertEquals($notifications[$i], func_get_args());
+                $i++;
+            });
+
+
+        self::invokePrivate($job, 'checkAppUpdates');
+    }
+
+    public function dataCreateNotifications(): array {
+        return [
+            ['app1', '1.0.0', '1.0.0', false, false, null, null],
+            ['app2', '1.0.1', '1.0.0', '1.0.0', true, ['user1'], [['user1']]],
+            ['app3', '1.0.1', false, false, true, ['user2', 'user3'], [['user2'], ['user3']]],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCreateNotifications
+     *
+     * @param string $app
+     * @param string $version
+     * @param string|false $lastNotification
+     * @param string|false $callDelete
+     * @param bool $createNotification
+     * @param string[]|null $users
+     * @param array|null $userNotifications
+     */
+    public function testCreateNotifications(string $app, string $version, $lastNotification, $callDelete, $createNotification, $users, $userNotifications): void {
+        $job = $this->getJob([
+            'deleteOutdatedNotifications',
+            'getUsersToNotify',
+        ]);
+
+        $this->appConfig->expects($this->once())
+            ->method('getAppValueString')
+            ->with($app, '')
+            ->willReturn($lastNotification ?: '');
+
+        if ($lastNotification !== $version) {
+            $this->appConfig->expects($this->once())
+                ->method('setAppValueString')
+                ->with($app, $version);
+        }
+
+        if ($callDelete === false) {
+            $job->expects($this->never())
+                ->method('deleteOutdatedNotifications');
+        } else {
+            $job->expects($this->once())
+                ->method('deleteOutdatedNotifications')
+                ->with($app, $callDelete);
+        }
+
+        if ($users === null) {
+            $job->expects($this->never())
+                ->method('getUsersToNotify');
+        } else {
+            $job->expects($this->once())
+                ->method('getUsersToNotify')
+                ->willReturn($users);
+        }
+
+        if ($createNotification) {
+            $notification = $this->createMock(INotification::class);
+            $notification->expects($this->once())
+                ->method('setApp')
+                ->with('updatenotification')
+                ->willReturnSelf();
+            $notification->expects($this->once())
+                ->method('setDateTime')
+                ->willReturnSelf();
+            $notification->expects($this->once())
+                ->method('setObject')
+                ->with($app, $version)
+                ->willReturnSelf();
+            $notification->expects($this->once())
+                ->method('setSubject')
+                ->with('update_available')
+                ->willReturnSelf();
+
+            if ($userNotifications !== null) {
+                $notification->expects($this->exactly(\count($userNotifications)))
+                    ->method('setUser')
+                    ->willReturnSelf();
+
+                $this->notificationManager->expects($this->exactly(\count($userNotifications)))
+                    ->method('notify');
+            }
+
+            $this->notificationManager->expects($this->once())
+                ->method('createNotification')
+                ->willReturn($notification);
+        } else {
+            $this->notificationManager->expects($this->never())
+                ->method('createNotification');
+        }
+
+        self::invokePrivate($job, 'createNotifications', [$app, $version]);
+    }
+
+    public function dataGetUsersToNotify(): array {
+        return [
+            [['g1', 'g2'], ['g1' => null, 'g2' => ['u1', 'u2']], ['u1', 'u2']],
+            [['g3', 'g4'], ['g3' => ['u1', 'u2'], 'g4' => ['u2', 'u3']], ['u1', 'u2', 'u3']],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetUsersToNotify
+     * @param string[] $groups
+     * @param array $groupUsers
+     * @param string[] $expected
+     */
+    public function testGetUsersToNotify(array $groups, array $groupUsers, array $expected): void {
+        $job = $this->getJob();
+
+        $this->appConfig->expects($this->once())
+            ->method('getAppValueArray')
+            ->with('notify_groups', ['admin'])
+            ->willReturn($groups);
+
+        $groupMap = [];
+        foreach ($groupUsers as $gid => $uids) {
+            if ($uids === null) {
+                $group = null;
+            } else {
+                $group = $this->getGroup($gid);
+                $group->expects($this->any())
+                    ->method('getUsers')
+                    ->willReturn($this->getUsers($uids));
+            }
+            $groupMap[] = [$gid, $group];
+        }
+        $this->groupManager->expects($this->exactly(\count($groups)))
+            ->method('get')
+            ->willReturnMap($groupMap);
+
+        $result = self::invokePrivate($job, 'getUsersToNotify');
+        $this->assertEquals($expected, $result);
+
+        // Test caching
+        $result = self::invokePrivate($job, 'getUsersToNotify');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function dataDeleteOutdatedNotifications(): array {
+        return [
+            ['app1', '1.1.0'],
+            ['app2', '1.2.0'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataDeleteOutdatedNotifications
+     * @param string $app
+     * @param string $version
+     */
+    public function testDeleteOutdatedNotifications(string $app, string $version): void {
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->once())
+            ->method('setApp')
+            ->with('updatenotification')
+            ->willReturnSelf();
+        $notification->expects($this->once())
+            ->method('setObject')
+            ->with($app, $version)
+            ->willReturnSelf();
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->once())
+            ->method('markProcessed')
+            ->with($notification);
+
+        $job = $this->getJob();
+        self::invokePrivate($job, 'deleteOutdatedNotifications', [$app, $version]);
+    }
+
+    /**
+     * @param string[] $userIds
+     * @return IUser[]|MockObject[]
+     */
+    protected function getUsers(array $userIds): array {
+        $users = [];
+        foreach ($userIds as $uid) {
+            $user = $this->createMock(IUser::class);
+            $user->expects($this->any())
+                ->method('getUID')
+                ->willReturn($uid);
+            $users[] = $user;
+        }
+        return $users;
+    }
+
+    /**
+     * @param string $gid
+     * @return IGroup|MockObject
+     */
+    protected function getGroup(string $gid) {
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn($gid);
+        return $group;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -26,14 +26,14 @@ 
 
 class UpdateAvailableNotificationsTest extends TestCase {
 	private ServerVersion&MockObject $serverVersion;
-	private IConfig|MockObject $config;
-	private IManager|MockObject $notificationManager;
-	private IGroupManager|MockObject $groupManager;
-	private IAppManager|MockObject $appManager;
-	private IAppConfig|MockObject $appConfig;
-	private ITimeFactory|MockObject $timeFactory;
-	private Installer|MockObject $installer;
-	private VersionCheck|MockObject $versionCheck;
+	private IConfig | MockObject $config;
+	private IManager | MockObject $notificationManager;
+	private IGroupManager | MockObject $groupManager;
+	private IAppManager | MockObject $appManager;
+	private IAppConfig | MockObject $appConfig;
+	private ITimeFactory | MockObject $timeFactory;
+	private Installer | MockObject $installer;
+	private VersionCheck | MockObject $versionCheck;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -262,7 +262,7 @@ 
 		$i = 0;
 		$job->expects($this->exactly(\count($notifications)))
 			->method('createNotifications')
-			->willReturnCallback(function () use ($notifications, &$i): void {
+			->willReturnCallback(function() use ($notifications, &$i): void {
 				$this->assertEquals($notifications[$i], func_get_args());
 				$i++;
 			});