nextcloud / server

lib/private/Support/CrashReport/Registry.php

Indentation +107 added lines, -107 removed lines

@@ -20,117 +20,117 @@
 use function array_shift;
 
 class Registry implements IRegistry {
-	/** @var string[] */
-	private $lazyReporters = [];
-
-	/** @var IReporter[] */
-	private $reporters = [];
-
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
-	 */
-	public function register(IReporter $reporter): void {
-		$this->reporters[] = $reporter;
-	}
-
-	public function registerLazy(string $class): void {
-		$this->lazyReporters[] = $class;
-	}
-
-	/**
-	 * Delegate breadcrumb collection to all registered reporters
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @since 15.0.0
-	 */
-	public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof ICollectBreadcrumbs) {
-				$reporter->collect($message, $category, $context);
-			}
-		}
-	}
-
-	/**
-	 * Delegate crash reporting to all registered reporters
-	 *
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function delegateReport($exception, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			$reporter->report($exception, $context);
-		}
-	}
-
-	/**
-	 * Delegate a message to all reporters that implement IMessageReporter
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function delegateMessage(string $message, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof IMessageReporter) {
-				$reporter->reportMessage($message, $context);
-			}
-		}
-	}
-
-	private function loadLazyProviders(): void {
-		while (($class = array_shift($this->lazyReporters)) !== null) {
-			try {
-				/** @var IReporter $reporter */
-				$reporter = $this->serverContainer->query($class);
-			} catch (QueryException $e) {
-				/*
+    /** @var string[] */
+    private $lazyReporters = [];
+
+    /** @var IReporter[] */
+    private $reporters = [];
+
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Register a reporter instance
+     *
+     * @param IReporter $reporter
+     */
+    public function register(IReporter $reporter): void {
+        $this->reporters[] = $reporter;
+    }
+
+    public function registerLazy(string $class): void {
+        $this->lazyReporters[] = $class;
+    }
+
+    /**
+     * Delegate breadcrumb collection to all registered reporters
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @since 15.0.0
+     */
+    public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof ICollectBreadcrumbs) {
+                $reporter->collect($message, $category, $context);
+            }
+        }
+    }
+
+    /**
+     * Delegate crash reporting to all registered reporters
+     *
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function delegateReport($exception, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            $reporter->report($exception, $context);
+        }
+    }
+
+    /**
+     * Delegate a message to all reporters that implement IMessageReporter
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     */
+    public function delegateMessage(string $message, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof IMessageReporter) {
+                $reporter->reportMessage($message, $context);
+            }
+        }
+    }
+
+    private function loadLazyProviders(): void {
+        while (($class = array_shift($this->lazyReporters)) !== null) {
+            try {
+                /** @var IReporter $reporter */
+                $reporter = $this->serverContainer->query($class);
+            } catch (QueryException $e) {
+                /*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-				return;
-			}
-			/**
-			 * Try to register the loaded reporter. Theoretically it could be of a wrong
-			 * type, so we might get a TypeError here that we should catch.
-			 */
-			try {
-				$this->register($reporter);
-			} catch (Throwable $e) {
-				/*
+                \OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+                return;
+            }
+            /**
+             * Try to register the loaded reporter. Theoretically it could be of a wrong
+             * type, so we might get a TypeError here that we should catch.
+             */
+            try {
+                $this->register($reporter);
+            } catch (Throwable $e) {
+                /*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	public function hasReporters(): bool {
-		return !empty($this->lazyReporters) || !empty($this->reporters);
-	}
+                \OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    public function hasReporters(): bool {
+        return !empty($this->lazyReporters) || !empty($this->reporters);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
+				\OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 				return;
@@ -123,7 +123,7 @@ 
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+				\OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php

Indentation +149 added lines, -149 removed lines

@@ -22,153 +22,153 @@
  * @group DB
  */
 class WebhookListenerMapperTest extends TestCase {
-	private IDBConnection $connection;
-	private WebhookListenerMapper $mapper;
-	private ICacheFactory $cacheFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->cacheFactory = Server::get(ICacheFactory::class);
-		$this->pruneTables();
-
-		$this->mapper = new WebhookListenerMapper(
-			$this->connection,
-			$this->cacheFactory,
-		);
-	}
-
-	protected function tearDown(): void {
-		$this->pruneTables();
-		parent::tearDown();
-	}
-
-	protected function pruneTables(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(WebhookListenerMapper::TABLE_NAME)->executeStatement();
-	}
-
-	public function testInsertListenerWithNotSupportedEvent(): void {
-		$this->expectException(\UnexpectedValueException::class);
-		$listener1 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			'https://webhook.example.com/endpoint',
-			UserCreatedEvent::class,
-			null,
-			null,
-			null,
-			AuthMethod::None,
-			null,
-		);
-	}
-
-	public function testInsertListenerAndGetIt(): void {
-		$listener1 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			'https://webhook.example.com/endpoint',
-			NodeWrittenEvent::class,
-			null,
-			null,
-			null,
-			AuthMethod::None,
-			null,
-		);
-
-		$listener2 = $this->mapper->getById($listener1->getId());
-
-		$listener1->resetUpdatedFields();
-		$this->assertEquals($listener1, $listener2);
-	}
-
-	public function testInsertListenerAndGetItByUri(): void {
-		$uri = 'https://webhook.example.com/endpoint';
-		$listener1 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			$uri,
-			NodeWrittenEvent::class,
-			null,
-			null,
-			null,
-			AuthMethod::None,
-			null,
-		);
-
-		$listeners = $this->mapper->getByUri($uri);
-
-		$listener1->resetUpdatedFields();
-		$this->assertContains($listener1->getId(), array_map(fn ($listener) => $listener->getId(), $listeners));
-	}
-
-	public function testInsertListenerAndGetItWithAuthData(): void {
-		$listener1 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			'https://webhook.example.com/endpoint',
-			NodeWrittenEvent::class,
-			null,
-			null,
-			null,
-			AuthMethod::Header,
-			['secretHeader' => 'header'],
-		);
-
-		$listener2 = $this->mapper->getById($listener1->getId());
-
-		$listener1->resetUpdatedFields();
-		$this->assertEquals($listener1, $listener2);
-	}
-
-	public function testInsertListenerAndGetItByEventAndUser(): void {
-		$listener1 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			'https://webhook.example.com/endpoint',
-			NodeWrittenEvent::class,
-			null,
-			'alice',
-			null,
-			AuthMethod::None,
-			null,
-		);
-		$listener1->resetUpdatedFields();
-
-		$this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents('alice'));
-		$this->assertEquals([], $this->mapper->getAllConfiguredEvents(''));
-		$this->assertEquals([], $this->mapper->getAllConfiguredEvents('otherUser'));
-
-		$this->assertEquals([$listener1], $this->mapper->getByEvent(NodeWrittenEvent::class, 'alice'));
-		$this->assertEquals([], $this->mapper->getByEvent(NodeWrittenEvent::class, ''));
-		$this->assertEquals([], $this->mapper->getByEvent(NodeWrittenEvent::class, 'otherUser'));
-
-		/* Add a second listener with no user filter */
-		$listener2 = $this->mapper->addWebhookListener(
-			null,
-			'bob',
-			'POST',
-			'https://webhook.example.com/endpoint',
-			NodeWrittenEvent::class,
-			null,
-			'',
-			null,
-			AuthMethod::None,
-			null,
-		);
-		$listener2->resetUpdatedFields();
-
-		$this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents('alice'));
-		$this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents(''));
-
-		$this->assertEquals([$listener1, $listener2], $this->mapper->getByEvent(NodeWrittenEvent::class, 'alice'));
-		$this->assertEquals([$listener2], $this->mapper->getByEvent(NodeWrittenEvent::class, 'otherUser'));
-		$this->assertEquals([$listener2], $this->mapper->getByEvent(NodeWrittenEvent::class));
-	}
+    private IDBConnection $connection;
+    private WebhookListenerMapper $mapper;
+    private ICacheFactory $cacheFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->cacheFactory = Server::get(ICacheFactory::class);
+        $this->pruneTables();
+
+        $this->mapper = new WebhookListenerMapper(
+            $this->connection,
+            $this->cacheFactory,
+        );
+    }
+
+    protected function tearDown(): void {
+        $this->pruneTables();
+        parent::tearDown();
+    }
+
+    protected function pruneTables(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(WebhookListenerMapper::TABLE_NAME)->executeStatement();
+    }
+
+    public function testInsertListenerWithNotSupportedEvent(): void {
+        $this->expectException(\UnexpectedValueException::class);
+        $listener1 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            'https://webhook.example.com/endpoint',
+            UserCreatedEvent::class,
+            null,
+            null,
+            null,
+            AuthMethod::None,
+            null,
+        );
+    }
+
+    public function testInsertListenerAndGetIt(): void {
+        $listener1 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            'https://webhook.example.com/endpoint',
+            NodeWrittenEvent::class,
+            null,
+            null,
+            null,
+            AuthMethod::None,
+            null,
+        );
+
+        $listener2 = $this->mapper->getById($listener1->getId());
+
+        $listener1->resetUpdatedFields();
+        $this->assertEquals($listener1, $listener2);
+    }
+
+    public function testInsertListenerAndGetItByUri(): void {
+        $uri = 'https://webhook.example.com/endpoint';
+        $listener1 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            $uri,
+            NodeWrittenEvent::class,
+            null,
+            null,
+            null,
+            AuthMethod::None,
+            null,
+        );
+
+        $listeners = $this->mapper->getByUri($uri);
+
+        $listener1->resetUpdatedFields();
+        $this->assertContains($listener1->getId(), array_map(fn ($listener) => $listener->getId(), $listeners));
+    }
+
+    public function testInsertListenerAndGetItWithAuthData(): void {
+        $listener1 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            'https://webhook.example.com/endpoint',
+            NodeWrittenEvent::class,
+            null,
+            null,
+            null,
+            AuthMethod::Header,
+            ['secretHeader' => 'header'],
+        );
+
+        $listener2 = $this->mapper->getById($listener1->getId());
+
+        $listener1->resetUpdatedFields();
+        $this->assertEquals($listener1, $listener2);
+    }
+
+    public function testInsertListenerAndGetItByEventAndUser(): void {
+        $listener1 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            'https://webhook.example.com/endpoint',
+            NodeWrittenEvent::class,
+            null,
+            'alice',
+            null,
+            AuthMethod::None,
+            null,
+        );
+        $listener1->resetUpdatedFields();
+
+        $this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents('alice'));
+        $this->assertEquals([], $this->mapper->getAllConfiguredEvents(''));
+        $this->assertEquals([], $this->mapper->getAllConfiguredEvents('otherUser'));
+
+        $this->assertEquals([$listener1], $this->mapper->getByEvent(NodeWrittenEvent::class, 'alice'));
+        $this->assertEquals([], $this->mapper->getByEvent(NodeWrittenEvent::class, ''));
+        $this->assertEquals([], $this->mapper->getByEvent(NodeWrittenEvent::class, 'otherUser'));
+
+        /* Add a second listener with no user filter */
+        $listener2 = $this->mapper->addWebhookListener(
+            null,
+            'bob',
+            'POST',
+            'https://webhook.example.com/endpoint',
+            NodeWrittenEvent::class,
+            null,
+            '',
+            null,
+            AuthMethod::None,
+            null,
+        );
+        $listener2->resetUpdatedFields();
+
+        $this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents('alice'));
+        $this->assertEquals([NodeWrittenEvent::class], $this->mapper->getAllConfiguredEvents(''));
+
+        $this->assertEquals([$listener1, $listener2], $this->mapper->getByEvent(NodeWrittenEvent::class, 'alice'));
+        $this->assertEquals([$listener2], $this->mapper->getByEvent(NodeWrittenEvent::class, 'otherUser'));
+        $this->assertEquals([$listener2], $this->mapper->getByEvent(NodeWrittenEvent::class));
+    }
 }

apps/updatenotification/tests/Controller/AdminControllerTest.php

Indentation +53 added lines, -53 removed lines

@@ -22,63 +22,63 @@
 use Test\TestCase;
 
 class AdminControllerTest extends TestCase {
-	private IRequest&MockObject $request;
-	private IJobList&MockObject $jobList;
-	private ISecureRandom&MockObject $secureRandom;
-	private IConfig&MockObject $config;
-	private ITimeFactory&MockObject $timeFactory;
-	private IL10N&MockObject $l10n;
-	private IAppConfig&MockObject $appConfig;
+    private IRequest&MockObject $request;
+    private IJobList&MockObject $jobList;
+    private ISecureRandom&MockObject $secureRandom;
+    private IConfig&MockObject $config;
+    private ITimeFactory&MockObject $timeFactory;
+    private IL10N&MockObject $l10n;
+    private IAppConfig&MockObject $appConfig;
 
-	private AdminController $adminController;
+    private AdminController $adminController;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->request = $this->createMock(IRequest::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->secureRandom = $this->createMock(ISecureRandom::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->l10n = $this->createMock(IL10N::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->secureRandom = $this->createMock(ISecureRandom::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->l10n = $this->createMock(IL10N::class);
 
-		$this->adminController = new AdminController(
-			'updatenotification',
-			$this->request,
-			$this->jobList,
-			$this->secureRandom,
-			$this->config,
-			$this->appConfig,
-			$this->timeFactory,
-			$this->l10n
-		);
-	}
+        $this->adminController = new AdminController(
+            'updatenotification',
+            $this->request,
+            $this->jobList,
+            $this->secureRandom,
+            $this->config,
+            $this->appConfig,
+            $this->timeFactory,
+            $this->l10n
+        );
+    }
 
-	public function testCreateCredentials(): void {
-		$this->jobList
-			->expects($this->once())
-			->method('add')
-			->with(ResetToken::class);
-		$this->secureRandom
-			->expects($this->once())
-			->method('generate')
-			->with(64)
-			->willReturn('MyGeneratedToken');
-		$this->config
-			->expects($this->once())
-			->method('setSystemValue')
-			->with('updater.secret');
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(12345);
-		$this->appConfig
-			->expects($this->once())
-			->method('setValueInt')
-			->with('core', 'updater.secret.created', 12345);
+    public function testCreateCredentials(): void {
+        $this->jobList
+            ->expects($this->once())
+            ->method('add')
+            ->with(ResetToken::class);
+        $this->secureRandom
+            ->expects($this->once())
+            ->method('generate')
+            ->with(64)
+            ->willReturn('MyGeneratedToken');
+        $this->config
+            ->expects($this->once())
+            ->method('setSystemValue')
+            ->with('updater.secret');
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(12345);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setValueInt')
+            ->with('core', 'updater.secret.created', 12345);
 
-		$expected = new DataResponse('MyGeneratedToken');
-		$this->assertEquals($expected, $this->adminController->createCredentials());
-	}
+        $expected = new DataResponse('MyGeneratedToken');
+        $this->assertEquals($expected, $this->adminController->createCredentials());
+    }
 }

apps/updatenotification/tests/Settings/AdminTest.php

Indentation +437 added lines, -437 removed lines

@@ -29,441 +29,441 @@
 use Test\TestCase;
 
 class AdminTest extends TestCase {
-	private IFactory&MockObject $l10nFactory;
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private UpdateChecker&MockObject $updateChecker;
-	private IGroupManager&MockObject $groupManager;
-	private IDateTimeFormatter&MockObject $dateTimeFormatter;
-	private IRegistry&MockObject $subscriptionRegistry;
-	private IUserManager&MockObject $userManager;
-	private LoggerInterface&MockObject $logger;
-	private IInitialState&MockObject $initialState;
-	private ServerVersion&MockObject $serverVersion;
-	private Admin $admin;
-
-	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->serverVersion = $this->createMock(ServerVersion::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,
-			$this->serverVersion,
-		);
-	}
-
-	public function testGetFormWithUpdate(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('daily');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, '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' => 'daily',
-				'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(Application::APP_NAME, 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndChangedUpdateServer(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('beta');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-
-		$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->appConfig
-			->expects($this->once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, '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' => 'beta',
-				'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(Application::APP_NAME, 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('production');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-
-		$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->appConfig
-			->expects(self::once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, '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' => 'production',
-				'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(Application::APP_NAME, '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 static function changesProvider(): array {
-		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);
-	}
+    private IFactory&MockObject $l10nFactory;
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private UpdateChecker&MockObject $updateChecker;
+    private IGroupManager&MockObject $groupManager;
+    private IDateTimeFormatter&MockObject $dateTimeFormatter;
+    private IRegistry&MockObject $subscriptionRegistry;
+    private IUserManager&MockObject $userManager;
+    private LoggerInterface&MockObject $logger;
+    private IInitialState&MockObject $initialState;
+    private ServerVersion&MockObject $serverVersion;
+    private Admin $admin;
+
+    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->serverVersion = $this->createMock(ServerVersion::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,
+            $this->serverVersion,
+        );
+    }
+
+    public function testGetFormWithUpdate(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('daily');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, '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' => 'daily',
+                '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(Application::APP_NAME, 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndChangedUpdateServer(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('beta');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+
+        $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->appConfig
+            ->expects($this->once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, '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' => 'beta',
+                '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(Application::APP_NAME, 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('production');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+
+        $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->appConfig
+            ->expects(self::once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, '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' => 'production',
+                '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(Application::APP_NAME, '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 static function changesProvider(): array {
+        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);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -395,7 +395,7 @@ 
 
 	public static function changesProvider(): array {
 		return [
-			[ #0, all info, en
+			[#0, all info, en
 				[
 					'changelogURL' => 'https://go.to.changelog',
 					'whatsNew' => [
@@ -415,7 +415,7 @@ 
 					],
 				]
 			],
-			[ #1, all info, de
+			[#1, all info, de
 				[
 					'changelogURL' => 'https://go.to.changelog',
 					'whatsNew' => [
@@ -435,12 +435,12 @@ 
 					]
 				],
 			],
-			[ #2, just changelog
-				[ 'changelogURL' => 'https://go.to.changelog' ],
+			[#2, just changelog
+				['changelogURL' => 'https://go.to.changelog'],
 				'en',
-				[ 'changelogURL' => 'https://go.to.changelog' ],
+				['changelogURL' => 'https://go.to.changelog'],
 			],
-			[ #3 nothing
+			[#3 nothing
 				[],
 				'ru',
 				[]

apps/updatenotification/tests/Notification/NotifierTest.php

Indentation +76 added lines, -76 removed lines

@@ -25,87 +25,87 @@
 
 class NotifierTest extends TestCase {
 
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected IAppConfig&MockObject $appConfig;
-	protected IManager&MockObject $notificationManager;
-	protected IFactory&MockObject $l10nFactory;
-	protected IUserSession&MockObject $userSession;
-	protected IGroupManager&MockObject $groupManager;
-	protected IAppManager&MockObject $appManager;
-	protected ServerVersion&MockObject $serverVersion;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected IAppConfig&MockObject $appConfig;
+    protected IManager&MockObject $notificationManager;
+    protected IFactory&MockObject $l10nFactory;
+    protected IUserSession&MockObject $userSession;
+    protected IGroupManager&MockObject $groupManager;
+    protected IAppManager&MockObject $appManager;
+    protected ServerVersion&MockObject $serverVersion;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-	}
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+    }
 
-	/**
-	 * @param array $methods
-	 * @return Notifier|MockObject
-	 */
-	protected function getNotifier(array $methods = []): Notifier {
-		if (empty($methods)) {
-			return new Notifier(
-				$this->urlGenerator,
-				$this->appConfig,
-				$this->notificationManager,
-				$this->l10nFactory,
-				$this->userSession,
-				$this->groupManager,
-				$this->appManager,
-				$this->serverVersion,
-			);
-		}
-		{
-			return $this->getMockBuilder(Notifier::class)
-				->setConstructorArgs([
-					$this->urlGenerator,
-					$this->appConfig,
-					$this->notificationManager,
-					$this->l10nFactory,
-					$this->userSession,
-					$this->groupManager,
-					$this->appManager,
-					$this->serverVersion,
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-	}
+    /**
+     * @param array $methods
+     * @return Notifier|MockObject
+     */
+    protected function getNotifier(array $methods = []): Notifier {
+        if (empty($methods)) {
+            return new Notifier(
+                $this->urlGenerator,
+                $this->appConfig,
+                $this->notificationManager,
+                $this->l10nFactory,
+                $this->userSession,
+                $this->groupManager,
+                $this->appManager,
+                $this->serverVersion,
+            );
+        }
+        {
+            return $this->getMockBuilder(Notifier::class)
+                ->setConstructorArgs([
+                    $this->urlGenerator,
+                    $this->appConfig,
+                    $this->notificationManager,
+                    $this->l10nFactory,
+                    $this->userSession,
+                    $this->groupManager,
+                    $this->appManager,
+                    $this->serverVersion,
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+        }
+    }
 
-	public static function dataUpdateAlreadyInstalledCheck(): array {
-		return [
-			['1.1.0', '1.0.0', false],
-			['1.1.0', '1.1.0', true],
-			['1.1.0', '1.2.0', true],
-		];
-	}
+    public static function dataUpdateAlreadyInstalledCheck(): array {
+        return [
+            ['1.1.0', '1.0.0', false],
+            ['1.1.0', '1.1.0', true],
+            ['1.1.0', '1.2.0', true],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataUpdateAlreadyInstalledCheck
-	 */
-	public function testUpdateAlreadyInstalledCheck(string $versionNotification, string $versionInstalled, bool $exception): void {
-		$notifier = $this->getNotifier();
+    /**
+     * @dataProvider dataUpdateAlreadyInstalledCheck
+     */
+    public function testUpdateAlreadyInstalledCheck(string $versionNotification, string $versionInstalled, bool $exception): void {
+        $notifier = $this->getNotifier();
 
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->once())
-			->method('getObjectId')
-			->willReturn($versionNotification);
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->once())
+            ->method('getObjectId')
+            ->willReturn($versionNotification);
 
-		try {
-			self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
-			$this->assertFalse($exception);
-		} catch (\Exception $e) {
-			$this->assertTrue($exception);
-			$this->assertInstanceOf(AlreadyProcessedException::class, $e);
-		}
-	}
+        try {
+            self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
+            $this->assertFalse($exception);
+        } catch (\Exception $e) {
+            $this->assertTrue($exception);
+            $this->assertInstanceOf(AlreadyProcessedException::class, $e);
+        }
+    }
 }

apps/updatenotification/tests/BackgroundJob/ResetTokenTest.php

Indentation +67 added lines, -67 removed lines

@@ -16,78 +16,78 @@
 use Test\TestCase;
 
 class ResetTokenTest extends TestCase {
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private ITimeFactory&MockObject $timeFactory;
-	private BackgroundJobResetToken $resetTokenBackgroundJob;
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private ITimeFactory&MockObject $timeFactory;
+    private BackgroundJobResetToken $resetTokenBackgroundJob;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->resetTokenBackgroundJob = new BackgroundJobResetToken(
-			$this->timeFactory,
-			$this->config,
-			$this->appConfig,
-		);
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->resetTokenBackgroundJob = new BackgroundJobResetToken(
+            $this->timeFactory,
+            $this->config,
+            $this->appConfig,
+        );
+    }
 
-	public function testRunWithNotExpiredToken(): void {
-		$this->timeFactory
-			->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturn(123);
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'updater.secret.created', 123);
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('config_is_read_only')
-			->willReturn(false);
-		$this->config
-			->expects($this->never())
-			->method('deleteSystemValue');
+    public function testRunWithNotExpiredToken(): void {
+        $this->timeFactory
+            ->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'updater.secret.created', 123);
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('config_is_read_only')
+            ->willReturn(false);
+        $this->config
+            ->expects($this->never())
+            ->method('deleteSystemValue');
 
-		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
-	}
+        static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
+    }
 
-	public function testRunWithExpiredToken(): void {
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1455045234);
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'updater.secret.created', 1455045234)
-			->willReturn(2 * 24 * 60 * 60 + 1); // over 2 days
-		$this->config
-			->expects($this->once())
-			->method('deleteSystemValue')
-			->with('updater.secret');
+    public function testRunWithExpiredToken(): void {
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1455045234);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'updater.secret.created', 1455045234)
+            ->willReturn(2 * 24 * 60 * 60 + 1); // over 2 days
+        $this->config
+            ->expects($this->once())
+            ->method('deleteSystemValue')
+            ->with('updater.secret');
 
-		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
-	}
+        static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
+    }
 
-	public function testRunWithExpiredTokenAndReadOnlyConfigFile(): void {
-		$this->timeFactory
-			->expects($this->never())
-			->method('getTime');
-		$this->appConfig
-			->expects($this->never())
-			->method('getValueInt');
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('config_is_read_only')
-			->willReturn(true);
-		$this->config
-			->expects($this->never())
-			->method('deleteSystemValue');
+    public function testRunWithExpiredTokenAndReadOnlyConfigFile(): void {
+        $this->timeFactory
+            ->expects($this->never())
+            ->method('getTime');
+        $this->appConfig
+            ->expects($this->never())
+            ->method('getValueInt');
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('config_is_read_only')
+            ->willReturn(true);
+        $this->config
+            ->expects($this->never())
+            ->method('deleteSystemValue');
 
-		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
-	}
+        static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
+    }
 }

apps/updatenotification/tests/BackgroundJob/UpdateAvailableNotificationsTest.php

Indentation +422 added lines, -422 removed lines

@@ -25,426 +25,426 @@
 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);
-	}
-
-	/**
-	 * @return UpdateAvailableNotifications|MockObject
-	 */
-	protected function getJob(array $methods = []): UpdateAvailableNotifications {
-		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 static 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
-	 */
-	public function testCheckCoreUpdate(string $channel, mixed $versionCheck, mixed $version, ?string $readableVersion, ?int $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 static function dataCheckAppUpdates(): array {
-		return [
-			[
-				['app1', 'app2'],
-				[
-					['app1', false],
-					['app2', '1.9.2'],
-				],
-				[
-					['app2', '1.9.2', ''],
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCheckAppUpdates
-	 */
-	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 static 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
-	 */
-	public function testCreateNotifications(string $app, string $version, string|false $lastNotification, string|false $callDelete, bool $createNotification, ?array $users, ?array $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 static 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
-	 */
-	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 static 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);
+    }
+
+    /**
+     * @return UpdateAvailableNotifications|MockObject
+     */
+    protected function getJob(array $methods = []): UpdateAvailableNotifications {
+        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 static 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
+     */
+    public function testCheckCoreUpdate(string $channel, mixed $versionCheck, mixed $version, ?string $readableVersion, ?int $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 static function dataCheckAppUpdates(): array {
+        return [
+            [
+                ['app1', 'app2'],
+                [
+                    ['app1', false],
+                    ['app2', '1.9.2'],
+                ],
+                [
+                    ['app2', '1.9.2', ''],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCheckAppUpdates
+     */
+    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 static 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
+     */
+    public function testCreateNotifications(string $app, string $version, string|false $lastNotification, string|false $callDelete, bool $createNotification, ?array $users, ?array $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 static 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
+     */
+    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 static 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 +2 added lines, -2 removed lines

@@ -251,7 +251,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++;
 			});
@@ -271,7 +271,7 @@ 
 	/**
 	 * @dataProvider dataCreateNotifications
 	 */
-	public function testCreateNotifications(string $app, string $version, string|false $lastNotification, string|false $callDelete, bool $createNotification, ?array $users, ?array $userNotifications): void {
+	public function testCreateNotifications(string $app, string $version, string | false $lastNotification, string | false $callDelete, bool $createNotification, ?array $users, ?array $userNotifications): void {
 		$job = $this->getJob([
 			'deleteOutdatedNotifications',
 			'getUsersToNotify',

apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php

Indentation +84 added lines, -84 removed lines

@@ -19,88 +19,88 @@
  * @group DB
  */
 class BackupCodeMapperTest extends TestCase {
-	private IDBConnection $db;
-	private BackupCodeMapper $mapper;
-	private string $testUID = 'test123456';
-
-	private function resetDB() {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->mapper->getTableName())
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->testUID)));
-		$qb->execute();
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->db = Server::get(IDBConnection::class);
-		$this->mapper = Server::get(BackupCodeMapper::class);
-
-		$this->resetDB();
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-
-		$this->resetDB();
-	}
-
-	public function testGetBackupCodes(): void {
-		$code1 = new BackupCode();
-		$code1->setUserId($this->testUID);
-		$code1->setCode('1|$2y$10$Fyo.DkMtkaHapVvRVbQBeeIdi5x/6nmPnxiBzD0GDKa08NMus5xze');
-		$code1->setUsed(1);
-
-		$code2 = new BackupCode();
-		$code2->setUserId($this->testUID);
-		$code2->setCode('1|$2y$10$nj3sZaCqGN8t6.SsnNADt.eX34UCkdX6FPx.r.rIwE6Jj3vi5wyt2');
-		$code2->setUsed(0);
-
-		$this->mapper->insert($code1);
-		$this->mapper->insert($code2);
-
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn($this->testUID);
-
-		$dbCodes = $this->mapper->getBackupCodes($user);
-
-		$this->assertCount(2, $dbCodes);
-		$this->assertInstanceOf(BackupCode::class, $dbCodes[0]);
-		$this->assertInstanceOf(BackupCode::class, $dbCodes[1]);
-	}
-
-	public function testDeleteCodes(): void {
-		$code = new BackupCode();
-		$code->setUserId($this->testUID);
-		$code->setCode('1|$2y$10$CagG8pEhZL.xDirtCCP/KuuWtnsAasgq60zY9rU46dBK4w8yW0Z/y');
-		$code->setUsed(1);
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn($this->testUID);
-
-		$this->mapper->insert($code);
-
-		$this->assertCount(1, $this->mapper->getBackupCodes($user));
-
-		$this->mapper->deleteCodes($user);
-
-		$this->assertCount(0, $this->mapper->getBackupCodes($user));
-	}
-
-	public function testInsertArgonEncryptedCodes(): void {
-		$code = new BackupCode();
-		$code->setUserId($this->testUID);
-		$code->setCode('2|$argon2i$v=19$m=1024,t=2,p=2$MjJWUjRFWndtMm5BWGxOag$BusVxLeFyiLLWtaVvX/JRFBiPdZcjRrzpQ/rAhn6vqY');
-		$code->setUsed(1);
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn($this->testUID);
-
-		$this->mapper->insert($code);
-		$this->assertCount(1, $this->mapper->getBackupCodes($user));
-	}
+    private IDBConnection $db;
+    private BackupCodeMapper $mapper;
+    private string $testUID = 'test123456';
+
+    private function resetDB() {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->mapper->getTableName())
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->testUID)));
+        $qb->execute();
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->db = Server::get(IDBConnection::class);
+        $this->mapper = Server::get(BackupCodeMapper::class);
+
+        $this->resetDB();
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+
+        $this->resetDB();
+    }
+
+    public function testGetBackupCodes(): void {
+        $code1 = new BackupCode();
+        $code1->setUserId($this->testUID);
+        $code1->setCode('1|$2y$10$Fyo.DkMtkaHapVvRVbQBeeIdi5x/6nmPnxiBzD0GDKa08NMus5xze');
+        $code1->setUsed(1);
+
+        $code2 = new BackupCode();
+        $code2->setUserId($this->testUID);
+        $code2->setCode('1|$2y$10$nj3sZaCqGN8t6.SsnNADt.eX34UCkdX6FPx.r.rIwE6Jj3vi5wyt2');
+        $code2->setUsed(0);
+
+        $this->mapper->insert($code1);
+        $this->mapper->insert($code2);
+
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->once())
+            ->method('getUID')
+            ->willReturn($this->testUID);
+
+        $dbCodes = $this->mapper->getBackupCodes($user);
+
+        $this->assertCount(2, $dbCodes);
+        $this->assertInstanceOf(BackupCode::class, $dbCodes[0]);
+        $this->assertInstanceOf(BackupCode::class, $dbCodes[1]);
+    }
+
+    public function testDeleteCodes(): void {
+        $code = new BackupCode();
+        $code->setUserId($this->testUID);
+        $code->setCode('1|$2y$10$CagG8pEhZL.xDirtCCP/KuuWtnsAasgq60zY9rU46dBK4w8yW0Z/y');
+        $code->setUsed(1);
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn($this->testUID);
+
+        $this->mapper->insert($code);
+
+        $this->assertCount(1, $this->mapper->getBackupCodes($user));
+
+        $this->mapper->deleteCodes($user);
+
+        $this->assertCount(0, $this->mapper->getBackupCodes($user));
+    }
+
+    public function testInsertArgonEncryptedCodes(): void {
+        $code = new BackupCode();
+        $code->setUserId($this->testUID);
+        $code->setCode('2|$argon2i$v=19$m=1024,t=2,p=2$MjJWUjRFWndtMm5BWGxOag$BusVxLeFyiLLWtaVvX/JRFBiPdZcjRrzpQ/rAhn6vqY');
+        $code->setUsed(1);
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn($this->testUID);
+
+        $this->mapper->insert($code);
+        $this->assertCount(1, $this->mapper->getBackupCodes($user));
+    }
 }

apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php

Indentation +59 added lines, -59 removed lines

@@ -20,71 +20,71 @@
  * @group DB
  */
 class BackupCodeStorageTest extends TestCase {
-	private IManager&MockObject $notificationManager;
-	private string $testUID = 'test123456789';
-	private BackupCodeStorage $storage;
+    private IManager&MockObject $notificationManager;
+    private string $testUID = 'test123456789';
+    private BackupCodeStorage $storage;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->storage = Server::get(BackupCodeStorage::class);
+        $this->storage = Server::get(BackupCodeStorage::class);
 
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->notificationManager->method('createNotification')
-			->willReturn(Server::get(IManager::class)->createNotification());
-		$this->overwriteService(IManager::class, $this->notificationManager);
-	}
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->notificationManager->method('createNotification')
+            ->willReturn(Server::get(IManager::class)->createNotification());
+        $this->overwriteService(IManager::class, $this->notificationManager);
+    }
 
-	public function testSimpleWorkFlow(): void {
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn($this->testUID);
+    public function testSimpleWorkFlow(): void {
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn($this->testUID);
 
-		$this->notificationManager->expects($this->once())
-			->method('markProcessed')
-			->with($this->callback(function (INotification $notification) {
-				return $notification->getUser() === $this->testUID &&
-					$notification->getObjectType() === 'create' &&
-					$notification->getObjectId() === 'codes' &&
-					$notification->getApp() === 'twofactor_backupcodes';
-			}));
+        $this->notificationManager->expects($this->once())
+            ->method('markProcessed')
+            ->with($this->callback(function (INotification $notification) {
+                return $notification->getUser() === $this->testUID &&
+                    $notification->getObjectType() === 'create' &&
+                    $notification->getObjectId() === 'codes' &&
+                    $notification->getApp() === 'twofactor_backupcodes';
+            }));
 
-		// Create codes
-		$codes = $this->storage->createCodes($user, 5);
-		$this->assertCount(5, $codes);
-		$this->assertTrue($this->storage->hasBackupCodes($user));
-		$initialState = [
-			'enabled' => true,
-			'total' => 5,
-			'used' => 0,
-		];
-		$this->assertEquals($initialState, $this->storage->getBackupCodesState($user));
+        // Create codes
+        $codes = $this->storage->createCodes($user, 5);
+        $this->assertCount(5, $codes);
+        $this->assertTrue($this->storage->hasBackupCodes($user));
+        $initialState = [
+            'enabled' => true,
+            'total' => 5,
+            'used' => 0,
+        ];
+        $this->assertEquals($initialState, $this->storage->getBackupCodesState($user));
 
-		// Use codes
-		$code = $codes[2];
-		$this->assertTrue($this->storage->validateCode($user, $code));
-		// Code must not be used twice
-		$this->assertFalse($this->storage->validateCode($user, $code));
-		// Invalid codes are invalid
-		$this->assertFalse($this->storage->validateCode($user, 'I DO NOT EXIST'));
-		$stateAfter = [
-			'enabled' => true,
-			'total' => 5,
-			'used' => 1,
-		];
-		$this->assertEquals($stateAfter, $this->storage->getBackupCodesState($user));
+        // Use codes
+        $code = $codes[2];
+        $this->assertTrue($this->storage->validateCode($user, $code));
+        // Code must not be used twice
+        $this->assertFalse($this->storage->validateCode($user, $code));
+        // Invalid codes are invalid
+        $this->assertFalse($this->storage->validateCode($user, 'I DO NOT EXIST'));
+        $stateAfter = [
+            'enabled' => true,
+            'total' => 5,
+            'used' => 1,
+        ];
+        $this->assertEquals($stateAfter, $this->storage->getBackupCodesState($user));
 
-		// Deplete codes
-		$this->assertTrue($this->storage->validateCode($user, $codes[0]));
-		$this->assertTrue($this->storage->validateCode($user, $codes[1]));
-		$this->assertTrue($this->storage->validateCode($user, $codes[3]));
-		$this->assertTrue($this->storage->validateCode($user, $codes[4]));
-		$stateAllUsed = [
-			'enabled' => true,
-			'total' => 5,
-			'used' => 5,
-		];
-		$this->assertEquals($stateAllUsed, $this->storage->getBackupCodesState($user));
-	}
+        // Deplete codes
+        $this->assertTrue($this->storage->validateCode($user, $codes[0]));
+        $this->assertTrue($this->storage->validateCode($user, $codes[1]));
+        $this->assertTrue($this->storage->validateCode($user, $codes[3]));
+        $this->assertTrue($this->storage->validateCode($user, $codes[4]));
+        $stateAllUsed = [
+            'enabled' => true,
+            'total' => 5,
+            'used' => 5,
+        ];
+        $this->assertEquals($stateAllUsed, $this->storage->getBackupCodesState($user));
+    }
 }