nextcloud / server

tests/lib/Authentication/TwoFactorAuth/RegistryTest.php

Indentation +117 added lines, -117 removed lines

@@ -24,121 +24,121 @@
 use Test\TestCase;
 
 class RegistryTest extends TestCase {
-	/** @var ProviderUserAssignmentDao|MockObject */
-	private $dao;
-
-	/** @var IEventDispatcher|MockObject */
-	private $dispatcher;
-
-	/** @var Registry */
-	private $registry;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->dao = $this->createMock(ProviderUserAssignmentDao::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-
-		$this->registry = new Registry($this->dao, $this->dispatcher);
-	}
-
-	public function testGetProviderStates(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('user123');
-		$state = [
-			'twofactor_totp' => true,
-		];
-		$this->dao->expects($this->once())->method('getState')->willReturn($state);
-
-		$actual = $this->registry->getProviderStates($user);
-
-		$this->assertEquals($state, $actual);
-	}
-
-	public function testEnableProvider(): void {
-		$user = $this->createMock(IUser::class);
-		$provider = $this->createMock(IProvider::class);
-		$user->expects($this->once())->method('getUID')->willReturn('user123');
-		$provider->expects($this->once())->method('getId')->willReturn('p1');
-		$this->dao->expects($this->once())->method('persist')->with('p1', 'user123',
-			true);
-
-		$this->dispatcher->expects($this->once())
-			->method('dispatch')
-			->with(
-				$this->equalTo(IRegistry::EVENT_PROVIDER_ENABLED),
-				$this->callback(function (RegistryEvent $e) use ($user, $provider) {
-					return $e->getUser() === $user && $e->getProvider() === $provider;
-				})
-			);
-		$this->dispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new TwoFactorProviderForUserRegistered(
-				$user,
-				$provider,
-			));
-
-		$this->registry->enableProviderFor($provider, $user);
-	}
-
-	public function testDisableProvider(): void {
-		$user = $this->createMock(IUser::class);
-		$provider = $this->createMock(IProvider::class);
-		$user->expects($this->once())->method('getUID')->willReturn('user123');
-		$provider->expects($this->once())->method('getId')->willReturn('p1');
-		$this->dao->expects($this->once())->method('persist')->with('p1', 'user123',
-			false);
-
-
-		$this->dispatcher->expects($this->once())
-			->method('dispatch')
-			->with(
-				$this->equalTo(IRegistry::EVENT_PROVIDER_DISABLED),
-				$this->callback(function (RegistryEvent $e) use ($user, $provider) {
-					return $e->getUser() === $user && $e->getProvider() === $provider;
-				})
-			);
-		$this->dispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with(new TwoFactorProviderForUserUnregistered(
-				$user,
-				$provider,
-			));
-
-		$this->registry->disableProviderFor($provider, $user);
-	}
-
-	public function testDeleteUserData(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('user123');
-		$this->dao->expects($this->once())
-			->method('deleteByUser')
-			->with('user123')
-			->willReturn([
-				[
-					'provider_id' => 'twofactor_u2f',
-				]
-			]);
-
-		$calls = [
-			[new TwoFactorProviderDisabled('twofactor_u2f')],
-			[new TwoFactorProviderUserDeleted($user, 'twofactor_u2f')],
-		];
-		$this->dispatcher->expects($this->exactly(2))
-			->method('dispatchTyped')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->registry->deleteUserData($user);
-	}
-
-	public function testCleanUp(): void {
-		$this->dao->expects($this->once())
-			->method('deleteAll')
-			->with('twofactor_u2f');
-
-		$this->registry->cleanUp('twofactor_u2f');
-	}
+    /** @var ProviderUserAssignmentDao|MockObject */
+    private $dao;
+
+    /** @var IEventDispatcher|MockObject */
+    private $dispatcher;
+
+    /** @var Registry */
+    private $registry;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->dao = $this->createMock(ProviderUserAssignmentDao::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+
+        $this->registry = new Registry($this->dao, $this->dispatcher);
+    }
+
+    public function testGetProviderStates(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('user123');
+        $state = [
+            'twofactor_totp' => true,
+        ];
+        $this->dao->expects($this->once())->method('getState')->willReturn($state);
+
+        $actual = $this->registry->getProviderStates($user);
+
+        $this->assertEquals($state, $actual);
+    }
+
+    public function testEnableProvider(): void {
+        $user = $this->createMock(IUser::class);
+        $provider = $this->createMock(IProvider::class);
+        $user->expects($this->once())->method('getUID')->willReturn('user123');
+        $provider->expects($this->once())->method('getId')->willReturn('p1');
+        $this->dao->expects($this->once())->method('persist')->with('p1', 'user123',
+            true);
+
+        $this->dispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(
+                $this->equalTo(IRegistry::EVENT_PROVIDER_ENABLED),
+                $this->callback(function (RegistryEvent $e) use ($user, $provider) {
+                    return $e->getUser() === $user && $e->getProvider() === $provider;
+                })
+            );
+        $this->dispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new TwoFactorProviderForUserRegistered(
+                $user,
+                $provider,
+            ));
+
+        $this->registry->enableProviderFor($provider, $user);
+    }
+
+    public function testDisableProvider(): void {
+        $user = $this->createMock(IUser::class);
+        $provider = $this->createMock(IProvider::class);
+        $user->expects($this->once())->method('getUID')->willReturn('user123');
+        $provider->expects($this->once())->method('getId')->willReturn('p1');
+        $this->dao->expects($this->once())->method('persist')->with('p1', 'user123',
+            false);
+
+
+        $this->dispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(
+                $this->equalTo(IRegistry::EVENT_PROVIDER_DISABLED),
+                $this->callback(function (RegistryEvent $e) use ($user, $provider) {
+                    return $e->getUser() === $user && $e->getProvider() === $provider;
+                })
+            );
+        $this->dispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new TwoFactorProviderForUserUnregistered(
+                $user,
+                $provider,
+            ));
+
+        $this->registry->disableProviderFor($provider, $user);
+    }
+
+    public function testDeleteUserData(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('user123');
+        $this->dao->expects($this->once())
+            ->method('deleteByUser')
+            ->with('user123')
+            ->willReturn([
+                [
+                    'provider_id' => 'twofactor_u2f',
+                ]
+            ]);
+
+        $calls = [
+            [new TwoFactorProviderDisabled('twofactor_u2f')],
+            [new TwoFactorProviderUserDeleted($user, 'twofactor_u2f')],
+        ];
+        $this->dispatcher->expects($this->exactly(2))
+            ->method('dispatchTyped')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->registry->deleteUserData($user);
+    }
+
+    public function testCleanUp(): void {
+        $this->dao->expects($this->once())
+            ->method('deleteAll')
+            ->with('twofactor_u2f');
+
+        $this->registry->cleanUp('twofactor_u2f');
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			->method('dispatch')
 			->with(
 				$this->equalTo(IRegistry::EVENT_PROVIDER_ENABLED),
-				$this->callback(function (RegistryEvent $e) use ($user, $provider) {
+				$this->callback(function(RegistryEvent $e) use ($user, $provider) {
 					return $e->getUser() === $user && $e->getProvider() === $provider;
 				})
 			);
@@ -94,7 +94,7 @@ 
 			->method('dispatch')
 			->with(
 				$this->equalTo(IRegistry::EVENT_PROVIDER_DISABLED),
-				$this->callback(function (RegistryEvent $e) use ($user, $provider) {
+				$this->callback(function(RegistryEvent $e) use ($user, $provider) {
 					return $e->getUser() === $user && $e->getProvider() === $provider;
 				})
 			);
@@ -126,7 +126,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(2))
 			->method('dispatchTyped')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});

tests/lib/Authentication/TwoFactorAuth/ManagerTest.php

Indentation +762 added lines, -762 removed lines

@@ -30,766 +30,766 @@
 use function reset;
 
 class ManagerTest extends TestCase {
-	/** @var IUser|MockObject */
-	private $user;
-
-	/** @var ProviderLoader|MockObject */
-	private $providerLoader;
-
-	/** @var IRegistry|MockObject */
-	private $providerRegistry;
-
-	/** @var MandatoryTwoFactor|MockObject */
-	private $mandatoryTwoFactor;
-
-	/** @var ISession|MockObject */
-	private $session;
-
-	/** @var Manager */
-	private $manager;
-
-	/** @var IConfig|MockObject */
-	private $config;
-
-	/** @var IManager|MockObject */
-	private $activityManager;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var IProvider|MockObject */
-	private $fakeProvider;
-
-	/** @var IProvider|MockObject */
-	private $backupProvider;
-
-	/** @var TokenProvider|MockObject */
-	private $tokenProvider;
-
-	/** @var ITimeFactory|MockObject */
-	private $timeFactory;
-
-	/** @var IEventDispatcher|MockObject */
-	private $dispatcher;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->user = $this->createMock(IUser::class);
-		$this->providerLoader = $this->createMock(ProviderLoader::class);
-		$this->providerRegistry = $this->createMock(IRegistry::class);
-		$this->mandatoryTwoFactor = $this->createMock(MandatoryTwoFactor::class);
-		$this->session = $this->createMock(ISession::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->activityManager = $this->createMock(IManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->tokenProvider = $this->createMock(TokenProvider::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-
-		$this->manager = new Manager(
-			$this->providerLoader,
-			$this->providerRegistry,
-			$this->mandatoryTwoFactor,
-			$this->session,
-			$this->config,
-			$this->activityManager,
-			$this->logger,
-			$this->tokenProvider,
-			$this->timeFactory,
-			$this->dispatcher,
-		);
-
-		$this->fakeProvider = $this->createMock(IProvider::class);
-		$this->fakeProvider->method('getId')->willReturn('email');
-
-		$this->backupProvider = $this->getMockBuilder('\OCP\Authentication\TwoFactorAuth\IProvider')->getMock();
-		$this->backupProvider->method('getId')->willReturn('backup_codes');
-		$this->backupProvider->method('isTwoFactorAuthEnabledForUser')->willReturn(true);
-	}
-
-	private function prepareNoProviders() {
-		$this->providerLoader->method('getProviders')
-			->with($this->user)
-			->willReturn([]);
-	}
-
-	private function prepareProviders() {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->with($this->user)
-			->willReturn([
-				$this->fakeProvider->getId() => true,
-			]);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([$this->fakeProvider]);
-	}
-
-	private function prepareProvidersWitBackupProvider() {
-		$this->providerLoader->method('getProviders')
-			->with($this->user)
-			->willReturn([
-				$this->fakeProvider,
-				$this->backupProvider,
-			]);
-	}
-
-	public function testIsTwoFactorAuthenticatedEnforced(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('isEnforcedFor')
-			->with($this->user)
-			->willReturn(true);
-
-		$enabled = $this->manager->isTwoFactorAuthenticated($this->user);
-
-		$this->assertTrue($enabled);
-	}
-
-	public function testIsTwoFactorAuthenticatedNoProviders(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('isEnforcedFor')
-			->with($this->user)
-			->willReturn(false);
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->willReturn([]); // No providers registered
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->willReturn([]); // No providers loadable
-
-		$this->assertFalse($this->manager->isTwoFactorAuthenticated($this->user));
-	}
-
-	public function testIsTwoFactorAuthenticatedOnlyBackupCodes(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('isEnforcedFor')
-			->with($this->user)
-			->willReturn(false);
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->willReturn([
-				'backup_codes' => true,
-			]);
-		$backupCodesProvider = $this->createMock(IProvider::class);
-		$backupCodesProvider
-			->method('getId')
-			->willReturn('backup_codes');
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->willReturn([
-				$backupCodesProvider,
-			]);
-
-		$this->assertFalse($this->manager->isTwoFactorAuthenticated($this->user));
-	}
-
-	public function testIsTwoFactorAuthenticatedFailingProviders(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('isEnforcedFor')
-			->with($this->user)
-			->willReturn(false);
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->willReturn([
-				'twofactor_totp' => true,
-				'twofactor_u2f' => false,
-			]); // Two providers registered, but …
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->willReturn([]); // … none of them is able to load, however …
-
-		// … 2FA is still enforced
-		$this->assertTrue($this->manager->isTwoFactorAuthenticated($this->user));
-	}
-
-	public static function providerStatesFixData(): array {
-		return [
-			[false, false],
-			[true, true],
-		];
-	}
-
-	/**
-	 * If the 2FA registry has not been populated when a user logs in,
-	 * the 2FA manager has to first fix the state before it checks for
-	 * enabled providers.
-	 *
-	 * If any of these providers is active, 2FA is enabled
-	 *
-	 * @dataProvider providerStatesFixData
-	 */
-	public function testIsTwoFactorAuthenticatedFixesProviderStates(bool $providerEnabled, bool $expected): void {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->willReturn([]); // Nothing registered yet
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->willReturn([
-				$this->fakeProvider
-			]);
-		$this->fakeProvider->expects($this->once())
-			->method('isTwoFactorAuthEnabledForUser')
-			->with($this->user)
-			->willReturn($providerEnabled);
-		if ($providerEnabled) {
-			$this->providerRegistry->expects($this->once())
-				->method('enableProviderFor')
-				->with(
-					$this->fakeProvider,
-					$this->user
-				);
-		} else {
-			$this->providerRegistry->expects($this->once())
-				->method('disableProviderFor')
-				->with(
-					$this->fakeProvider,
-					$this->user
-				);
-		}
-
-		$this->assertEquals($expected, $this->manager->isTwoFactorAuthenticated($this->user));
-	}
-
-	public function testGetProvider(): void {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->with($this->user)
-			->willReturn([
-				$this->fakeProvider->getId() => true,
-			]);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([$this->fakeProvider]);
-
-		$provider = $this->manager->getProvider($this->user, $this->fakeProvider->getId());
-
-		$this->assertSame($this->fakeProvider, $provider);
-	}
-
-	public function testGetInvalidProvider(): void {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->with($this->user)
-			->willReturn([]);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([]);
-
-		$provider = $this->manager->getProvider($this->user, 'nonexistent');
-
-		$this->assertNull($provider);
-	}
-
-	public function testGetLoginSetupProviders(): void {
-		$provider1 = $this->createMock(IProvider::class);
-		$provider2 = $this->createMock(IActivatableAtLogin::class);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([
-				$provider1,
-				$provider2,
-			]);
-
-		$providers = $this->manager->getLoginSetupProviders($this->user);
-
-		$this->assertCount(1, $providers);
-		$this->assertSame($provider2, reset($providers));
-	}
-
-	public function testGetProviders(): void {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->with($this->user)
-			->willReturn([
-				$this->fakeProvider->getId() => true,
-			]);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([$this->fakeProvider]);
-		$expectedProviders = [
-			'email' => $this->fakeProvider,
-		];
-
-		$providerSet = $this->manager->getProviderSet($this->user);
-		$providers = $providerSet->getProviders();
-
-		$this->assertEquals($expectedProviders, $providers);
-		$this->assertFalse($providerSet->isProviderMissing());
-	}
-
-	public function testGetProvidersOneMissing(): void {
-		$this->providerRegistry->expects($this->once())
-			->method('getProviderStates')
-			->with($this->user)
-			->willReturn([
-				$this->fakeProvider->getId() => true,
-			]);
-		$this->providerLoader->expects($this->once())
-			->method('getProviders')
-			->with($this->user)
-			->willReturn([]);
-		$expectedProviders = [
-			'email' => $this->fakeProvider,
-		];
-
-		$providerSet = $this->manager->getProviderSet($this->user);
-
-		$this->assertTrue($providerSet->isProviderMissing());
-	}
-
-	public function testVerifyChallenge(): void {
-		$this->prepareProviders();
-
-		$challenge = 'passme';
-		$event = $this->createMock(IEvent::class);
-		$this->fakeProvider->expects($this->once())
-			->method('verifyChallenge')
-			->with($this->user, $challenge)
-			->willReturn(true);
-		$this->session->expects($this->once())
-			->method('get')
-			->with('two_factor_remember_login')
-			->willReturn(false);
-
-		$calls = [
-			['two_factor_auth_uid'],
-			['two_factor_remember_login'],
-		];
-		$this->session->expects($this->exactly(2))
-			->method('remove')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->session->expects($this->once())
-			->method('set')
-			->with(Manager::SESSION_UID_DONE, 'jos');
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-		$this->activityManager->expects($this->once())
-			->method('generateEvent')
-			->willReturn($event);
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn('jos');
-		$event->expects($this->once())
-			->method('setApp')
-			->with($this->equalTo('core'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setType')
-			->with($this->equalTo('security'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setAuthor')
-			->with($this->equalTo('jos'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setAffectedUser')
-			->with($this->equalTo('jos'))
-			->willReturnSelf();
-		$this->fakeProvider
-			->method('getDisplayName')
-			->willReturn('Fake 2FA');
-		$event->expects($this->once())
-			->method('setSubject')
-			->with($this->equalTo('twofactor_success'), $this->equalTo([
-				'provider' => 'Fake 2FA',
-			]))
-			->willReturnSelf();
-		$token = $this->createMock(OC\Authentication\Token\IToken::class);
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willReturn($token);
-		$token->method('getId')
-			->willReturn(42);
-		$this->config->expects($this->once())
-			->method('deleteUserValue')
-			->with('jos', 'login_token_2fa', '42');
-
-		$result = $this->manager->verifyChallenge('email', $this->user, $challenge);
-
-		$this->assertTrue($result);
-	}
-
-	public function testVerifyChallengeInvalidProviderId(): void {
-		$this->prepareProviders();
-
-		$challenge = 'passme';
-		$this->fakeProvider->expects($this->never())
-			->method('verifyChallenge')
-			->with($this->user, $challenge);
-		$this->session->expects($this->never())
-			->method('remove');
-
-		$this->assertFalse($this->manager->verifyChallenge('dontexist', $this->user, $challenge));
-	}
-
-	public function testVerifyInvalidChallenge(): void {
-		$this->prepareProviders();
-
-		$challenge = 'dontpassme';
-		$event = $this->createMock(IEvent::class);
-		$this->fakeProvider->expects($this->once())
-			->method('verifyChallenge')
-			->with($this->user, $challenge)
-			->willReturn(false);
-		$this->session->expects($this->never())
-			->method('remove');
-		$this->activityManager->expects($this->once())
-			->method('generateEvent')
-			->willReturn($event);
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn('jos');
-		$event->expects($this->once())
-			->method('setApp')
-			->with($this->equalTo('core'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setType')
-			->with($this->equalTo('security'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setAuthor')
-			->with($this->equalTo('jos'))
-			->willReturnSelf();
-		$event->expects($this->once())
-			->method('setAffectedUser')
-			->with($this->equalTo('jos'))
-			->willReturnSelf();
-		$this->fakeProvider
-			->method('getDisplayName')
-			->willReturn('Fake 2FA');
-		$event->expects($this->once())
-			->method('setSubject')
-			->with($this->equalTo('twofactor_failed'), $this->equalTo([
-				'provider' => 'Fake 2FA',
-			]))
-			->willReturnSelf();
-
-		$this->assertFalse($this->manager->verifyChallenge('email', $this->user, $challenge));
-	}
-
-	public function testNeedsSecondFactor(): void {
-		$user = $this->createMock(IUser::class);
-
-		$calls = [
-			['app_password'],
-			['two_factor_auth_uid'],
-			[Manager::SESSION_UID_DONE],
-		];
-		$this->session->expects($this->exactly(3))
-			->method('exists')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-				return false;
-			});
-
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-		$token = $this->createMock(OC\Authentication\Token\IToken::class);
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willReturn($token);
-		$token->method('getId')
-			->willReturn(42);
-
-		$user->method('getUID')
-			->willReturn('user');
-		$this->config->method('getUserKeys')
-			->with('user', 'login_token_2fa')
-			->willReturn([
-				'42'
-			]);
-
-		$manager = $this->getMockBuilder(Manager::class)
-			->setConstructorArgs([
-				$this->providerLoader,
-				$this->providerRegistry,
-				$this->mandatoryTwoFactor,
-				$this->session,
-				$this->config,
-				$this->activityManager,
-				$this->logger,
-				$this->tokenProvider,
-				$this->timeFactory,
-				$this->dispatcher,
-			])
-			->onlyMethods(['isTwoFactorAuthenticated'])// Do not actually load the apps
-			->getMock();
-
-		$manager->method('isTwoFactorAuthenticated')
-			->with($user)
-			->willReturn(true);
-
-		$this->assertTrue($manager->needsSecondFactor($user));
-	}
-
-	public function testNeedsSecondFactorUserIsNull(): void {
-		$user = null;
-		$this->session->expects($this->never())
-			->method('exists');
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testNeedsSecondFactorWithNoProviderAvailableAnymore(): void {
-		$this->prepareNoProviders();
-
-		$user = null;
-		$this->session->expects($this->never())
-			->method('exists')
-			->with('two_factor_auth_uid')
-			->willReturn(true);
-		$this->session->expects($this->never())
-			->method('remove')
-			->with('two_factor_auth_uid');
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testPrepareTwoFactorLogin(): void {
-		$this->user->method('getUID')
-			->willReturn('ferdinand');
-
-		$calls = [
-			['two_factor_auth_uid', 'ferdinand'],
-			['two_factor_remember_login', true],
-		];
-		$this->session->expects($this->exactly(2))
-			->method('set')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-		$token = $this->createMock(OC\Authentication\Token\IToken::class);
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willReturn($token);
-		$token->method('getId')
-			->willReturn(42);
-
-		$this->timeFactory->method('getTime')
-			->willReturn(1337);
-
-		$this->config->method('setUserValue')
-			->with('ferdinand', 'login_token_2fa', '42', '1337');
-
-
-		$this->manager->prepareTwoFactorLogin($this->user, true);
-	}
-
-	public function testPrepareTwoFactorLoginDontRemember(): void {
-		$this->user->method('getUID')
-			->willReturn('ferdinand');
-
-		$calls = [
-			['two_factor_auth_uid', 'ferdinand'],
-			['two_factor_remember_login', false],
-		];
-		$this->session->expects($this->exactly(2))
-			->method('set')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-		$token = $this->createMock(OC\Authentication\Token\IToken::class);
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willReturn($token);
-		$token->method('getId')
-			->willReturn(42);
-
-		$this->timeFactory->method('getTime')
-			->willReturn(1337);
-
-		$this->config->method('setUserValue')
-			->with('ferdinand', 'login_token_2fa', '42', '1337');
-
-		$this->manager->prepareTwoFactorLogin($this->user, false);
-	}
-
-	public function testNeedsSecondFactorSessionAuth(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn('user');
-
-		$this->session->method('exists')
-			->willReturnCallback(function ($var) {
-				if ($var === Manager::SESSION_UID_KEY) {
-					return false;
-				} elseif ($var === 'app_password') {
-					return false;
-				} elseif ($var === 'app_api') {
-					return false;
-				}
-				return true;
-			});
-		$this->session->method('get')
-			->willReturnCallback(function ($var) {
-				if ($var === Manager::SESSION_UID_KEY) {
-					return 'user';
-				} elseif ($var === 'app_api') {
-					return true;
-				}
-				return null;
-			});
-		$this->session->expects($this->once())
-			->method('get')
-			->willReturnMap([
-				[Manager::SESSION_UID_DONE, 'user'],
-				['app_api', true]
-			]);
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testNeedsSecondFactorSessionAuthFailDBPass(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn('user');
-
-		$this->session->method('exists')
-			->willReturn(false);
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-
-		$token = $this->createMock(OC\Authentication\Token\IToken::class);
-		$token->method('getId')
-			->willReturn(40);
-
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willReturn($token);
-
-		$this->config->method('getUserKeys')
-			->with('user', 'login_token_2fa')
-			->willReturn([
-				'42', '43', '44'
-			]);
-
-		$this->session->expects($this->once())
-			->method('set')
-			->with(Manager::SESSION_UID_DONE, 'user');
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testNeedsSecondFactorInvalidToken(): void {
-		$this->prepareNoProviders();
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn('user');
-
-		$this->session->method('exists')
-			->willReturn(false);
-		$this->session->method('getId')
-			->willReturn('mysessionid');
-
-		$this->tokenProvider->method('getToken')
-			->with('mysessionid')
-			->willThrowException(new OC\Authentication\Exceptions\InvalidTokenException());
-
-		$this->config->method('getUserKeys')->willReturn([]);
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testNeedsSecondFactorAppPassword(): void {
-		$user = $this->createMock(IUser::class);
-		$this->session->method('exists')
-			->willReturnMap([
-				['app_password', true],
-				['app_api', true]
-			]);
-
-		$this->assertFalse($this->manager->needsSecondFactor($user));
-	}
-
-	public function testClearTwoFactorPending() {
-		$this->config->method('getUserKeys')
-			->with('theUserId', 'login_token_2fa')
-			->willReturn([
-				'42', '43', '44'
-			]);
-
-		$deleteUserValueCalls = [
-			['theUserId', 'login_token_2fa', '42'],
-			['theUserId', 'login_token_2fa', '43'],
-			['theUserId', 'login_token_2fa', '44'],
-		];
-		$this->config->expects($this->exactly(3))
-			->method('deleteUserValue')
-			->willReturnCallback(function () use (&$deleteUserValueCalls) {
-				$expected = array_shift($deleteUserValueCalls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$invalidateCalls = [
-			['theUserId', 42],
-			['theUserId', 43],
-			['theUserId', 44],
-		];
-		$this->tokenProvider->expects($this->exactly(3))
-			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$invalidateCalls) {
-				$expected = array_shift($invalidateCalls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->manager->clearTwoFactorPending('theUserId');
-	}
-
-	public function testClearTwoFactorPendingTokenDoesNotExist() {
-		$this->config->method('getUserKeys')
-			->with('theUserId', 'login_token_2fa')
-			->willReturn([
-				'42', '43', '44'
-			]);
-
-		$deleteUserValueCalls = [
-			['theUserId', 'login_token_2fa', '42'],
-			['theUserId', 'login_token_2fa', '43'],
-			['theUserId', 'login_token_2fa', '44'],
-		];
-		$this->config->expects($this->exactly(3))
-			->method('deleteUserValue')
-			->willReturnCallback(function () use (&$deleteUserValueCalls) {
-				$expected = array_shift($deleteUserValueCalls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$invalidateCalls = [
-			['theUserId', 42],
-			['theUserId', 43],
-			['theUserId', 44],
-		];
-		$this->tokenProvider->expects($this->exactly(3))
-			->method('invalidateTokenById')
-			->willReturnCallback(function ($user, $tokenId) use (&$invalidateCalls) {
-				$expected = array_shift($invalidateCalls);
-				$this->assertEquals($expected, func_get_args());
-				if ($tokenId === 43) {
-					throw new DoesNotExistException('token does not exist');
-				}
-			});
-
-		$this->manager->clearTwoFactorPending('theUserId');
-	}
+    /** @var IUser|MockObject */
+    private $user;
+
+    /** @var ProviderLoader|MockObject */
+    private $providerLoader;
+
+    /** @var IRegistry|MockObject */
+    private $providerRegistry;
+
+    /** @var MandatoryTwoFactor|MockObject */
+    private $mandatoryTwoFactor;
+
+    /** @var ISession|MockObject */
+    private $session;
+
+    /** @var Manager */
+    private $manager;
+
+    /** @var IConfig|MockObject */
+    private $config;
+
+    /** @var IManager|MockObject */
+    private $activityManager;
+
+    /** @var LoggerInterface|MockObject */
+    private $logger;
+
+    /** @var IProvider|MockObject */
+    private $fakeProvider;
+
+    /** @var IProvider|MockObject */
+    private $backupProvider;
+
+    /** @var TokenProvider|MockObject */
+    private $tokenProvider;
+
+    /** @var ITimeFactory|MockObject */
+    private $timeFactory;
+
+    /** @var IEventDispatcher|MockObject */
+    private $dispatcher;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->user = $this->createMock(IUser::class);
+        $this->providerLoader = $this->createMock(ProviderLoader::class);
+        $this->providerRegistry = $this->createMock(IRegistry::class);
+        $this->mandatoryTwoFactor = $this->createMock(MandatoryTwoFactor::class);
+        $this->session = $this->createMock(ISession::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->activityManager = $this->createMock(IManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->tokenProvider = $this->createMock(TokenProvider::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+
+        $this->manager = new Manager(
+            $this->providerLoader,
+            $this->providerRegistry,
+            $this->mandatoryTwoFactor,
+            $this->session,
+            $this->config,
+            $this->activityManager,
+            $this->logger,
+            $this->tokenProvider,
+            $this->timeFactory,
+            $this->dispatcher,
+        );
+
+        $this->fakeProvider = $this->createMock(IProvider::class);
+        $this->fakeProvider->method('getId')->willReturn('email');
+
+        $this->backupProvider = $this->getMockBuilder('\OCP\Authentication\TwoFactorAuth\IProvider')->getMock();
+        $this->backupProvider->method('getId')->willReturn('backup_codes');
+        $this->backupProvider->method('isTwoFactorAuthEnabledForUser')->willReturn(true);
+    }
+
+    private function prepareNoProviders() {
+        $this->providerLoader->method('getProviders')
+            ->with($this->user)
+            ->willReturn([]);
+    }
+
+    private function prepareProviders() {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($this->user)
+            ->willReturn([
+                $this->fakeProvider->getId() => true,
+            ]);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([$this->fakeProvider]);
+    }
+
+    private function prepareProvidersWitBackupProvider() {
+        $this->providerLoader->method('getProviders')
+            ->with($this->user)
+            ->willReturn([
+                $this->fakeProvider,
+                $this->backupProvider,
+            ]);
+    }
+
+    public function testIsTwoFactorAuthenticatedEnforced(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('isEnforcedFor')
+            ->with($this->user)
+            ->willReturn(true);
+
+        $enabled = $this->manager->isTwoFactorAuthenticated($this->user);
+
+        $this->assertTrue($enabled);
+    }
+
+    public function testIsTwoFactorAuthenticatedNoProviders(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('isEnforcedFor')
+            ->with($this->user)
+            ->willReturn(false);
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->willReturn([]); // No providers registered
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->willReturn([]); // No providers loadable
+
+        $this->assertFalse($this->manager->isTwoFactorAuthenticated($this->user));
+    }
+
+    public function testIsTwoFactorAuthenticatedOnlyBackupCodes(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('isEnforcedFor')
+            ->with($this->user)
+            ->willReturn(false);
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->willReturn([
+                'backup_codes' => true,
+            ]);
+        $backupCodesProvider = $this->createMock(IProvider::class);
+        $backupCodesProvider
+            ->method('getId')
+            ->willReturn('backup_codes');
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->willReturn([
+                $backupCodesProvider,
+            ]);
+
+        $this->assertFalse($this->manager->isTwoFactorAuthenticated($this->user));
+    }
+
+    public function testIsTwoFactorAuthenticatedFailingProviders(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('isEnforcedFor')
+            ->with($this->user)
+            ->willReturn(false);
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->willReturn([
+                'twofactor_totp' => true,
+                'twofactor_u2f' => false,
+            ]); // Two providers registered, but …
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->willReturn([]); // … none of them is able to load, however …
+
+        // … 2FA is still enforced
+        $this->assertTrue($this->manager->isTwoFactorAuthenticated($this->user));
+    }
+
+    public static function providerStatesFixData(): array {
+        return [
+            [false, false],
+            [true, true],
+        ];
+    }
+
+    /**
+     * If the 2FA registry has not been populated when a user logs in,
+     * the 2FA manager has to first fix the state before it checks for
+     * enabled providers.
+     *
+     * If any of these providers is active, 2FA is enabled
+     *
+     * @dataProvider providerStatesFixData
+     */
+    public function testIsTwoFactorAuthenticatedFixesProviderStates(bool $providerEnabled, bool $expected): void {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->willReturn([]); // Nothing registered yet
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->willReturn([
+                $this->fakeProvider
+            ]);
+        $this->fakeProvider->expects($this->once())
+            ->method('isTwoFactorAuthEnabledForUser')
+            ->with($this->user)
+            ->willReturn($providerEnabled);
+        if ($providerEnabled) {
+            $this->providerRegistry->expects($this->once())
+                ->method('enableProviderFor')
+                ->with(
+                    $this->fakeProvider,
+                    $this->user
+                );
+        } else {
+            $this->providerRegistry->expects($this->once())
+                ->method('disableProviderFor')
+                ->with(
+                    $this->fakeProvider,
+                    $this->user
+                );
+        }
+
+        $this->assertEquals($expected, $this->manager->isTwoFactorAuthenticated($this->user));
+    }
+
+    public function testGetProvider(): void {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($this->user)
+            ->willReturn([
+                $this->fakeProvider->getId() => true,
+            ]);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([$this->fakeProvider]);
+
+        $provider = $this->manager->getProvider($this->user, $this->fakeProvider->getId());
+
+        $this->assertSame($this->fakeProvider, $provider);
+    }
+
+    public function testGetInvalidProvider(): void {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($this->user)
+            ->willReturn([]);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([]);
+
+        $provider = $this->manager->getProvider($this->user, 'nonexistent');
+
+        $this->assertNull($provider);
+    }
+
+    public function testGetLoginSetupProviders(): void {
+        $provider1 = $this->createMock(IProvider::class);
+        $provider2 = $this->createMock(IActivatableAtLogin::class);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([
+                $provider1,
+                $provider2,
+            ]);
+
+        $providers = $this->manager->getLoginSetupProviders($this->user);
+
+        $this->assertCount(1, $providers);
+        $this->assertSame($provider2, reset($providers));
+    }
+
+    public function testGetProviders(): void {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($this->user)
+            ->willReturn([
+                $this->fakeProvider->getId() => true,
+            ]);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([$this->fakeProvider]);
+        $expectedProviders = [
+            'email' => $this->fakeProvider,
+        ];
+
+        $providerSet = $this->manager->getProviderSet($this->user);
+        $providers = $providerSet->getProviders();
+
+        $this->assertEquals($expectedProviders, $providers);
+        $this->assertFalse($providerSet->isProviderMissing());
+    }
+
+    public function testGetProvidersOneMissing(): void {
+        $this->providerRegistry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($this->user)
+            ->willReturn([
+                $this->fakeProvider->getId() => true,
+            ]);
+        $this->providerLoader->expects($this->once())
+            ->method('getProviders')
+            ->with($this->user)
+            ->willReturn([]);
+        $expectedProviders = [
+            'email' => $this->fakeProvider,
+        ];
+
+        $providerSet = $this->manager->getProviderSet($this->user);
+
+        $this->assertTrue($providerSet->isProviderMissing());
+    }
+
+    public function testVerifyChallenge(): void {
+        $this->prepareProviders();
+
+        $challenge = 'passme';
+        $event = $this->createMock(IEvent::class);
+        $this->fakeProvider->expects($this->once())
+            ->method('verifyChallenge')
+            ->with($this->user, $challenge)
+            ->willReturn(true);
+        $this->session->expects($this->once())
+            ->method('get')
+            ->with('two_factor_remember_login')
+            ->willReturn(false);
+
+        $calls = [
+            ['two_factor_auth_uid'],
+            ['two_factor_remember_login'],
+        ];
+        $this->session->expects($this->exactly(2))
+            ->method('remove')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->session->expects($this->once())
+            ->method('set')
+            ->with(Manager::SESSION_UID_DONE, 'jos');
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+        $this->activityManager->expects($this->once())
+            ->method('generateEvent')
+            ->willReturn($event);
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('jos');
+        $event->expects($this->once())
+            ->method('setApp')
+            ->with($this->equalTo('core'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setType')
+            ->with($this->equalTo('security'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setAuthor')
+            ->with($this->equalTo('jos'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setAffectedUser')
+            ->with($this->equalTo('jos'))
+            ->willReturnSelf();
+        $this->fakeProvider
+            ->method('getDisplayName')
+            ->willReturn('Fake 2FA');
+        $event->expects($this->once())
+            ->method('setSubject')
+            ->with($this->equalTo('twofactor_success'), $this->equalTo([
+                'provider' => 'Fake 2FA',
+            ]))
+            ->willReturnSelf();
+        $token = $this->createMock(OC\Authentication\Token\IToken::class);
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willReturn($token);
+        $token->method('getId')
+            ->willReturn(42);
+        $this->config->expects($this->once())
+            ->method('deleteUserValue')
+            ->with('jos', 'login_token_2fa', '42');
+
+        $result = $this->manager->verifyChallenge('email', $this->user, $challenge);
+
+        $this->assertTrue($result);
+    }
+
+    public function testVerifyChallengeInvalidProviderId(): void {
+        $this->prepareProviders();
+
+        $challenge = 'passme';
+        $this->fakeProvider->expects($this->never())
+            ->method('verifyChallenge')
+            ->with($this->user, $challenge);
+        $this->session->expects($this->never())
+            ->method('remove');
+
+        $this->assertFalse($this->manager->verifyChallenge('dontexist', $this->user, $challenge));
+    }
+
+    public function testVerifyInvalidChallenge(): void {
+        $this->prepareProviders();
+
+        $challenge = 'dontpassme';
+        $event = $this->createMock(IEvent::class);
+        $this->fakeProvider->expects($this->once())
+            ->method('verifyChallenge')
+            ->with($this->user, $challenge)
+            ->willReturn(false);
+        $this->session->expects($this->never())
+            ->method('remove');
+        $this->activityManager->expects($this->once())
+            ->method('generateEvent')
+            ->willReturn($event);
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('jos');
+        $event->expects($this->once())
+            ->method('setApp')
+            ->with($this->equalTo('core'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setType')
+            ->with($this->equalTo('security'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setAuthor')
+            ->with($this->equalTo('jos'))
+            ->willReturnSelf();
+        $event->expects($this->once())
+            ->method('setAffectedUser')
+            ->with($this->equalTo('jos'))
+            ->willReturnSelf();
+        $this->fakeProvider
+            ->method('getDisplayName')
+            ->willReturn('Fake 2FA');
+        $event->expects($this->once())
+            ->method('setSubject')
+            ->with($this->equalTo('twofactor_failed'), $this->equalTo([
+                'provider' => 'Fake 2FA',
+            ]))
+            ->willReturnSelf();
+
+        $this->assertFalse($this->manager->verifyChallenge('email', $this->user, $challenge));
+    }
+
+    public function testNeedsSecondFactor(): void {
+        $user = $this->createMock(IUser::class);
+
+        $calls = [
+            ['app_password'],
+            ['two_factor_auth_uid'],
+            [Manager::SESSION_UID_DONE],
+        ];
+        $this->session->expects($this->exactly(3))
+            ->method('exists')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+                return false;
+            });
+
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+        $token = $this->createMock(OC\Authentication\Token\IToken::class);
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willReturn($token);
+        $token->method('getId')
+            ->willReturn(42);
+
+        $user->method('getUID')
+            ->willReturn('user');
+        $this->config->method('getUserKeys')
+            ->with('user', 'login_token_2fa')
+            ->willReturn([
+                '42'
+            ]);
+
+        $manager = $this->getMockBuilder(Manager::class)
+            ->setConstructorArgs([
+                $this->providerLoader,
+                $this->providerRegistry,
+                $this->mandatoryTwoFactor,
+                $this->session,
+                $this->config,
+                $this->activityManager,
+                $this->logger,
+                $this->tokenProvider,
+                $this->timeFactory,
+                $this->dispatcher,
+            ])
+            ->onlyMethods(['isTwoFactorAuthenticated'])// Do not actually load the apps
+            ->getMock();
+
+        $manager->method('isTwoFactorAuthenticated')
+            ->with($user)
+            ->willReturn(true);
+
+        $this->assertTrue($manager->needsSecondFactor($user));
+    }
+
+    public function testNeedsSecondFactorUserIsNull(): void {
+        $user = null;
+        $this->session->expects($this->never())
+            ->method('exists');
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testNeedsSecondFactorWithNoProviderAvailableAnymore(): void {
+        $this->prepareNoProviders();
+
+        $user = null;
+        $this->session->expects($this->never())
+            ->method('exists')
+            ->with('two_factor_auth_uid')
+            ->willReturn(true);
+        $this->session->expects($this->never())
+            ->method('remove')
+            ->with('two_factor_auth_uid');
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testPrepareTwoFactorLogin(): void {
+        $this->user->method('getUID')
+            ->willReturn('ferdinand');
+
+        $calls = [
+            ['two_factor_auth_uid', 'ferdinand'],
+            ['two_factor_remember_login', true],
+        ];
+        $this->session->expects($this->exactly(2))
+            ->method('set')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+        $token = $this->createMock(OC\Authentication\Token\IToken::class);
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willReturn($token);
+        $token->method('getId')
+            ->willReturn(42);
+
+        $this->timeFactory->method('getTime')
+            ->willReturn(1337);
+
+        $this->config->method('setUserValue')
+            ->with('ferdinand', 'login_token_2fa', '42', '1337');
+
+
+        $this->manager->prepareTwoFactorLogin($this->user, true);
+    }
+
+    public function testPrepareTwoFactorLoginDontRemember(): void {
+        $this->user->method('getUID')
+            ->willReturn('ferdinand');
+
+        $calls = [
+            ['two_factor_auth_uid', 'ferdinand'],
+            ['two_factor_remember_login', false],
+        ];
+        $this->session->expects($this->exactly(2))
+            ->method('set')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+        $token = $this->createMock(OC\Authentication\Token\IToken::class);
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willReturn($token);
+        $token->method('getId')
+            ->willReturn(42);
+
+        $this->timeFactory->method('getTime')
+            ->willReturn(1337);
+
+        $this->config->method('setUserValue')
+            ->with('ferdinand', 'login_token_2fa', '42', '1337');
+
+        $this->manager->prepareTwoFactorLogin($this->user, false);
+    }
+
+    public function testNeedsSecondFactorSessionAuth(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn('user');
+
+        $this->session->method('exists')
+            ->willReturnCallback(function ($var) {
+                if ($var === Manager::SESSION_UID_KEY) {
+                    return false;
+                } elseif ($var === 'app_password') {
+                    return false;
+                } elseif ($var === 'app_api') {
+                    return false;
+                }
+                return true;
+            });
+        $this->session->method('get')
+            ->willReturnCallback(function ($var) {
+                if ($var === Manager::SESSION_UID_KEY) {
+                    return 'user';
+                } elseif ($var === 'app_api') {
+                    return true;
+                }
+                return null;
+            });
+        $this->session->expects($this->once())
+            ->method('get')
+            ->willReturnMap([
+                [Manager::SESSION_UID_DONE, 'user'],
+                ['app_api', true]
+            ]);
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testNeedsSecondFactorSessionAuthFailDBPass(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn('user');
+
+        $this->session->method('exists')
+            ->willReturn(false);
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+
+        $token = $this->createMock(OC\Authentication\Token\IToken::class);
+        $token->method('getId')
+            ->willReturn(40);
+
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willReturn($token);
+
+        $this->config->method('getUserKeys')
+            ->with('user', 'login_token_2fa')
+            ->willReturn([
+                '42', '43', '44'
+            ]);
+
+        $this->session->expects($this->once())
+            ->method('set')
+            ->with(Manager::SESSION_UID_DONE, 'user');
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testNeedsSecondFactorInvalidToken(): void {
+        $this->prepareNoProviders();
+
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn('user');
+
+        $this->session->method('exists')
+            ->willReturn(false);
+        $this->session->method('getId')
+            ->willReturn('mysessionid');
+
+        $this->tokenProvider->method('getToken')
+            ->with('mysessionid')
+            ->willThrowException(new OC\Authentication\Exceptions\InvalidTokenException());
+
+        $this->config->method('getUserKeys')->willReturn([]);
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testNeedsSecondFactorAppPassword(): void {
+        $user = $this->createMock(IUser::class);
+        $this->session->method('exists')
+            ->willReturnMap([
+                ['app_password', true],
+                ['app_api', true]
+            ]);
+
+        $this->assertFalse($this->manager->needsSecondFactor($user));
+    }
+
+    public function testClearTwoFactorPending() {
+        $this->config->method('getUserKeys')
+            ->with('theUserId', 'login_token_2fa')
+            ->willReturn([
+                '42', '43', '44'
+            ]);
+
+        $deleteUserValueCalls = [
+            ['theUserId', 'login_token_2fa', '42'],
+            ['theUserId', 'login_token_2fa', '43'],
+            ['theUserId', 'login_token_2fa', '44'],
+        ];
+        $this->config->expects($this->exactly(3))
+            ->method('deleteUserValue')
+            ->willReturnCallback(function () use (&$deleteUserValueCalls) {
+                $expected = array_shift($deleteUserValueCalls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $invalidateCalls = [
+            ['theUserId', 42],
+            ['theUserId', 43],
+            ['theUserId', 44],
+        ];
+        $this->tokenProvider->expects($this->exactly(3))
+            ->method('invalidateTokenById')
+            ->willReturnCallback(function () use (&$invalidateCalls) {
+                $expected = array_shift($invalidateCalls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->manager->clearTwoFactorPending('theUserId');
+    }
+
+    public function testClearTwoFactorPendingTokenDoesNotExist() {
+        $this->config->method('getUserKeys')
+            ->with('theUserId', 'login_token_2fa')
+            ->willReturn([
+                '42', '43', '44'
+            ]);
+
+        $deleteUserValueCalls = [
+            ['theUserId', 'login_token_2fa', '42'],
+            ['theUserId', 'login_token_2fa', '43'],
+            ['theUserId', 'login_token_2fa', '44'],
+        ];
+        $this->config->expects($this->exactly(3))
+            ->method('deleteUserValue')
+            ->willReturnCallback(function () use (&$deleteUserValueCalls) {
+                $expected = array_shift($deleteUserValueCalls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $invalidateCalls = [
+            ['theUserId', 42],
+            ['theUserId', 43],
+            ['theUserId', 44],
+        ];
+        $this->tokenProvider->expects($this->exactly(3))
+            ->method('invalidateTokenById')
+            ->willReturnCallback(function ($user, $tokenId) use (&$invalidateCalls) {
+                $expected = array_shift($invalidateCalls);
+                $this->assertEquals($expected, func_get_args());
+                if ($tokenId === 43) {
+                    throw new DoesNotExistException('token does not exist');
+                }
+            });
+
+        $this->manager->clearTwoFactorPending('theUserId');
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -363,7 +363,7 @@ 
 		];
 		$this->session->expects($this->exactly(2))
 			->method('remove')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -488,7 +488,7 @@ 
 		];
 		$this->session->expects($this->exactly(3))
 			->method('exists')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return false;
@@ -567,7 +567,7 @@ 
 		];
 		$this->session->expects($this->exactly(2))
 			->method('set')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -601,7 +601,7 @@ 
 		];
 		$this->session->expects($this->exactly(2))
 			->method('set')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -630,7 +630,7 @@ 
 			->willReturn('user');
 
 		$this->session->method('exists')
-			->willReturnCallback(function ($var) {
+			->willReturnCallback(function($var) {
 				if ($var === Manager::SESSION_UID_KEY) {
 					return false;
 				} elseif ($var === 'app_password') {
@@ -641,7 +641,7 @@ 
 				return true;
 			});
 		$this->session->method('get')
-			->willReturnCallback(function ($var) {
+			->willReturnCallback(function($var) {
 				if ($var === Manager::SESSION_UID_KEY) {
 					return 'user';
 				} elseif ($var === 'app_api') {
@@ -736,7 +736,7 @@ 
 		];
 		$this->config->expects($this->exactly(3))
 			->method('deleteUserValue')
-			->willReturnCallback(function () use (&$deleteUserValueCalls) {
+			->willReturnCallback(function() use (&$deleteUserValueCalls) {
 				$expected = array_shift($deleteUserValueCalls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -748,7 +748,7 @@ 
 		];
 		$this->tokenProvider->expects($this->exactly(3))
 			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$invalidateCalls) {
+			->willReturnCallback(function() use (&$invalidateCalls) {
 				$expected = array_shift($invalidateCalls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -770,7 +770,7 @@ 
 		];
 		$this->config->expects($this->exactly(3))
 			->method('deleteUserValue')
-			->willReturnCallback(function () use (&$deleteUserValueCalls) {
+			->willReturnCallback(function() use (&$deleteUserValueCalls) {
 				$expected = array_shift($deleteUserValueCalls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -782,7 +782,7 @@ 
 		];
 		$this->tokenProvider->expects($this->exactly(3))
 			->method('invalidateTokenById')
-			->willReturnCallback(function ($user, $tokenId) use (&$invalidateCalls) {
+			->willReturnCallback(function($user, $tokenId) use (&$invalidateCalls) {
 				$expected = array_shift($invalidateCalls);
 				$this->assertEquals($expected, func_get_args());
 				if ($tokenId === 43) {

tests/lib/Federation/CloudIdTest.php

Indentation +29 added lines, -29 removed lines

@@ -19,33 +19,33 @@
  * @group DB
  */
 class CloudIdTest extends TestCase {
-	protected CloudIdManager&MockObject $cloudIdManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->cloudIdManager = $this->createMock(CloudIdManager::class);
-		$this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
-	}
-
-	public static function dataGetDisplayCloudId(): array {
-		return [
-			['test@example.com', 'test', 'example.com', 'test@example.com'],
-			['test@http://example.com', 'test', 'http://example.com', 'test@example.com'],
-			['test@https://example.com', 'test', 'https://example.com', 'test@example.com'],
-			['test@https://example.com', 'test', 'https://example.com', 'Beloved Amy@example.com', 'Beloved Amy'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetDisplayCloudId
-	 */
-	public function testGetDisplayCloudId(string $id, string $user, string $remote, string $display, ?string $addressbookName = null): void {
-		$this->cloudIdManager->expects($this->once())
-			->method('getDisplayNameFromContact')
-			->willReturn($addressbookName);
-
-		$cloudId = new CloudId($id, $user, $remote);
-		$this->assertEquals($display, $cloudId->getDisplayId());
-	}
+    protected CloudIdManager&MockObject $cloudIdManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->cloudIdManager = $this->createMock(CloudIdManager::class);
+        $this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
+    }
+
+    public static function dataGetDisplayCloudId(): array {
+        return [
+            ['test@example.com', 'test', 'example.com', 'test@example.com'],
+            ['test@http://example.com', 'test', 'http://example.com', 'test@example.com'],
+            ['test@https://example.com', 'test', 'https://example.com', 'test@example.com'],
+            ['test@https://example.com', 'test', 'https://example.com', 'Beloved Amy@example.com', 'Beloved Amy'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetDisplayCloudId
+     */
+    public function testGetDisplayCloudId(string $id, string $user, string $remote, string $display, ?string $addressbookName = null): void {
+        $this->cloudIdManager->expects($this->once())
+            ->method('getDisplayNameFromContact')
+            ->willReturn($addressbookName);
+
+        $cloudId = new CloudId($id, $user, $remote);
+        $this->assertEquals($display, $cloudId->getDisplayId());
+    }
 }

tests/lib/Federation/CloudIdManagerTest.php

Indentation +157 added lines, -157 removed lines

@@ -23,161 +23,161 @@
  * @group DB
  */
 class CloudIdManagerTest extends TestCase {
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $contactsManager;
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-	/** @var CloudIdManager */
-	private $cloudIdManager;
-	/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $cacheFactory;
-
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->contactsManager = $this->createMock(IManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cacheFactory->method('createDistributed')
-			->willReturn(new ArrayCache(''));
-
-		$this->cloudIdManager = new CloudIdManager(
-			$this->contactsManager,
-			$this->urlGenerator,
-			$this->userManager,
-			$this->cacheFactory,
-			$this->createMock(IEventDispatcher::class)
-		);
-		$this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
-	}
-
-	public static function dataGetDisplayNameFromContact(): array {
-		return [
-			['test1@example.tld', 'test', 'test'],
-			['test2@example.tld', null, null],
-			['test3@example.tld', 'test3@example', 'test3@example'],
-			['test4@example.tld', 'test4@example.tld', null],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetDisplayNameFromContact
-	 */
-	public function testGetDisplayNameFromContact(string $cloudId, ?string $displayName, ?string $expected): void {
-		$returnedContact = [
-			'CLOUD' => [$cloudId],
-			'FN' => $expected,
-		];
-		if ($displayName === null) {
-			unset($returnedContact['FN']);
-		}
-		$this->contactsManager->method('search')
-			->with($cloudId, ['CLOUD'])
-			->willReturn([$returnedContact]);
-
-		$this->assertEquals($expected, $this->cloudIdManager->getDisplayNameFromContact($cloudId));
-		$this->assertEquals($expected, $this->cloudIdManager->getDisplayNameFromContact($cloudId));
-	}
-
-	public static function cloudIdProvider(): array {
-		return [
-			['test@example.com', 'test', 'example.com', 'test@example.com'],
-			['test@example.com/cloud', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com/cloud/', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com/cloud/index.php', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com@example.com', 'test@example.com', 'example.com', 'test@example.com@example.com'],
-
-			// Equal signs are not valid on Nextcloud side, but can be used by other federated OCM compatible servers
-			['test==@example.com', 'test==', 'example.com', 'test==@example.com'],
-			['==@example.com', '==', 'example.com', '==@example.com'],
-		];
-	}
-
-	/**
-	 * @dataProvider cloudIdProvider
-	 */
-	public function testResolveCloudId(string $cloudId, string $user, string $noProtocolRemote, string $cleanId): void {
-		$displayName = 'Ample Ex';
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->with($cleanId, ['CLOUD'])
-			->willReturn([
-				[
-					'CLOUD' => [$cleanId],
-					'FN' => $displayName,
-				]
-			]);
-
-		$cloudId = $this->cloudIdManager->resolveCloudId($cloudId);
-
-		$this->assertEquals($user, $cloudId->getUser());
-		$this->assertEquals('https://' . $noProtocolRemote, $cloudId->getRemote());
-		$this->assertEquals($cleanId, $cloudId->getId());
-		$this->assertEquals($displayName . '@' . $noProtocolRemote, $cloudId->getDisplayId());
-	}
-
-	public static function invalidCloudIdProvider(): array {
-		return [
-			['example.com'],
-			['test:foo@example.com'],
-			['test/foo@example.com']
-		];
-	}
-
-	/**
-	 * @dataProvider invalidCloudIdProvider
-	 */
-	public function testInvalidCloudId(string $cloudId): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$this->contactsManager->expects($this->never())
-			->method('search');
-
-		$this->cloudIdManager->resolveCloudId($cloudId);
-	}
-
-	public static function getCloudIdProvider(): array {
-		return [
-			['test', 'example.com', 'test@example.com', null, 'https://example.com', 'https://example.com'],
-			['test', 'http://example.com', 'test@http://example.com', 'test@example.com'],
-			['test', null, 'test@http://example.com', 'test@example.com', 'http://example.com', 'http://example.com'],
-			['test@example.com', 'example.com', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
-			['test@example.com', 'https://example.com', 'test@example.com@example.com'],
-			['test@example.com', null, 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
-			['test@example.com', 'https://example.com/index.php/s/shareToken', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
-		];
-	}
-
-	/**
-	 * @dataProvider getCloudIdProvider
-	 */
-	public function testGetCloudId(string $user, ?string $remote, string $id, ?string $searchCloudId = null, ?string $localHost = 'https://example.com', ?string $expectedRemoteId = null): void {
-		if ($remote !== null) {
-			$this->contactsManager->expects($this->any())
-				->method('search')
-				->with($searchCloudId ?? $id, ['CLOUD'])
-				->willReturn([
-					[
-						'CLOUD' => [$searchCloudId ?? $id],
-						'FN' => 'Ample Ex',
-					]
-				]);
-		} else {
-			$this->urlGenerator->expects(self::once())
-				->method('getAbsoluteUrl')
-				->willReturn($localHost);
-		}
-		$expectedRemoteId ??= $remote;
-
-		$cloudId = $this->cloudIdManager->getCloudId($user, $remote);
-
-		$this->assertEquals($id, $cloudId->getId(), 'Cloud ID');
-		$this->assertEquals($expectedRemoteId, $cloudId->getRemote(), 'Remote URL');
-	}
+    /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $contactsManager;
+    /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
+    private $urlGenerator;
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+    /** @var CloudIdManager */
+    private $cloudIdManager;
+    /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $cacheFactory;
+
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->contactsManager = $this->createMock(IManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cacheFactory->method('createDistributed')
+            ->willReturn(new ArrayCache(''));
+
+        $this->cloudIdManager = new CloudIdManager(
+            $this->contactsManager,
+            $this->urlGenerator,
+            $this->userManager,
+            $this->cacheFactory,
+            $this->createMock(IEventDispatcher::class)
+        );
+        $this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
+    }
+
+    public static function dataGetDisplayNameFromContact(): array {
+        return [
+            ['test1@example.tld', 'test', 'test'],
+            ['test2@example.tld', null, null],
+            ['test3@example.tld', 'test3@example', 'test3@example'],
+            ['test4@example.tld', 'test4@example.tld', null],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetDisplayNameFromContact
+     */
+    public function testGetDisplayNameFromContact(string $cloudId, ?string $displayName, ?string $expected): void {
+        $returnedContact = [
+            'CLOUD' => [$cloudId],
+            'FN' => $expected,
+        ];
+        if ($displayName === null) {
+            unset($returnedContact['FN']);
+        }
+        $this->contactsManager->method('search')
+            ->with($cloudId, ['CLOUD'])
+            ->willReturn([$returnedContact]);
+
+        $this->assertEquals($expected, $this->cloudIdManager->getDisplayNameFromContact($cloudId));
+        $this->assertEquals($expected, $this->cloudIdManager->getDisplayNameFromContact($cloudId));
+    }
+
+    public static function cloudIdProvider(): array {
+        return [
+            ['test@example.com', 'test', 'example.com', 'test@example.com'],
+            ['test@example.com/cloud', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com/cloud/', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com/cloud/index.php', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com@example.com', 'test@example.com', 'example.com', 'test@example.com@example.com'],
+
+            // Equal signs are not valid on Nextcloud side, but can be used by other federated OCM compatible servers
+            ['test==@example.com', 'test==', 'example.com', 'test==@example.com'],
+            ['==@example.com', '==', 'example.com', '==@example.com'],
+        ];
+    }
+
+    /**
+     * @dataProvider cloudIdProvider
+     */
+    public function testResolveCloudId(string $cloudId, string $user, string $noProtocolRemote, string $cleanId): void {
+        $displayName = 'Ample Ex';
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->with($cleanId, ['CLOUD'])
+            ->willReturn([
+                [
+                    'CLOUD' => [$cleanId],
+                    'FN' => $displayName,
+                ]
+            ]);
+
+        $cloudId = $this->cloudIdManager->resolveCloudId($cloudId);
+
+        $this->assertEquals($user, $cloudId->getUser());
+        $this->assertEquals('https://' . $noProtocolRemote, $cloudId->getRemote());
+        $this->assertEquals($cleanId, $cloudId->getId());
+        $this->assertEquals($displayName . '@' . $noProtocolRemote, $cloudId->getDisplayId());
+    }
+
+    public static function invalidCloudIdProvider(): array {
+        return [
+            ['example.com'],
+            ['test:foo@example.com'],
+            ['test/foo@example.com']
+        ];
+    }
+
+    /**
+     * @dataProvider invalidCloudIdProvider
+     */
+    public function testInvalidCloudId(string $cloudId): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->contactsManager->expects($this->never())
+            ->method('search');
+
+        $this->cloudIdManager->resolveCloudId($cloudId);
+    }
+
+    public static function getCloudIdProvider(): array {
+        return [
+            ['test', 'example.com', 'test@example.com', null, 'https://example.com', 'https://example.com'],
+            ['test', 'http://example.com', 'test@http://example.com', 'test@example.com'],
+            ['test', null, 'test@http://example.com', 'test@example.com', 'http://example.com', 'http://example.com'],
+            ['test@example.com', 'example.com', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
+            ['test@example.com', 'https://example.com', 'test@example.com@example.com'],
+            ['test@example.com', null, 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
+            ['test@example.com', 'https://example.com/index.php/s/shareToken', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
+        ];
+    }
+
+    /**
+     * @dataProvider getCloudIdProvider
+     */
+    public function testGetCloudId(string $user, ?string $remote, string $id, ?string $searchCloudId = null, ?string $localHost = 'https://example.com', ?string $expectedRemoteId = null): void {
+        if ($remote !== null) {
+            $this->contactsManager->expects($this->any())
+                ->method('search')
+                ->with($searchCloudId ?? $id, ['CLOUD'])
+                ->willReturn([
+                    [
+                        'CLOUD' => [$searchCloudId ?? $id],
+                        'FN' => 'Ample Ex',
+                    ]
+                ]);
+        } else {
+            $this->urlGenerator->expects(self::once())
+                ->method('getAbsoluteUrl')
+                ->willReturn($localHost);
+        }
+        $expectedRemoteId ??= $remote;
+
+        $cloudId = $this->cloudIdManager->getCloudId($user, $remote);
+
+        $this->assertEquals($id, $cloudId->getId(), 'Cloud ID');
+        $this->assertEquals($expectedRemoteId, $cloudId->getRemote(), 'Remote URL');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -117,9 +117,9 @@
 		$cloudId = $this->cloudIdManager->resolveCloudId($cloudId);
 
 		$this->assertEquals($user, $cloudId->getUser());
-		$this->assertEquals('https://' . $noProtocolRemote, $cloudId->getRemote());
+		$this->assertEquals('https://'.$noProtocolRemote, $cloudId->getRemote());
 		$this->assertEquals($cleanId, $cloudId->getId());
-		$this->assertEquals($displayName . '@' . $noProtocolRemote, $cloudId->getDisplayId());
+		$this->assertEquals($displayName.'@'.$noProtocolRemote, $cloudId->getDisplayId());
 	}
 
 	public static function invalidCloudIdProvider(): array {

tests/lib/Support/Subscription/RegistryTest.php

Indentation +178 added lines, -178 removed lines

@@ -21,182 +21,182 @@
 use Test\TestCase;
 
 class RegistryTest extends TestCase {
-	private Registry $registry;
-
-	private MockObject&IConfig $config;
-	private MockObject&IServerContainer $serverContainer;
-	private MockObject&IUserManager $userManager;
-	private MockObject&IGroupManager $groupManager;
-	private MockObject&LoggerInterface $logger;
-	private MockObject&IManager $notificationManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->serverContainer = $this->createMock(IServerContainer::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->registry = new Registry(
-			$this->config,
-			$this->serverContainer,
-			$this->userManager,
-			$this->groupManager,
-			$this->logger
-		);
-	}
-
-	/**
-	 * Doesn't assert anything, just checks whether anything "explodes"
-	 */
-	public function testDelegateToNone(): void {
-		$this->registry->delegateHasValidSubscription();
-		$this->addToAssertionCount(1);
-	}
-
-
-	public function testDoubleRegistration(): void {
-		$this->expectException(\OCP\Support\Subscription\Exception\AlreadyRegisteredException::class);
-
-		/* @var ISubscription $subscription1 */
-		$subscription1 = $this->createMock(ISubscription::class);
-		/* @var ISubscription $subscription2 */
-		$subscription2 = $this->createMock(ISubscription::class);
-		$this->registry->register($subscription1);
-		$this->registry->register($subscription2);
-	}
-
-	public function testNoSupportApp(): void {
-		$this->assertSame([], $this->registry->delegateGetSupportedApps());
-		$this->assertSame(false, $this->registry->delegateHasValidSubscription());
-	}
-
-	public function testDelegateHasValidSubscription(): void {
-		/* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
-		$subscription = $this->createMock(ISubscription::class);
-		$subscription->expects($this->once())
-			->method('hasValidSubscription')
-			->willReturn(true);
-		$this->registry->register($subscription);
-
-		$this->assertSame(true, $this->registry->delegateHasValidSubscription());
-	}
-
-	public function testDelegateHasValidSubscriptionConfig(): void {
-		/* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
-		$this->config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('has_valid_subscription')
-			->willReturn(true);
-
-		$this->assertSame(true, $this->registry->delegateHasValidSubscription());
-	}
-
-	public function testDelegateHasExtendedSupport(): void {
-		/* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
-		$subscription = $this->createMock(ISubscription::class);
-		$subscription->expects($this->once())
-			->method('hasExtendedSupport')
-			->willReturn(true);
-		$this->registry->register($subscription);
-
-		$this->assertSame(true, $this->registry->delegateHasExtendedSupport());
-	}
-
-
-	public function testDelegateGetSupportedApps(): void {
-		/* @var ISupportedApps|\PHPUnit\Framework\MockObject\MockObject $subscription */
-		$subscription = $this->createMock(ISupportedApps::class);
-		$subscription->expects($this->once())
-			->method('getSupportedApps')
-			->willReturn(['abc']);
-		$this->registry->register($subscription);
-
-		$this->assertSame(['abc'], $this->registry->delegateGetSupportedApps());
-	}
-
-	public function testSubscriptionService(): void {
-		$this->serverContainer->method('query')
-			->with(DummySubscription::class)
-			->willReturn(new DummySubscription(true, false, false));
-		$this->registry->registerService(DummySubscription::class);
-
-		$this->assertTrue($this->registry->delegateHasValidSubscription());
-		$this->assertFalse($this->registry->delegateHasExtendedSupport());
-	}
-
-	public function testDelegateIsHardUserLimitReached(): void {
-		/* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
-		$subscription = $this->createMock(ISubscription::class);
-		$subscription->expects($this->once())
-			->method('hasValidSubscription')
-			->willReturn(true);
-		$subscription->expects($this->once())
-			->method('isHardUserLimitReached')
-			->willReturn(true);
-		$this->registry->register($subscription);
-		$dummyGroup = $this->createMock(IGroup::class);
-		$dummyGroup->expects($this->once())
-			->method('getUsers')
-			->willReturn([]);
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->willReturn($dummyGroup);
-
-		$this->assertSame(true, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
-	}
-
-	public function testDelegateIsHardUserLimitReachedWithoutSupportApp(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('one-click-instance')
-			->willReturn(false);
-
-		$this->assertSame(false, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
-	}
-
-	public static function dataForUserLimitCheck(): array {
-		return [
-			// $userLimit, $userCount, $disabledUsers, $expectedResult
-			[35, 15, 2, false],
-			[35, 45, 15, false],
-			[35, 45, 5, true],
-			[35, 45, 55, false],
-		];
-	}
-
-	/**
-	 * @dataProvider dataForUserLimitCheck
-	 */
-	public function testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount($userLimit, $userCount, $disabledUsers, $expectedResult): void {
-		$this->config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('one-click-instance')
-			->willReturn(true);
-		$this->config->expects($this->once())
-			->method('getSystemValueInt')
-			->with('one-click-instance.user-limit')
-			->willReturn($userLimit);
-		$this->config->expects($this->once())
-			->method('getUsersForUserValue')
-			->with('core', 'enabled', 'false')
-			->willReturn(array_fill(0, $disabledUsers, ''));
-		$this->userManager->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn($userCount);
-
-		if ($expectedResult) {
-			$dummyGroup = $this->createMock(IGroup::class);
-			$dummyGroup->expects($this->once())
-				->method('getUsers')
-				->willReturn([]);
-			$this->groupManager->expects($this->once())
-				->method('get')
-				->willReturn($dummyGroup);
-		}
-
-		$this->assertSame($expectedResult, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
-	}
+    private Registry $registry;
+
+    private MockObject&IConfig $config;
+    private MockObject&IServerContainer $serverContainer;
+    private MockObject&IUserManager $userManager;
+    private MockObject&IGroupManager $groupManager;
+    private MockObject&LoggerInterface $logger;
+    private MockObject&IManager $notificationManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->serverContainer = $this->createMock(IServerContainer::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->registry = new Registry(
+            $this->config,
+            $this->serverContainer,
+            $this->userManager,
+            $this->groupManager,
+            $this->logger
+        );
+    }
+
+    /**
+     * Doesn't assert anything, just checks whether anything "explodes"
+     */
+    public function testDelegateToNone(): void {
+        $this->registry->delegateHasValidSubscription();
+        $this->addToAssertionCount(1);
+    }
+
+
+    public function testDoubleRegistration(): void {
+        $this->expectException(\OCP\Support\Subscription\Exception\AlreadyRegisteredException::class);
+
+        /* @var ISubscription $subscription1 */
+        $subscription1 = $this->createMock(ISubscription::class);
+        /* @var ISubscription $subscription2 */
+        $subscription2 = $this->createMock(ISubscription::class);
+        $this->registry->register($subscription1);
+        $this->registry->register($subscription2);
+    }
+
+    public function testNoSupportApp(): void {
+        $this->assertSame([], $this->registry->delegateGetSupportedApps());
+        $this->assertSame(false, $this->registry->delegateHasValidSubscription());
+    }
+
+    public function testDelegateHasValidSubscription(): void {
+        /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
+        $subscription = $this->createMock(ISubscription::class);
+        $subscription->expects($this->once())
+            ->method('hasValidSubscription')
+            ->willReturn(true);
+        $this->registry->register($subscription);
+
+        $this->assertSame(true, $this->registry->delegateHasValidSubscription());
+    }
+
+    public function testDelegateHasValidSubscriptionConfig(): void {
+        /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
+        $this->config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('has_valid_subscription')
+            ->willReturn(true);
+
+        $this->assertSame(true, $this->registry->delegateHasValidSubscription());
+    }
+
+    public function testDelegateHasExtendedSupport(): void {
+        /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
+        $subscription = $this->createMock(ISubscription::class);
+        $subscription->expects($this->once())
+            ->method('hasExtendedSupport')
+            ->willReturn(true);
+        $this->registry->register($subscription);
+
+        $this->assertSame(true, $this->registry->delegateHasExtendedSupport());
+    }
+
+
+    public function testDelegateGetSupportedApps(): void {
+        /* @var ISupportedApps|\PHPUnit\Framework\MockObject\MockObject $subscription */
+        $subscription = $this->createMock(ISupportedApps::class);
+        $subscription->expects($this->once())
+            ->method('getSupportedApps')
+            ->willReturn(['abc']);
+        $this->registry->register($subscription);
+
+        $this->assertSame(['abc'], $this->registry->delegateGetSupportedApps());
+    }
+
+    public function testSubscriptionService(): void {
+        $this->serverContainer->method('query')
+            ->with(DummySubscription::class)
+            ->willReturn(new DummySubscription(true, false, false));
+        $this->registry->registerService(DummySubscription::class);
+
+        $this->assertTrue($this->registry->delegateHasValidSubscription());
+        $this->assertFalse($this->registry->delegateHasExtendedSupport());
+    }
+
+    public function testDelegateIsHardUserLimitReached(): void {
+        /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */
+        $subscription = $this->createMock(ISubscription::class);
+        $subscription->expects($this->once())
+            ->method('hasValidSubscription')
+            ->willReturn(true);
+        $subscription->expects($this->once())
+            ->method('isHardUserLimitReached')
+            ->willReturn(true);
+        $this->registry->register($subscription);
+        $dummyGroup = $this->createMock(IGroup::class);
+        $dummyGroup->expects($this->once())
+            ->method('getUsers')
+            ->willReturn([]);
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->willReturn($dummyGroup);
+
+        $this->assertSame(true, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
+    }
+
+    public function testDelegateIsHardUserLimitReachedWithoutSupportApp(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('one-click-instance')
+            ->willReturn(false);
+
+        $this->assertSame(false, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
+    }
+
+    public static function dataForUserLimitCheck(): array {
+        return [
+            // $userLimit, $userCount, $disabledUsers, $expectedResult
+            [35, 15, 2, false],
+            [35, 45, 15, false],
+            [35, 45, 5, true],
+            [35, 45, 55, false],
+        ];
+    }
+
+    /**
+     * @dataProvider dataForUserLimitCheck
+     */
+    public function testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount($userLimit, $userCount, $disabledUsers, $expectedResult): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('one-click-instance')
+            ->willReturn(true);
+        $this->config->expects($this->once())
+            ->method('getSystemValueInt')
+            ->with('one-click-instance.user-limit')
+            ->willReturn($userLimit);
+        $this->config->expects($this->once())
+            ->method('getUsersForUserValue')
+            ->with('core', 'enabled', 'false')
+            ->willReturn(array_fill(0, $disabledUsers, ''));
+        $this->userManager->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn($userCount);
+
+        if ($expectedResult) {
+            $dummyGroup = $this->createMock(IGroup::class);
+            $dummyGroup->expects($this->once())
+                ->method('getUsers')
+                ->willReturn([]);
+            $this->groupManager->expects($this->once())
+                ->method('get')
+                ->willReturn($dummyGroup);
+        }
+
+        $this->assertSame($expectedResult, $this->registry->delegateIsHardUserLimitReached($this->notificationManager));
+    }
 }

tests/lib/AppConfigTest.php

Indentation +1437 added lines, -1437 removed lines

@@ -24,1441 +24,1441 @@
  * @package Test
  */
 class AppConfigTest extends TestCase {
-	protected IAppConfig $appConfig;
-	protected IDBConnection $connection;
-	private LoggerInterface $logger;
-	private ICrypto $crypto;
-
-	private array $originalConfig;
-
-	/**
-	 * @var array<string, array<string, array<string, string, int, bool, bool>>>
-	 *                                                                           [appId => [configKey, configValue, valueType, lazy, sensitive]]
-	 */
-	private static array $baseStruct =
-		[
-			'testapp' => [
-				'enabled' => ['enabled', 'true'],
-				'installed_version' => ['installed_version', '1.2.3'],
-				'depends_on' => ['depends_on', 'someapp'],
-				'deletethis' => ['deletethis', 'deletethis'],
-				'key' => ['key', 'value']
-			],
-			'someapp' => [
-				'key' => ['key', 'value'],
-				'otherkey' => ['otherkey', 'othervalue']
-			],
-			'123456' => [
-				'enabled' => ['enabled', 'true'],
-				'key' => ['key', 'value']
-			],
-			'anotherapp' => [
-				'enabled' => ['enabled', 'false'],
-				'key' => ['key', 'value']
-			],
-			'non-sensitive-app' => [
-				'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true, false],
-				'non-lazy-key' => ['non-lazy-key', 'value', IAppConfig::VALUE_STRING, false, false],
-			],
-			'sensitive-app' => [
-				'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true, true],
-				'non-lazy-key' => ['non-lazy-key', 'value', IAppConfig::VALUE_STRING, false, true],
-			],
-			'only-lazy' => [
-				'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true]
-			],
-			'typed' => [
-				'mixed' => ['mixed', 'mix', IAppConfig::VALUE_MIXED],
-				'string' => ['string', 'value', IAppConfig::VALUE_STRING],
-				'int' => ['int', '42', IAppConfig::VALUE_INT],
-				'float' => ['float', '3.14', IAppConfig::VALUE_FLOAT],
-				'bool' => ['bool', '1', IAppConfig::VALUE_BOOL],
-				'array' => ['array', '{"test": 1}', IAppConfig::VALUE_ARRAY],
-			],
-			'prefix-app' => [
-				'key1' => ['key1', 'value'],
-				'prefix1' => ['prefix1', 'value'],
-				'prefix-2' => ['prefix-2', 'value'],
-				'key-2' => ['key-2', 'value'],
-			]
-		];
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = \OCP\Server::get(IDBConnection::class);
-		$this->logger = \OCP\Server::get(LoggerInterface::class);
-		$this->crypto = \OCP\Server::get(ICrypto::class);
-
-		// storing current config and emptying the data table
-		$sql = $this->connection->getQueryBuilder();
-		$sql->select('*')
-			->from('appconfig');
-		$result = $sql->executeQuery();
-		$this->originalConfig = $result->fetchAll();
-		$result->closeCursor();
-
-		$sql = $this->connection->getQueryBuilder();
-		$sql->delete('appconfig');
-		$sql->executeStatement();
-
-		$sql = $this->connection->getQueryBuilder();
-		$sql->insert('appconfig')
-			->values(
-				[
-					'appid' => $sql->createParameter('appid'),
-					'configkey' => $sql->createParameter('configkey'),
-					'configvalue' => $sql->createParameter('configvalue'),
-					'type' => $sql->createParameter('type'),
-					'lazy' => $sql->createParameter('lazy')
-				]
-			);
-
-		foreach (self::$baseStruct as $appId => $appData) {
-			foreach ($appData as $key => $row) {
-				$value = $row[1];
-				$type = $row[2] ?? IAppConfig::VALUE_MIXED;
-				if (($row[4] ?? false) === true) {
-					$type |= IAppConfig::VALUE_SENSITIVE;
-					$value = self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX') . $this->crypto->encrypt($value);
-					self::$baseStruct[$appId][$key]['encrypted'] = $value;
-				}
-
-				$sql->setParameters(
-					[
-						'appid' => $appId,
-						'configkey' => $row[0],
-						'configvalue' => $value,
-						'type' => $type,
-						'lazy' => (($row[3] ?? false) === true) ? 1 : 0
-					]
-				)->executeStatement();
-			}
-		}
-	}
-
-	protected function tearDown(): void {
-		$sql = $this->connection->getQueryBuilder();
-		$sql->delete('appconfig');
-		$sql->executeStatement();
-
-		$sql = $this->connection->getQueryBuilder();
-		$sql->insert('appconfig')
-			->values(
-				[
-					'appid' => $sql->createParameter('appid'),
-					'configkey' => $sql->createParameter('configkey'),
-					'configvalue' => $sql->createParameter('configvalue'),
-					'lazy' => $sql->createParameter('lazy'),
-					'type' => $sql->createParameter('type'),
-				]
-			);
-
-		foreach ($this->originalConfig as $key => $configs) {
-			$sql->setParameter('appid', $configs['appid'])
-				->setParameter('configkey', $configs['configkey'])
-				->setParameter('configvalue', $configs['configvalue'])
-				->setParameter('lazy', ($configs['lazy'] === '1') ? '1' : '0')
-				->setParameter('type', $configs['type']);
-			$sql->executeStatement();
-		}
-
-		//		$this->restoreService(AppConfig::class);
-		parent::tearDown();
-	}
-
-	/**
-	 * @param bool $preLoading TRUE will preload the 'fast' cache, which is the normal behavior of usual
-	 *                         IAppConfig
-	 *
-	 * @return IAppConfig
-	 */
-	private function generateAppConfig(bool $preLoading = true): IAppConfig {
-		/** @var AppConfig $config */
-		$config = new \OC\AppConfig(
-			$this->connection,
-			$this->logger,
-			$this->crypto,
-		);
-		$msg = ' generateAppConfig() failed to confirm cache status';
-
-		// confirm cache status
-		$status = $config->statusCache();
-		$this->assertSame(false, $status['fastLoaded'], $msg);
-		$this->assertSame(false, $status['lazyLoaded'], $msg);
-		$this->assertSame([], $status['fastCache'], $msg);
-		$this->assertSame([], $status['lazyCache'], $msg);
-		if ($preLoading) {
-			// simple way to initiate the load of non-lazy config values in cache
-			$config->getValueString('core', 'preload', '');
-
-			// confirm cache status
-			$status = $config->statusCache();
-			$this->assertSame(true, $status['fastLoaded'], $msg);
-			$this->assertSame(false, $status['lazyLoaded'], $msg);
-
-			$apps = array_values(array_diff(array_keys(self::$baseStruct), ['only-lazy']));
-			$this->assertEqualsCanonicalizing($apps, array_keys($status['fastCache']), $msg);
-			$this->assertSame([], array_keys($status['lazyCache']), $msg);
-		}
-
-		return $config;
-	}
-
-	public function testGetApps(): void {
-		$config = $this->generateAppConfig(false);
-
-		$this->assertEqualsCanonicalizing(array_keys(self::$baseStruct), $config->getApps());
-	}
-
-	/**
-	 * returns list of app and their keys
-	 *
-	 * @return array<string, string[]> ['appId' => ['key1', 'key2', ]]
-	 * @see testGetKeys
-	 */
-	public static function providerGetAppKeys(): array {
-		$appKeys = [];
-		foreach (self::$baseStruct as $appId => $appData) {
-			$keys = [];
-			foreach ($appData as $row) {
-				$keys[] = $row[0];
-			}
-			$appKeys[] = [(string)$appId, $keys];
-		}
-
-		return $appKeys;
-	}
-
-	/**
-	 * returns list of config keys
-	 *
-	 * @return array<string, string, string, int, bool, bool> [appId, key, value, type, lazy, sensitive]
-	 * @see testIsSensitive
-	 * @see testIsLazy
-	 * @see testGetKeys
-	 */
-	public static function providerGetKeys(): array {
-		$appKeys = [];
-		foreach (self::$baseStruct as $appId => $appData) {
-			foreach ($appData as $row) {
-				$appKeys[] = [
-					(string)$appId, $row[0], $row[1], $row[2] ?? IAppConfig::VALUE_MIXED, $row[3] ?? false,
-					$row[4] ?? false
-				];
-			}
-		}
-
-		return $appKeys;
-	}
-
-	/**
-	 * @dataProvider providerGetAppKeys
-	 *
-	 * @param string $appId
-	 * @param array $expectedKeys
-	 */
-	public function testGetKeys(string $appId, array $expectedKeys): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing($expectedKeys, $config->getKeys($appId));
-	}
-
-	public function testGetKeysOnUnknownAppShouldReturnsEmptyArray(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing([], $config->getKeys('unknown-app'));
-	}
-
-	/**
-	 * @dataProvider providerGetKeys
-	 *
-	 * @param string $appId
-	 * @param string $configKey
-	 * @param string $value
-	 * @param bool $lazy
-	 */
-	public function testHasKey(string $appId, string $configKey, string $value, int $type, bool $lazy): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(true, $config->hasKey($appId, $configKey, $lazy));
-	}
-
-	public function testHasKeyOnNonExistentKeyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(false, $config->hasKey(array_keys(self::$baseStruct)[0], 'inexistant-key'));
-	}
-
-	public function testHasKeyOnUnknownAppReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(false, $config->hasKey('inexistant-app', 'inexistant-key'));
-	}
-
-	public function testHasKeyOnMistypedAsLazyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->hasKey('non-sensitive-app', 'non-lazy-key', true));
-	}
-
-	public function testHasKeyOnMistypeAsNonLazyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->hasKey('non-sensitive-app', 'lazy-key', false));
-	}
-
-	public function testHasKeyOnMistypeAsNonLazyReturnsTrueWithLazyArgumentIsNull(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(true, $config->hasKey('non-sensitive-app', 'lazy-key', null));
-	}
-
-	/**
-	 * @dataProvider providerGetKeys
-	 */
-	public function testIsSensitive(
-		string $appId, string $configKey, string $configValue, int $type, bool $lazy, bool $sensitive,
-	): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals($sensitive, $config->isSensitive($appId, $configKey, $lazy));
-	}
-
-	public function testIsSensitiveOnNonExistentKeyThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isSensitive(array_keys(self::$baseStruct)[0], 'inexistant-key');
-	}
-
-	public function testIsSensitiveOnUnknownAppThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isSensitive('unknown-app', 'inexistant-key');
-	}
-
-	public function testIsSensitiveOnSensitiveMistypedAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(true, $config->isSensitive('sensitive-app', 'non-lazy-key', true));
-	}
-
-	public function testIsSensitiveOnNonSensitiveMistypedAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->isSensitive('non-sensitive-app', 'non-lazy-key', true));
-	}
-
-	public function testIsSensitiveOnSensitiveMistypedAsNonLazyThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isSensitive('sensitive-app', 'lazy-key', false);
-	}
-
-	public function testIsSensitiveOnNonSensitiveMistypedAsNonLazyThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isSensitive('non-sensitive-app', 'lazy-key', false);
-	}
-
-	/**
-	 * @dataProvider providerGetKeys
-	 */
-	public function testIsLazy(string $appId, string $configKey, string $configValue, int $type, bool $lazy,
-	): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals($lazy, $config->isLazy($appId, $configKey));
-	}
-
-	public function testIsLazyOnNonExistentKeyThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isLazy(array_keys(self::$baseStruct)[0], 'inexistant-key');
-	}
-
-	public function testIsLazyOnUnknownAppThrowsException(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->isLazy('unknown-app', 'inexistant-key');
-	}
-
-	public function testGetAllValues(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'array' => ['test' => 1],
-				'bool' => true,
-				'float' => 3.14,
-				'int' => 42,
-				'mixed' => 'mix',
-				'string' => 'value',
-			],
-			$config->getAllValues('typed')
-		);
-	}
-
-	public function testGetAllValuesWithEmptyApp(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(InvalidArgumentException::class);
-		$config->getAllValues('');
-	}
-
-	/**
-	 * @dataProvider providerGetAppKeys
-	 *
-	 * @param string $appId
-	 * @param array $keys
-	 */
-	public function testGetAllValuesWithEmptyKey(string $appId, array $keys): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing($keys, array_keys($config->getAllValues($appId, '')));
-	}
-
-	public function testGetAllValuesWithPrefix(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing(['prefix1', 'prefix-2'], array_keys($config->getAllValues('prefix-app', 'prefix')));
-	}
-
-	public function testSearchValues(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing(['testapp' => 'true', '123456' => 'true', 'anotherapp' => 'false'], $config->searchValues('enabled'));
-	}
-
-	public function testGetValueString(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame('value', $config->getValueString('typed', 'string', ''));
-	}
-
-	public function testGetValueStringOnUnknownAppReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame('default-1', $config->getValueString('typed-1', 'string', 'default-1'));
-	}
-
-	public function testGetValueStringOnNonExistentKeyReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame('default-2', $config->getValueString('typed', 'string-2', 'default-2'));
-	}
-
-	public function testGetValueStringOnWrongType(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigTypeConflictException::class);
-		$config->getValueString('typed', 'int');
-	}
-
-	public function testGetNonLazyValueStringAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame('value', $config->getValueString('non-sensitive-app', 'non-lazy-key', 'default', lazy: true));
-	}
-
-	public function testGetValueInt(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(42, $config->getValueInt('typed', 'int', 0));
-	}
-
-	public function testGetValueIntOnUnknownAppReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(1, $config->getValueInt('typed-1', 'int', 1));
-	}
-
-	public function testGetValueIntOnNonExistentKeyReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(2, $config->getValueInt('typed', 'int-2', 2));
-	}
-
-	public function testGetValueIntOnWrongType(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigTypeConflictException::class);
-		$config->getValueInt('typed', 'float');
-	}
-
-	public function testGetValueFloat(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(3.14, $config->getValueFloat('typed', 'float', 0));
-	}
-
-	public function testGetValueFloatOnNonUnknownAppReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(1.11, $config->getValueFloat('typed-1', 'float', 1.11));
-	}
-
-	public function testGetValueFloatOnNonExistentKeyReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(2.22, $config->getValueFloat('typed', 'float-2', 2.22));
-	}
-
-	public function testGetValueFloatOnWrongType(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigTypeConflictException::class);
-		$config->getValueFloat('typed', 'bool');
-	}
-
-	public function testGetValueBool(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(true, $config->getValueBool('typed', 'bool'));
-	}
-
-	public function testGetValueBoolOnUnknownAppReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->getValueBool('typed-1', 'bool', false));
-	}
-
-	public function testGetValueBoolOnNonExistentKeyReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->getValueBool('typed', 'bool-2'));
-	}
-
-	public function testGetValueBoolOnWrongType(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigTypeConflictException::class);
-		$config->getValueBool('typed', 'array');
-	}
-
-	public function testGetValueArray(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('typed', 'array', []));
-	}
-
-	public function testGetValueArrayOnUnknownAppReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame([1], $config->getValueArray('typed-1', 'array', [1]));
-	}
-
-	public function testGetValueArrayOnNonExistentKeyReturnsDefault(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame([1, 2], $config->getValueArray('typed', 'array-2', [1, 2]));
-	}
-
-	public function testGetValueArrayOnWrongType(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigTypeConflictException::class);
-		$config->getValueArray('typed', 'string');
-	}
-
-
-	/**
-	 * @return array
-	 * @see testGetValueType
-	 *
-	 * @see testGetValueMixed
-	 */
-	public static function providerGetValueMixed(): array {
-		return [
-			// key, value, type
-			['mixed', 'mix', IAppConfig::VALUE_MIXED],
-			['string', 'value', IAppConfig::VALUE_STRING],
-			['int', '42', IAppConfig::VALUE_INT],
-			['float', '3.14', IAppConfig::VALUE_FLOAT],
-			['bool', '1', IAppConfig::VALUE_BOOL],
-			['array', '{"test": 1}', IAppConfig::VALUE_ARRAY],
-		];
-	}
-
-	/**
-	 * @dataProvider providerGetValueMixed
-	 *
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function testGetValueMixed(string $key, string $value): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame($value, $config->getValueMixed('typed', $key));
-	}
-
-	/**
-	 * @dataProvider providerGetValueMixed
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param int $type
-	 */
-	public function testGetValueType(string $key, string $value, int $type): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame($type, $config->getValueType('typed', $key));
-	}
-
-	public function testGetValueTypeOnUnknownApp(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->getValueType('typed-1', 'string');
-	}
-
-	public function testGetValueTypeOnNonExistentKey(): void {
-		$config = $this->generateAppConfig();
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$config->getValueType('typed', 'string-2');
-	}
-
-	public function testSetValueString(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetValueStringCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$status = $config->statusCache();
-		$this->assertSame('value-1', $status['fastCache']['feed']['string']);
-	}
-
-	public function testSetValueStringDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$config->clearCache();
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetValueStringIsUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$this->assertSame(true, $config->setValueString('feed', 'string', 'value-2'));
-	}
-
-	public function testSetValueStringIsNotUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$this->assertSame(false, $config->setValueString('feed', 'string', 'value-1'));
-	}
-
-	public function testSetValueStringIsUpdatedCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$config->setValueString('feed', 'string', 'value-2');
-		$status = $config->statusCache();
-		$this->assertSame('value-2', $status['fastCache']['feed']['string']);
-	}
-
-	public function testSetValueStringIsUpdatedDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1');
-		$config->setValueString('feed', 'string', 'value-2');
-		$config->clearCache();
-		$this->assertSame('value-2', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetValueInt(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetValueIntCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$status = $config->statusCache();
-		$this->assertSame('42', $status['fastCache']['feed']['int']);
-	}
-
-	public function testSetValueIntDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$config->clearCache();
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetValueIntIsUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$this->assertSame(true, $config->setValueInt('feed', 'int', 17));
-	}
-
-	public function testSetValueIntIsNotUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$this->assertSame(false, $config->setValueInt('feed', 'int', 42));
-	}
-
-	public function testSetValueIntIsUpdatedCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$config->setValueInt('feed', 'int', 17);
-		$status = $config->statusCache();
-		$this->assertSame('17', $status['fastCache']['feed']['int']);
-	}
-
-	public function testSetValueIntIsUpdatedDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$config->setValueInt('feed', 'int', 17);
-		$config->clearCache();
-		$this->assertSame(17, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetValueFloat(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetValueFloatCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$status = $config->statusCache();
-		$this->assertSame('3.14', $status['fastCache']['feed']['float']);
-	}
-
-	public function testSetValueFloatDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$config->clearCache();
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetValueFloatIsUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$this->assertSame(true, $config->setValueFloat('feed', 'float', 1.23));
-	}
-
-	public function testSetValueFloatIsNotUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$this->assertSame(false, $config->setValueFloat('feed', 'float', 3.14));
-	}
-
-	public function testSetValueFloatIsUpdatedCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$config->setValueFloat('feed', 'float', 1.23);
-		$status = $config->statusCache();
-		$this->assertSame('1.23', $status['fastCache']['feed']['float']);
-	}
-
-	public function testSetValueFloatIsUpdatedDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$config->setValueFloat('feed', 'float', 1.23);
-		$config->clearCache();
-		$this->assertSame(1.23, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetValueBool(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false));
-	}
-
-	public function testSetValueBoolCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$status = $config->statusCache();
-		$this->assertSame('1', $status['fastCache']['feed']['bool']);
-	}
-
-	public function testSetValueBoolDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$config->clearCache();
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false));
-	}
-
-	public function testSetValueBoolIsUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$this->assertSame(true, $config->setValueBool('feed', 'bool', false));
-	}
-
-	public function testSetValueBoolIsNotUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$this->assertSame(false, $config->setValueBool('feed', 'bool', true));
-	}
-
-	public function testSetValueBoolIsUpdatedCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$config->setValueBool('feed', 'bool', false);
-		$status = $config->statusCache();
-		$this->assertSame('0', $status['fastCache']['feed']['bool']);
-	}
-
-	public function testSetValueBoolIsUpdatedDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true);
-		$config->setValueBool('feed', 'bool', false);
-		$config->clearCache();
-		$this->assertSame(false, $config->getValueBool('feed', 'bool', true));
-	}
-
-
-	public function testSetValueArray(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetValueArrayCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$status = $config->statusCache();
-		$this->assertSame('{"test":1}', $status['fastCache']['feed']['array']);
-	}
-
-	public function testSetValueArrayDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$config->clearCache();
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetValueArrayIsUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$this->assertSame(true, $config->setValueArray('feed', 'array', ['test' => 2]));
-	}
-
-	public function testSetValueArrayIsNotUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$this->assertSame(false, $config->setValueArray('feed', 'array', ['test' => 1]));
-	}
-
-	public function testSetValueArrayIsUpdatedCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$config->setValueArray('feed', 'array', ['test' => 2]);
-		$status = $config->statusCache();
-		$this->assertSame('{"test":2}', $status['fastCache']['feed']['array']);
-	}
-
-	public function testSetValueArrayIsUpdatedDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$config->setValueArray('feed', 'array', ['test' => 2]);
-		$config->clearCache();
-		$this->assertSame(['test' => 2], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetLazyValueString(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', true);
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
-	}
-
-	public function testSetLazyValueStringCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', true);
-		$status = $config->statusCache();
-		$this->assertSame('value-1', $status['lazyCache']['feed']['string']);
-	}
-
-	public function testSetLazyValueStringDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', true);
-		$config->clearCache();
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
-	}
-
-	public function testSetLazyValueStringAsNonLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', true);
-		$config->setValueString('feed', 'string', 'value-1', false);
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetNonLazyValueStringAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', false);
-		$config->setValueString('feed', 'string', 'value-1', true);
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
-	}
-
-	public function testSetSensitiveValueString(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetSensitiveValueStringCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$status = $config->statusCache();
-		$this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['string']);
-	}
-
-	public function testSetSensitiveValueStringDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$config->clearCache();
-		$this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
-	}
-
-	public function testSetNonSensitiveValueStringAsSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: false);
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$this->assertSame(true, $config->isSensitive('feed', 'string'));
-
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-1');
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-2');
-	}
-
-	public function testSetSensitiveValueStringAsNonSensitiveStaysSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$config->setValueString('feed', 'string', 'value-2', sensitive: false);
-		$this->assertSame(true, $config->isSensitive('feed', 'string'));
-
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-1');
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-2');
-	}
-
-	public function testSetSensitiveValueStringAsNonSensitiveAreStillUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', 'value-1', sensitive: true);
-		$config->setValueString('feed', 'string', 'value-2', sensitive: false);
-		$this->assertSame('value-2', $config->getValueString('feed', 'string', ''));
-
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-1');
-		$this->assertConfigValueNotEquals('feed', 'string', 'value-2');
-	}
-
-	public function testSetLazyValueInt(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, true);
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
-	}
-
-	public function testSetLazyValueIntCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, true);
-		$status = $config->statusCache();
-		$this->assertSame('42', $status['lazyCache']['feed']['int']);
-	}
-
-	public function testSetLazyValueIntDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, true);
-		$config->clearCache();
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
-	}
-
-	public function testSetLazyValueIntAsNonLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, true);
-		$config->setValueInt('feed', 'int', 42, false);
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetNonLazyValueIntAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, false);
-		$config->setValueInt('feed', 'int', 42, true);
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
-	}
-
-	public function testSetSensitiveValueInt(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetSensitiveValueIntCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$status = $config->statusCache();
-		$this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['int']);
-	}
-
-	public function testSetSensitiveValueIntDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$config->clearCache();
-		$this->assertSame(42, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetNonSensitiveValueIntAsSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42);
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$this->assertSame(true, $config->isSensitive('feed', 'int'));
-	}
-
-	public function testSetSensitiveValueIntAsNonSensitiveStaysSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$config->setValueInt('feed', 'int', 17);
-		$this->assertSame(true, $config->isSensitive('feed', 'int'));
-	}
-
-	public function testSetSensitiveValueIntAsNonSensitiveAreStillUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueInt('feed', 'int', 42, sensitive: true);
-		$config->setValueInt('feed', 'int', 17);
-		$this->assertSame(17, $config->getValueInt('feed', 'int', 0));
-	}
-
-	public function testSetLazyValueFloat(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, true);
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
-	}
-
-	public function testSetLazyValueFloatCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, true);
-		$status = $config->statusCache();
-		$this->assertSame('3.14', $status['lazyCache']['feed']['float']);
-	}
-
-	public function testSetLazyValueFloatDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, true);
-		$config->clearCache();
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
-	}
-
-	public function testSetLazyValueFloatAsNonLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, true);
-		$config->setValueFloat('feed', 'float', 3.14, false);
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetNonLazyValueFloatAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, false);
-		$config->setValueFloat('feed', 'float', 3.14, true);
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
-	}
-
-	public function testSetSensitiveValueFloat(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetSensitiveValueFloatCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$status = $config->statusCache();
-		$this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['float']);
-	}
-
-	public function testSetSensitiveValueFloatDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$config->clearCache();
-		$this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetNonSensitiveValueFloatAsSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14);
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$this->assertSame(true, $config->isSensitive('feed', 'float'));
-	}
-
-	public function testSetSensitiveValueFloatAsNonSensitiveStaysSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$config->setValueFloat('feed', 'float', 1.23);
-		$this->assertSame(true, $config->isSensitive('feed', 'float'));
-	}
-
-	public function testSetSensitiveValueFloatAsNonSensitiveAreStillUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueFloat('feed', 'float', 3.14, sensitive: true);
-		$config->setValueFloat('feed', 'float', 1.23);
-		$this->assertSame(1.23, $config->getValueFloat('feed', 'float', 0));
-	}
-
-	public function testSetLazyValueBool(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true, true);
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
-	}
-
-	public function testSetLazyValueBoolCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true, true);
-		$status = $config->statusCache();
-		$this->assertSame('1', $status['lazyCache']['feed']['bool']);
-	}
-
-	public function testSetLazyValueBoolDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true, true);
-		$config->clearCache();
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
-	}
-
-	public function testSetLazyValueBoolAsNonLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true, true);
-		$config->setValueBool('feed', 'bool', true, false);
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false));
-	}
-
-	public function testSetNonLazyValueBoolAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueBool('feed', 'bool', true, false);
-		$config->setValueBool('feed', 'bool', true, true);
-		$this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
-	}
-
-	public function testSetLazyValueArray(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], true);
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
-	}
-
-	public function testSetLazyValueArrayCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], true);
-		$status = $config->statusCache();
-		$this->assertSame('{"test":1}', $status['lazyCache']['feed']['array']);
-	}
-
-	public function testSetLazyValueArrayDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], true);
-		$config->clearCache();
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
-	}
-
-	public function testSetLazyValueArrayAsNonLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], true);
-		$config->setValueArray('feed', 'array', ['test' => 1], false);
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetNonLazyValueArrayAsLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], false);
-		$config->setValueArray('feed', 'array', ['test' => 1], true);
-		$this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
-	}
-
-
-	public function testSetSensitiveValueArray(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetSensitiveValueArrayCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$status = $config->statusCache();
-		$this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['array']);
-	}
-
-	public function testSetSensitiveValueArrayDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$config->clearCache();
-		$this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testSetNonSensitiveValueArrayAsSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1]);
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$this->assertSame(true, $config->isSensitive('feed', 'array'));
-	}
-
-	public function testSetSensitiveValueArrayAsNonSensitiveStaysSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$config->setValueArray('feed', 'array', ['test' => 2]);
-		$this->assertSame(true, $config->isSensitive('feed', 'array'));
-	}
-
-	public function testSetSensitiveValueArrayAsNonSensitiveAreStillUpdated(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
-		$config->setValueArray('feed', 'array', ['test' => 2]);
-		$this->assertEqualsCanonicalizing(['test' => 2], $config->getValueArray('feed', 'array', []));
-	}
-
-	public function testUpdateNotSensitiveToSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->updateSensitive('non-sensitive-app', 'lazy-key', true);
-		$this->assertSame(true, $config->isSensitive('non-sensitive-app', 'lazy-key', true));
-	}
-
-	public function testUpdateSensitiveToNotSensitive(): void {
-		$config = $this->generateAppConfig();
-		$config->updateSensitive('sensitive-app', 'lazy-key', false);
-		$this->assertSame(false, $config->isSensitive('sensitive-app', 'lazy-key', true));
-	}
-
-	public function testUpdateSensitiveToSensitiveReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateSensitive('sensitive-app', 'lazy-key', true));
-	}
-
-	public function testUpdateNotSensitiveToNotSensitiveReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateSensitive('non-sensitive-app', 'lazy-key', false));
-	}
-
-	public function testUpdateSensitiveOnUnknownKeyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateSensitive('non-sensitive-app', 'unknown-key', true));
-	}
-
-	public function testUpdateNotLazyToLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->updateLazy('non-sensitive-app', 'non-lazy-key', true);
-		$this->assertSame(true, $config->isLazy('non-sensitive-app', 'non-lazy-key'));
-	}
-
-	public function testUpdateLazyToNotLazy(): void {
-		$config = $this->generateAppConfig();
-		$config->updateLazy('non-sensitive-app', 'lazy-key', false);
-		$this->assertSame(false, $config->isLazy('non-sensitive-app', 'lazy-key'));
-	}
-
-	public function testUpdateLazyToLazyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateLazy('non-sensitive-app', 'lazy-key', true));
-	}
-
-	public function testUpdateNotLazyToNotLazyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateLazy('non-sensitive-app', 'non-lazy-key', false));
-	}
-
-	public function testUpdateLazyOnUnknownKeyReturnsFalse(): void {
-		$config = $this->generateAppConfig();
-		$this->assertSame(false, $config->updateLazy('non-sensitive-app', 'unknown-key', true));
-	}
-
-	public function testGetDetails(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'non-sensitive-app',
-				'key' => 'lazy-key',
-				'value' => 'value',
-				'type' => 4,
-				'lazy' => true,
-				'typeString' => 'string',
-				'sensitive' => false,
-			],
-			$config->getDetails('non-sensitive-app', 'lazy-key')
-		);
-	}
-
-	public function testGetDetailsSensitive(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'sensitive-app',
-				'key' => 'lazy-key',
-				'value' => 'value',
-				'type' => 4,
-				'lazy' => true,
-				'typeString' => 'string',
-				'sensitive' => true,
-			],
-			$config->getDetails('sensitive-app', 'lazy-key')
-		);
-	}
-
-	public function testGetDetailsInt(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'typed',
-				'key' => 'int',
-				'value' => '42',
-				'type' => 8,
-				'lazy' => false,
-				'typeString' => 'integer',
-				'sensitive' => false
-			],
-			$config->getDetails('typed', 'int')
-		);
-	}
-
-	public function testGetDetailsFloat(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'typed',
-				'key' => 'float',
-				'value' => '3.14',
-				'type' => 16,
-				'lazy' => false,
-				'typeString' => 'float',
-				'sensitive' => false
-			],
-			$config->getDetails('typed', 'float')
-		);
-	}
-
-	public function testGetDetailsBool(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'typed',
-				'key' => 'bool',
-				'value' => '1',
-				'type' => 32,
-				'lazy' => false,
-				'typeString' => 'boolean',
-				'sensitive' => false
-			],
-			$config->getDetails('typed', 'bool')
-		);
-	}
-
-	public function testGetDetailsArray(): void {
-		$config = $this->generateAppConfig();
-		$this->assertEquals(
-			[
-				'app' => 'typed',
-				'key' => 'array',
-				'value' => '{"test": 1}',
-				'type' => 64,
-				'lazy' => false,
-				'typeString' => 'array',
-				'sensitive' => false
-			],
-			$config->getDetails('typed', 'array')
-		);
-	}
-
-	public function testDeleteKey(): void {
-		$config = $this->generateAppConfig();
-		$config->deleteKey('anotherapp', 'key');
-		$this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
-	}
-
-	public function testDeleteKeyCache(): void {
-		$config = $this->generateAppConfig();
-		$config->deleteKey('anotherapp', 'key');
-		$status = $config->statusCache();
-		$this->assertEqualsCanonicalizing(['enabled' => 'false'], $status['fastCache']['anotherapp']);
-	}
-
-	public function testDeleteKeyDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->deleteKey('anotherapp', 'key');
-		$config->clearCache();
-		$this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
-	}
-
-	public function testDeleteApp(): void {
-		$config = $this->generateAppConfig();
-		$config->deleteApp('anotherapp');
-		$this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
-		$this->assertSame('default', $config->getValueString('anotherapp', 'enabled', 'default'));
-	}
-
-	public function testDeleteAppCache(): void {
-		$config = $this->generateAppConfig();
-		$status = $config->statusCache();
-		$this->assertSame(true, isset($status['fastCache']['anotherapp']));
-		$config->deleteApp('anotherapp');
-		$status = $config->statusCache();
-		$this->assertSame(false, isset($status['fastCache']['anotherapp']));
-	}
-
-	public function testDeleteAppDatabase(): void {
-		$config = $this->generateAppConfig();
-		$config->deleteApp('anotherapp');
-		$config->clearCache();
-		$this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
-		$this->assertSame('default', $config->getValueString('anotherapp', 'enabled', 'default'));
-	}
-
-	public function testClearCache(): void {
-		$config = $this->generateAppConfig();
-		$config->setValueString('feed', 'string', '123454');
-		$config->clearCache();
-		$status = $config->statusCache();
-		$this->assertSame([], $status['fastCache']);
-	}
-
-	public function testSensitiveValuesAreEncrypted(): void {
-		$key = self::getUniqueID('secret');
-
-		$appConfig = $this->generateAppConfig();
-		$secret = md5((string)time());
-		$appConfig->setValueString('testapp', $key, $secret, sensitive: true);
-
-		$this->assertConfigValueNotEquals('testapp', $key, $secret);
-
-		// Can get in same run
-		$actualSecret = $appConfig->getValueString('testapp', $key);
-		$this->assertEquals($secret, $actualSecret);
-
-		// Can get freshly decrypted from DB
-		$newAppConfig = $this->generateAppConfig();
-		$actualSecret = $newAppConfig->getValueString('testapp', $key);
-		$this->assertEquals($secret, $actualSecret);
-	}
-
-	public function testMigratingNonSensitiveValueToSensitiveWithSetValue(): void {
-		$key = self::getUniqueID('secret');
-		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
-
-		// Unencrypted
-		$appConfig->setValueString('testapp', $key, $secret);
-		$this->assertConfigKey('testapp', $key, $secret);
-
-		// Can get freshly decrypted from DB
-		$newAppConfig = $this->generateAppConfig();
-		$actualSecret = $newAppConfig->getValueString('testapp', $key);
-		$this->assertEquals($secret, $actualSecret);
-
-		// Encrypting on change
-		$appConfig->setValueString('testapp', $key, $secret, sensitive: true);
-		$this->assertConfigValueNotEquals('testapp', $key, $secret);
-
-		// Can get in same run
-		$actualSecret = $appConfig->getValueString('testapp', $key);
-		$this->assertEquals($secret, $actualSecret);
-
-		// Can get freshly decrypted from DB
-		$newAppConfig = $this->generateAppConfig();
-		$actualSecret = $newAppConfig->getValueString('testapp', $key);
-		$this->assertEquals($secret, $actualSecret);
-	}
-
-	public function testUpdateSensitiveValueToNonSensitiveWithUpdateSensitive(): void {
-		$key = self::getUniqueID('secret');
-		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
-
-		// Encrypted
-		$appConfig->setValueString('testapp', $key, $secret, sensitive: true);
-		$this->assertConfigValueNotEquals('testapp', $key, $secret);
-
-		// Migrate to non-sensitive / non-encrypted
-		$appConfig->updateSensitive('testapp', $key, false);
-		$this->assertConfigKey('testapp', $key, $secret);
-	}
-
-	public function testUpdateNonSensitiveValueToSensitiveWithUpdateSensitive(): void {
-		$key = self::getUniqueID('secret');
-		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
-
-		// Unencrypted
-		$appConfig->setValueString('testapp', $key, $secret);
-		$this->assertConfigKey('testapp', $key, $secret);
-
-		// Migrate to sensitive / encrypted
-		$appConfig->updateSensitive('testapp', $key, true);
-		$this->assertConfigValueNotEquals('testapp', $key, $secret);
-	}
-
-	protected function loadConfigValueFromDatabase(string $app, string $key): string|false {
-		$sql = $this->connection->getQueryBuilder();
-		$sql->select('configvalue')
-			->from('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('appid', $app)
-			->setParameter('configkey', $key);
-		$query = $sql->executeQuery();
-		$actual = $query->fetchOne();
-		$query->closeCursor();
-
-		return $actual;
-	}
-
-	protected function assertConfigKey(string $app, string $key, string|false $expected): void {
-		$this->assertEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
-	}
-
-	protected function assertConfigValueNotEquals(string $app, string $key, string|false $expected): void {
-		$this->assertNotEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
-	}
+    protected IAppConfig $appConfig;
+    protected IDBConnection $connection;
+    private LoggerInterface $logger;
+    private ICrypto $crypto;
+
+    private array $originalConfig;
+
+    /**
+     * @var array<string, array<string, array<string, string, int, bool, bool>>>
+     *                                                                           [appId => [configKey, configValue, valueType, lazy, sensitive]]
+     */
+    private static array $baseStruct =
+        [
+            'testapp' => [
+                'enabled' => ['enabled', 'true'],
+                'installed_version' => ['installed_version', '1.2.3'],
+                'depends_on' => ['depends_on', 'someapp'],
+                'deletethis' => ['deletethis', 'deletethis'],
+                'key' => ['key', 'value']
+            ],
+            'someapp' => [
+                'key' => ['key', 'value'],
+                'otherkey' => ['otherkey', 'othervalue']
+            ],
+            '123456' => [
+                'enabled' => ['enabled', 'true'],
+                'key' => ['key', 'value']
+            ],
+            'anotherapp' => [
+                'enabled' => ['enabled', 'false'],
+                'key' => ['key', 'value']
+            ],
+            'non-sensitive-app' => [
+                'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true, false],
+                'non-lazy-key' => ['non-lazy-key', 'value', IAppConfig::VALUE_STRING, false, false],
+            ],
+            'sensitive-app' => [
+                'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true, true],
+                'non-lazy-key' => ['non-lazy-key', 'value', IAppConfig::VALUE_STRING, false, true],
+            ],
+            'only-lazy' => [
+                'lazy-key' => ['lazy-key', 'value', IAppConfig::VALUE_STRING, true]
+            ],
+            'typed' => [
+                'mixed' => ['mixed', 'mix', IAppConfig::VALUE_MIXED],
+                'string' => ['string', 'value', IAppConfig::VALUE_STRING],
+                'int' => ['int', '42', IAppConfig::VALUE_INT],
+                'float' => ['float', '3.14', IAppConfig::VALUE_FLOAT],
+                'bool' => ['bool', '1', IAppConfig::VALUE_BOOL],
+                'array' => ['array', '{"test": 1}', IAppConfig::VALUE_ARRAY],
+            ],
+            'prefix-app' => [
+                'key1' => ['key1', 'value'],
+                'prefix1' => ['prefix1', 'value'],
+                'prefix-2' => ['prefix-2', 'value'],
+                'key-2' => ['key-2', 'value'],
+            ]
+        ];
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = \OCP\Server::get(IDBConnection::class);
+        $this->logger = \OCP\Server::get(LoggerInterface::class);
+        $this->crypto = \OCP\Server::get(ICrypto::class);
+
+        // storing current config and emptying the data table
+        $sql = $this->connection->getQueryBuilder();
+        $sql->select('*')
+            ->from('appconfig');
+        $result = $sql->executeQuery();
+        $this->originalConfig = $result->fetchAll();
+        $result->closeCursor();
+
+        $sql = $this->connection->getQueryBuilder();
+        $sql->delete('appconfig');
+        $sql->executeStatement();
+
+        $sql = $this->connection->getQueryBuilder();
+        $sql->insert('appconfig')
+            ->values(
+                [
+                    'appid' => $sql->createParameter('appid'),
+                    'configkey' => $sql->createParameter('configkey'),
+                    'configvalue' => $sql->createParameter('configvalue'),
+                    'type' => $sql->createParameter('type'),
+                    'lazy' => $sql->createParameter('lazy')
+                ]
+            );
+
+        foreach (self::$baseStruct as $appId => $appData) {
+            foreach ($appData as $key => $row) {
+                $value = $row[1];
+                $type = $row[2] ?? IAppConfig::VALUE_MIXED;
+                if (($row[4] ?? false) === true) {
+                    $type |= IAppConfig::VALUE_SENSITIVE;
+                    $value = self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX') . $this->crypto->encrypt($value);
+                    self::$baseStruct[$appId][$key]['encrypted'] = $value;
+                }
+
+                $sql->setParameters(
+                    [
+                        'appid' => $appId,
+                        'configkey' => $row[0],
+                        'configvalue' => $value,
+                        'type' => $type,
+                        'lazy' => (($row[3] ?? false) === true) ? 1 : 0
+                    ]
+                )->executeStatement();
+            }
+        }
+    }
+
+    protected function tearDown(): void {
+        $sql = $this->connection->getQueryBuilder();
+        $sql->delete('appconfig');
+        $sql->executeStatement();
+
+        $sql = $this->connection->getQueryBuilder();
+        $sql->insert('appconfig')
+            ->values(
+                [
+                    'appid' => $sql->createParameter('appid'),
+                    'configkey' => $sql->createParameter('configkey'),
+                    'configvalue' => $sql->createParameter('configvalue'),
+                    'lazy' => $sql->createParameter('lazy'),
+                    'type' => $sql->createParameter('type'),
+                ]
+            );
+
+        foreach ($this->originalConfig as $key => $configs) {
+            $sql->setParameter('appid', $configs['appid'])
+                ->setParameter('configkey', $configs['configkey'])
+                ->setParameter('configvalue', $configs['configvalue'])
+                ->setParameter('lazy', ($configs['lazy'] === '1') ? '1' : '0')
+                ->setParameter('type', $configs['type']);
+            $sql->executeStatement();
+        }
+
+        //		$this->restoreService(AppConfig::class);
+        parent::tearDown();
+    }
+
+    /**
+     * @param bool $preLoading TRUE will preload the 'fast' cache, which is the normal behavior of usual
+     *                         IAppConfig
+     *
+     * @return IAppConfig
+     */
+    private function generateAppConfig(bool $preLoading = true): IAppConfig {
+        /** @var AppConfig $config */
+        $config = new \OC\AppConfig(
+            $this->connection,
+            $this->logger,
+            $this->crypto,
+        );
+        $msg = ' generateAppConfig() failed to confirm cache status';
+
+        // confirm cache status
+        $status = $config->statusCache();
+        $this->assertSame(false, $status['fastLoaded'], $msg);
+        $this->assertSame(false, $status['lazyLoaded'], $msg);
+        $this->assertSame([], $status['fastCache'], $msg);
+        $this->assertSame([], $status['lazyCache'], $msg);
+        if ($preLoading) {
+            // simple way to initiate the load of non-lazy config values in cache
+            $config->getValueString('core', 'preload', '');
+
+            // confirm cache status
+            $status = $config->statusCache();
+            $this->assertSame(true, $status['fastLoaded'], $msg);
+            $this->assertSame(false, $status['lazyLoaded'], $msg);
+
+            $apps = array_values(array_diff(array_keys(self::$baseStruct), ['only-lazy']));
+            $this->assertEqualsCanonicalizing($apps, array_keys($status['fastCache']), $msg);
+            $this->assertSame([], array_keys($status['lazyCache']), $msg);
+        }
+
+        return $config;
+    }
+
+    public function testGetApps(): void {
+        $config = $this->generateAppConfig(false);
+
+        $this->assertEqualsCanonicalizing(array_keys(self::$baseStruct), $config->getApps());
+    }
+
+    /**
+     * returns list of app and their keys
+     *
+     * @return array<string, string[]> ['appId' => ['key1', 'key2', ]]
+     * @see testGetKeys
+     */
+    public static function providerGetAppKeys(): array {
+        $appKeys = [];
+        foreach (self::$baseStruct as $appId => $appData) {
+            $keys = [];
+            foreach ($appData as $row) {
+                $keys[] = $row[0];
+            }
+            $appKeys[] = [(string)$appId, $keys];
+        }
+
+        return $appKeys;
+    }
+
+    /**
+     * returns list of config keys
+     *
+     * @return array<string, string, string, int, bool, bool> [appId, key, value, type, lazy, sensitive]
+     * @see testIsSensitive
+     * @see testIsLazy
+     * @see testGetKeys
+     */
+    public static function providerGetKeys(): array {
+        $appKeys = [];
+        foreach (self::$baseStruct as $appId => $appData) {
+            foreach ($appData as $row) {
+                $appKeys[] = [
+                    (string)$appId, $row[0], $row[1], $row[2] ?? IAppConfig::VALUE_MIXED, $row[3] ?? false,
+                    $row[4] ?? false
+                ];
+            }
+        }
+
+        return $appKeys;
+    }
+
+    /**
+     * @dataProvider providerGetAppKeys
+     *
+     * @param string $appId
+     * @param array $expectedKeys
+     */
+    public function testGetKeys(string $appId, array $expectedKeys): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing($expectedKeys, $config->getKeys($appId));
+    }
+
+    public function testGetKeysOnUnknownAppShouldReturnsEmptyArray(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing([], $config->getKeys('unknown-app'));
+    }
+
+    /**
+     * @dataProvider providerGetKeys
+     *
+     * @param string $appId
+     * @param string $configKey
+     * @param string $value
+     * @param bool $lazy
+     */
+    public function testHasKey(string $appId, string $configKey, string $value, int $type, bool $lazy): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(true, $config->hasKey($appId, $configKey, $lazy));
+    }
+
+    public function testHasKeyOnNonExistentKeyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(false, $config->hasKey(array_keys(self::$baseStruct)[0], 'inexistant-key'));
+    }
+
+    public function testHasKeyOnUnknownAppReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(false, $config->hasKey('inexistant-app', 'inexistant-key'));
+    }
+
+    public function testHasKeyOnMistypedAsLazyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->hasKey('non-sensitive-app', 'non-lazy-key', true));
+    }
+
+    public function testHasKeyOnMistypeAsNonLazyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->hasKey('non-sensitive-app', 'lazy-key', false));
+    }
+
+    public function testHasKeyOnMistypeAsNonLazyReturnsTrueWithLazyArgumentIsNull(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(true, $config->hasKey('non-sensitive-app', 'lazy-key', null));
+    }
+
+    /**
+     * @dataProvider providerGetKeys
+     */
+    public function testIsSensitive(
+        string $appId, string $configKey, string $configValue, int $type, bool $lazy, bool $sensitive,
+    ): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals($sensitive, $config->isSensitive($appId, $configKey, $lazy));
+    }
+
+    public function testIsSensitiveOnNonExistentKeyThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isSensitive(array_keys(self::$baseStruct)[0], 'inexistant-key');
+    }
+
+    public function testIsSensitiveOnUnknownAppThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isSensitive('unknown-app', 'inexistant-key');
+    }
+
+    public function testIsSensitiveOnSensitiveMistypedAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(true, $config->isSensitive('sensitive-app', 'non-lazy-key', true));
+    }
+
+    public function testIsSensitiveOnNonSensitiveMistypedAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->isSensitive('non-sensitive-app', 'non-lazy-key', true));
+    }
+
+    public function testIsSensitiveOnSensitiveMistypedAsNonLazyThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isSensitive('sensitive-app', 'lazy-key', false);
+    }
+
+    public function testIsSensitiveOnNonSensitiveMistypedAsNonLazyThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isSensitive('non-sensitive-app', 'lazy-key', false);
+    }
+
+    /**
+     * @dataProvider providerGetKeys
+     */
+    public function testIsLazy(string $appId, string $configKey, string $configValue, int $type, bool $lazy,
+    ): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals($lazy, $config->isLazy($appId, $configKey));
+    }
+
+    public function testIsLazyOnNonExistentKeyThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isLazy(array_keys(self::$baseStruct)[0], 'inexistant-key');
+    }
+
+    public function testIsLazyOnUnknownAppThrowsException(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->isLazy('unknown-app', 'inexistant-key');
+    }
+
+    public function testGetAllValues(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'array' => ['test' => 1],
+                'bool' => true,
+                'float' => 3.14,
+                'int' => 42,
+                'mixed' => 'mix',
+                'string' => 'value',
+            ],
+            $config->getAllValues('typed')
+        );
+    }
+
+    public function testGetAllValuesWithEmptyApp(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(InvalidArgumentException::class);
+        $config->getAllValues('');
+    }
+
+    /**
+     * @dataProvider providerGetAppKeys
+     *
+     * @param string $appId
+     * @param array $keys
+     */
+    public function testGetAllValuesWithEmptyKey(string $appId, array $keys): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing($keys, array_keys($config->getAllValues($appId, '')));
+    }
+
+    public function testGetAllValuesWithPrefix(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing(['prefix1', 'prefix-2'], array_keys($config->getAllValues('prefix-app', 'prefix')));
+    }
+
+    public function testSearchValues(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing(['testapp' => 'true', '123456' => 'true', 'anotherapp' => 'false'], $config->searchValues('enabled'));
+    }
+
+    public function testGetValueString(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame('value', $config->getValueString('typed', 'string', ''));
+    }
+
+    public function testGetValueStringOnUnknownAppReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame('default-1', $config->getValueString('typed-1', 'string', 'default-1'));
+    }
+
+    public function testGetValueStringOnNonExistentKeyReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame('default-2', $config->getValueString('typed', 'string-2', 'default-2'));
+    }
+
+    public function testGetValueStringOnWrongType(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigTypeConflictException::class);
+        $config->getValueString('typed', 'int');
+    }
+
+    public function testGetNonLazyValueStringAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame('value', $config->getValueString('non-sensitive-app', 'non-lazy-key', 'default', lazy: true));
+    }
+
+    public function testGetValueInt(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(42, $config->getValueInt('typed', 'int', 0));
+    }
+
+    public function testGetValueIntOnUnknownAppReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(1, $config->getValueInt('typed-1', 'int', 1));
+    }
+
+    public function testGetValueIntOnNonExistentKeyReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(2, $config->getValueInt('typed', 'int-2', 2));
+    }
+
+    public function testGetValueIntOnWrongType(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigTypeConflictException::class);
+        $config->getValueInt('typed', 'float');
+    }
+
+    public function testGetValueFloat(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(3.14, $config->getValueFloat('typed', 'float', 0));
+    }
+
+    public function testGetValueFloatOnNonUnknownAppReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(1.11, $config->getValueFloat('typed-1', 'float', 1.11));
+    }
+
+    public function testGetValueFloatOnNonExistentKeyReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(2.22, $config->getValueFloat('typed', 'float-2', 2.22));
+    }
+
+    public function testGetValueFloatOnWrongType(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigTypeConflictException::class);
+        $config->getValueFloat('typed', 'bool');
+    }
+
+    public function testGetValueBool(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(true, $config->getValueBool('typed', 'bool'));
+    }
+
+    public function testGetValueBoolOnUnknownAppReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->getValueBool('typed-1', 'bool', false));
+    }
+
+    public function testGetValueBoolOnNonExistentKeyReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->getValueBool('typed', 'bool-2'));
+    }
+
+    public function testGetValueBoolOnWrongType(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigTypeConflictException::class);
+        $config->getValueBool('typed', 'array');
+    }
+
+    public function testGetValueArray(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('typed', 'array', []));
+    }
+
+    public function testGetValueArrayOnUnknownAppReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame([1], $config->getValueArray('typed-1', 'array', [1]));
+    }
+
+    public function testGetValueArrayOnNonExistentKeyReturnsDefault(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame([1, 2], $config->getValueArray('typed', 'array-2', [1, 2]));
+    }
+
+    public function testGetValueArrayOnWrongType(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigTypeConflictException::class);
+        $config->getValueArray('typed', 'string');
+    }
+
+
+    /**
+     * @return array
+     * @see testGetValueType
+     *
+     * @see testGetValueMixed
+     */
+    public static function providerGetValueMixed(): array {
+        return [
+            // key, value, type
+            ['mixed', 'mix', IAppConfig::VALUE_MIXED],
+            ['string', 'value', IAppConfig::VALUE_STRING],
+            ['int', '42', IAppConfig::VALUE_INT],
+            ['float', '3.14', IAppConfig::VALUE_FLOAT],
+            ['bool', '1', IAppConfig::VALUE_BOOL],
+            ['array', '{"test": 1}', IAppConfig::VALUE_ARRAY],
+        ];
+    }
+
+    /**
+     * @dataProvider providerGetValueMixed
+     *
+     * @param string $key
+     * @param string $value
+     */
+    public function testGetValueMixed(string $key, string $value): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame($value, $config->getValueMixed('typed', $key));
+    }
+
+    /**
+     * @dataProvider providerGetValueMixed
+     *
+     * @param string $key
+     * @param string $value
+     * @param int $type
+     */
+    public function testGetValueType(string $key, string $value, int $type): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame($type, $config->getValueType('typed', $key));
+    }
+
+    public function testGetValueTypeOnUnknownApp(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->getValueType('typed-1', 'string');
+    }
+
+    public function testGetValueTypeOnNonExistentKey(): void {
+        $config = $this->generateAppConfig();
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $config->getValueType('typed', 'string-2');
+    }
+
+    public function testSetValueString(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetValueStringCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $status = $config->statusCache();
+        $this->assertSame('value-1', $status['fastCache']['feed']['string']);
+    }
+
+    public function testSetValueStringDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $config->clearCache();
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetValueStringIsUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $this->assertSame(true, $config->setValueString('feed', 'string', 'value-2'));
+    }
+
+    public function testSetValueStringIsNotUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $this->assertSame(false, $config->setValueString('feed', 'string', 'value-1'));
+    }
+
+    public function testSetValueStringIsUpdatedCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $config->setValueString('feed', 'string', 'value-2');
+        $status = $config->statusCache();
+        $this->assertSame('value-2', $status['fastCache']['feed']['string']);
+    }
+
+    public function testSetValueStringIsUpdatedDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1');
+        $config->setValueString('feed', 'string', 'value-2');
+        $config->clearCache();
+        $this->assertSame('value-2', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetValueInt(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetValueIntCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $status = $config->statusCache();
+        $this->assertSame('42', $status['fastCache']['feed']['int']);
+    }
+
+    public function testSetValueIntDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $config->clearCache();
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetValueIntIsUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $this->assertSame(true, $config->setValueInt('feed', 'int', 17));
+    }
+
+    public function testSetValueIntIsNotUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $this->assertSame(false, $config->setValueInt('feed', 'int', 42));
+    }
+
+    public function testSetValueIntIsUpdatedCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $config->setValueInt('feed', 'int', 17);
+        $status = $config->statusCache();
+        $this->assertSame('17', $status['fastCache']['feed']['int']);
+    }
+
+    public function testSetValueIntIsUpdatedDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $config->setValueInt('feed', 'int', 17);
+        $config->clearCache();
+        $this->assertSame(17, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetValueFloat(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetValueFloatCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $status = $config->statusCache();
+        $this->assertSame('3.14', $status['fastCache']['feed']['float']);
+    }
+
+    public function testSetValueFloatDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $config->clearCache();
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetValueFloatIsUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $this->assertSame(true, $config->setValueFloat('feed', 'float', 1.23));
+    }
+
+    public function testSetValueFloatIsNotUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $this->assertSame(false, $config->setValueFloat('feed', 'float', 3.14));
+    }
+
+    public function testSetValueFloatIsUpdatedCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $config->setValueFloat('feed', 'float', 1.23);
+        $status = $config->statusCache();
+        $this->assertSame('1.23', $status['fastCache']['feed']['float']);
+    }
+
+    public function testSetValueFloatIsUpdatedDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $config->setValueFloat('feed', 'float', 1.23);
+        $config->clearCache();
+        $this->assertSame(1.23, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetValueBool(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false));
+    }
+
+    public function testSetValueBoolCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $status = $config->statusCache();
+        $this->assertSame('1', $status['fastCache']['feed']['bool']);
+    }
+
+    public function testSetValueBoolDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $config->clearCache();
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false));
+    }
+
+    public function testSetValueBoolIsUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $this->assertSame(true, $config->setValueBool('feed', 'bool', false));
+    }
+
+    public function testSetValueBoolIsNotUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $this->assertSame(false, $config->setValueBool('feed', 'bool', true));
+    }
+
+    public function testSetValueBoolIsUpdatedCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $config->setValueBool('feed', 'bool', false);
+        $status = $config->statusCache();
+        $this->assertSame('0', $status['fastCache']['feed']['bool']);
+    }
+
+    public function testSetValueBoolIsUpdatedDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true);
+        $config->setValueBool('feed', 'bool', false);
+        $config->clearCache();
+        $this->assertSame(false, $config->getValueBool('feed', 'bool', true));
+    }
+
+
+    public function testSetValueArray(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetValueArrayCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $status = $config->statusCache();
+        $this->assertSame('{"test":1}', $status['fastCache']['feed']['array']);
+    }
+
+    public function testSetValueArrayDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $config->clearCache();
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetValueArrayIsUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $this->assertSame(true, $config->setValueArray('feed', 'array', ['test' => 2]));
+    }
+
+    public function testSetValueArrayIsNotUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $this->assertSame(false, $config->setValueArray('feed', 'array', ['test' => 1]));
+    }
+
+    public function testSetValueArrayIsUpdatedCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $config->setValueArray('feed', 'array', ['test' => 2]);
+        $status = $config->statusCache();
+        $this->assertSame('{"test":2}', $status['fastCache']['feed']['array']);
+    }
+
+    public function testSetValueArrayIsUpdatedDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $config->setValueArray('feed', 'array', ['test' => 2]);
+        $config->clearCache();
+        $this->assertSame(['test' => 2], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetLazyValueString(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', true);
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
+    }
+
+    public function testSetLazyValueStringCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', true);
+        $status = $config->statusCache();
+        $this->assertSame('value-1', $status['lazyCache']['feed']['string']);
+    }
+
+    public function testSetLazyValueStringDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', true);
+        $config->clearCache();
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
+    }
+
+    public function testSetLazyValueStringAsNonLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', true);
+        $config->setValueString('feed', 'string', 'value-1', false);
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetNonLazyValueStringAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', false);
+        $config->setValueString('feed', 'string', 'value-1', true);
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', '', true));
+    }
+
+    public function testSetSensitiveValueString(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetSensitiveValueStringCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $status = $config->statusCache();
+        $this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['string']);
+    }
+
+    public function testSetSensitiveValueStringDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $config->clearCache();
+        $this->assertSame('value-1', $config->getValueString('feed', 'string', ''));
+    }
+
+    public function testSetNonSensitiveValueStringAsSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: false);
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $this->assertSame(true, $config->isSensitive('feed', 'string'));
+
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-1');
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-2');
+    }
+
+    public function testSetSensitiveValueStringAsNonSensitiveStaysSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $config->setValueString('feed', 'string', 'value-2', sensitive: false);
+        $this->assertSame(true, $config->isSensitive('feed', 'string'));
+
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-1');
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-2');
+    }
+
+    public function testSetSensitiveValueStringAsNonSensitiveAreStillUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', 'value-1', sensitive: true);
+        $config->setValueString('feed', 'string', 'value-2', sensitive: false);
+        $this->assertSame('value-2', $config->getValueString('feed', 'string', ''));
+
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-1');
+        $this->assertConfigValueNotEquals('feed', 'string', 'value-2');
+    }
+
+    public function testSetLazyValueInt(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, true);
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
+    }
+
+    public function testSetLazyValueIntCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, true);
+        $status = $config->statusCache();
+        $this->assertSame('42', $status['lazyCache']['feed']['int']);
+    }
+
+    public function testSetLazyValueIntDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, true);
+        $config->clearCache();
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
+    }
+
+    public function testSetLazyValueIntAsNonLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, true);
+        $config->setValueInt('feed', 'int', 42, false);
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetNonLazyValueIntAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, false);
+        $config->setValueInt('feed', 'int', 42, true);
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0, true));
+    }
+
+    public function testSetSensitiveValueInt(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetSensitiveValueIntCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $status = $config->statusCache();
+        $this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['int']);
+    }
+
+    public function testSetSensitiveValueIntDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $config->clearCache();
+        $this->assertSame(42, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetNonSensitiveValueIntAsSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42);
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $this->assertSame(true, $config->isSensitive('feed', 'int'));
+    }
+
+    public function testSetSensitiveValueIntAsNonSensitiveStaysSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $config->setValueInt('feed', 'int', 17);
+        $this->assertSame(true, $config->isSensitive('feed', 'int'));
+    }
+
+    public function testSetSensitiveValueIntAsNonSensitiveAreStillUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueInt('feed', 'int', 42, sensitive: true);
+        $config->setValueInt('feed', 'int', 17);
+        $this->assertSame(17, $config->getValueInt('feed', 'int', 0));
+    }
+
+    public function testSetLazyValueFloat(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, true);
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
+    }
+
+    public function testSetLazyValueFloatCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, true);
+        $status = $config->statusCache();
+        $this->assertSame('3.14', $status['lazyCache']['feed']['float']);
+    }
+
+    public function testSetLazyValueFloatDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, true);
+        $config->clearCache();
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
+    }
+
+    public function testSetLazyValueFloatAsNonLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, true);
+        $config->setValueFloat('feed', 'float', 3.14, false);
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetNonLazyValueFloatAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, false);
+        $config->setValueFloat('feed', 'float', 3.14, true);
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0, true));
+    }
+
+    public function testSetSensitiveValueFloat(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetSensitiveValueFloatCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $status = $config->statusCache();
+        $this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['float']);
+    }
+
+    public function testSetSensitiveValueFloatDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $config->clearCache();
+        $this->assertSame(3.14, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetNonSensitiveValueFloatAsSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14);
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $this->assertSame(true, $config->isSensitive('feed', 'float'));
+    }
+
+    public function testSetSensitiveValueFloatAsNonSensitiveStaysSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $config->setValueFloat('feed', 'float', 1.23);
+        $this->assertSame(true, $config->isSensitive('feed', 'float'));
+    }
+
+    public function testSetSensitiveValueFloatAsNonSensitiveAreStillUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueFloat('feed', 'float', 3.14, sensitive: true);
+        $config->setValueFloat('feed', 'float', 1.23);
+        $this->assertSame(1.23, $config->getValueFloat('feed', 'float', 0));
+    }
+
+    public function testSetLazyValueBool(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true, true);
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
+    }
+
+    public function testSetLazyValueBoolCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true, true);
+        $status = $config->statusCache();
+        $this->assertSame('1', $status['lazyCache']['feed']['bool']);
+    }
+
+    public function testSetLazyValueBoolDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true, true);
+        $config->clearCache();
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
+    }
+
+    public function testSetLazyValueBoolAsNonLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true, true);
+        $config->setValueBool('feed', 'bool', true, false);
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false));
+    }
+
+    public function testSetNonLazyValueBoolAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueBool('feed', 'bool', true, false);
+        $config->setValueBool('feed', 'bool', true, true);
+        $this->assertSame(true, $config->getValueBool('feed', 'bool', false, true));
+    }
+
+    public function testSetLazyValueArray(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], true);
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
+    }
+
+    public function testSetLazyValueArrayCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], true);
+        $status = $config->statusCache();
+        $this->assertSame('{"test":1}', $status['lazyCache']['feed']['array']);
+    }
+
+    public function testSetLazyValueArrayDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], true);
+        $config->clearCache();
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
+    }
+
+    public function testSetLazyValueArrayAsNonLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], true);
+        $config->setValueArray('feed', 'array', ['test' => 1], false);
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetNonLazyValueArrayAsLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], false);
+        $config->setValueArray('feed', 'array', ['test' => 1], true);
+        $this->assertSame(['test' => 1], $config->getValueArray('feed', 'array', [], true));
+    }
+
+
+    public function testSetSensitiveValueArray(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetSensitiveValueArrayCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $status = $config->statusCache();
+        $this->assertStringStartsWith(self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX'), $status['fastCache']['feed']['array']);
+    }
+
+    public function testSetSensitiveValueArrayDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $config->clearCache();
+        $this->assertEqualsCanonicalizing(['test' => 1], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testSetNonSensitiveValueArrayAsSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1]);
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $this->assertSame(true, $config->isSensitive('feed', 'array'));
+    }
+
+    public function testSetSensitiveValueArrayAsNonSensitiveStaysSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $config->setValueArray('feed', 'array', ['test' => 2]);
+        $this->assertSame(true, $config->isSensitive('feed', 'array'));
+    }
+
+    public function testSetSensitiveValueArrayAsNonSensitiveAreStillUpdated(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueArray('feed', 'array', ['test' => 1], sensitive: true);
+        $config->setValueArray('feed', 'array', ['test' => 2]);
+        $this->assertEqualsCanonicalizing(['test' => 2], $config->getValueArray('feed', 'array', []));
+    }
+
+    public function testUpdateNotSensitiveToSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->updateSensitive('non-sensitive-app', 'lazy-key', true);
+        $this->assertSame(true, $config->isSensitive('non-sensitive-app', 'lazy-key', true));
+    }
+
+    public function testUpdateSensitiveToNotSensitive(): void {
+        $config = $this->generateAppConfig();
+        $config->updateSensitive('sensitive-app', 'lazy-key', false);
+        $this->assertSame(false, $config->isSensitive('sensitive-app', 'lazy-key', true));
+    }
+
+    public function testUpdateSensitiveToSensitiveReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateSensitive('sensitive-app', 'lazy-key', true));
+    }
+
+    public function testUpdateNotSensitiveToNotSensitiveReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateSensitive('non-sensitive-app', 'lazy-key', false));
+    }
+
+    public function testUpdateSensitiveOnUnknownKeyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateSensitive('non-sensitive-app', 'unknown-key', true));
+    }
+
+    public function testUpdateNotLazyToLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->updateLazy('non-sensitive-app', 'non-lazy-key', true);
+        $this->assertSame(true, $config->isLazy('non-sensitive-app', 'non-lazy-key'));
+    }
+
+    public function testUpdateLazyToNotLazy(): void {
+        $config = $this->generateAppConfig();
+        $config->updateLazy('non-sensitive-app', 'lazy-key', false);
+        $this->assertSame(false, $config->isLazy('non-sensitive-app', 'lazy-key'));
+    }
+
+    public function testUpdateLazyToLazyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateLazy('non-sensitive-app', 'lazy-key', true));
+    }
+
+    public function testUpdateNotLazyToNotLazyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateLazy('non-sensitive-app', 'non-lazy-key', false));
+    }
+
+    public function testUpdateLazyOnUnknownKeyReturnsFalse(): void {
+        $config = $this->generateAppConfig();
+        $this->assertSame(false, $config->updateLazy('non-sensitive-app', 'unknown-key', true));
+    }
+
+    public function testGetDetails(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'non-sensitive-app',
+                'key' => 'lazy-key',
+                'value' => 'value',
+                'type' => 4,
+                'lazy' => true,
+                'typeString' => 'string',
+                'sensitive' => false,
+            ],
+            $config->getDetails('non-sensitive-app', 'lazy-key')
+        );
+    }
+
+    public function testGetDetailsSensitive(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'sensitive-app',
+                'key' => 'lazy-key',
+                'value' => 'value',
+                'type' => 4,
+                'lazy' => true,
+                'typeString' => 'string',
+                'sensitive' => true,
+            ],
+            $config->getDetails('sensitive-app', 'lazy-key')
+        );
+    }
+
+    public function testGetDetailsInt(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'typed',
+                'key' => 'int',
+                'value' => '42',
+                'type' => 8,
+                'lazy' => false,
+                'typeString' => 'integer',
+                'sensitive' => false
+            ],
+            $config->getDetails('typed', 'int')
+        );
+    }
+
+    public function testGetDetailsFloat(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'typed',
+                'key' => 'float',
+                'value' => '3.14',
+                'type' => 16,
+                'lazy' => false,
+                'typeString' => 'float',
+                'sensitive' => false
+            ],
+            $config->getDetails('typed', 'float')
+        );
+    }
+
+    public function testGetDetailsBool(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'typed',
+                'key' => 'bool',
+                'value' => '1',
+                'type' => 32,
+                'lazy' => false,
+                'typeString' => 'boolean',
+                'sensitive' => false
+            ],
+            $config->getDetails('typed', 'bool')
+        );
+    }
+
+    public function testGetDetailsArray(): void {
+        $config = $this->generateAppConfig();
+        $this->assertEquals(
+            [
+                'app' => 'typed',
+                'key' => 'array',
+                'value' => '{"test": 1}',
+                'type' => 64,
+                'lazy' => false,
+                'typeString' => 'array',
+                'sensitive' => false
+            ],
+            $config->getDetails('typed', 'array')
+        );
+    }
+
+    public function testDeleteKey(): void {
+        $config = $this->generateAppConfig();
+        $config->deleteKey('anotherapp', 'key');
+        $this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
+    }
+
+    public function testDeleteKeyCache(): void {
+        $config = $this->generateAppConfig();
+        $config->deleteKey('anotherapp', 'key');
+        $status = $config->statusCache();
+        $this->assertEqualsCanonicalizing(['enabled' => 'false'], $status['fastCache']['anotherapp']);
+    }
+
+    public function testDeleteKeyDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->deleteKey('anotherapp', 'key');
+        $config->clearCache();
+        $this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
+    }
+
+    public function testDeleteApp(): void {
+        $config = $this->generateAppConfig();
+        $config->deleteApp('anotherapp');
+        $this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
+        $this->assertSame('default', $config->getValueString('anotherapp', 'enabled', 'default'));
+    }
+
+    public function testDeleteAppCache(): void {
+        $config = $this->generateAppConfig();
+        $status = $config->statusCache();
+        $this->assertSame(true, isset($status['fastCache']['anotherapp']));
+        $config->deleteApp('anotherapp');
+        $status = $config->statusCache();
+        $this->assertSame(false, isset($status['fastCache']['anotherapp']));
+    }
+
+    public function testDeleteAppDatabase(): void {
+        $config = $this->generateAppConfig();
+        $config->deleteApp('anotherapp');
+        $config->clearCache();
+        $this->assertSame('default', $config->getValueString('anotherapp', 'key', 'default'));
+        $this->assertSame('default', $config->getValueString('anotherapp', 'enabled', 'default'));
+    }
+
+    public function testClearCache(): void {
+        $config = $this->generateAppConfig();
+        $config->setValueString('feed', 'string', '123454');
+        $config->clearCache();
+        $status = $config->statusCache();
+        $this->assertSame([], $status['fastCache']);
+    }
+
+    public function testSensitiveValuesAreEncrypted(): void {
+        $key = self::getUniqueID('secret');
+
+        $appConfig = $this->generateAppConfig();
+        $secret = md5((string)time());
+        $appConfig->setValueString('testapp', $key, $secret, sensitive: true);
+
+        $this->assertConfigValueNotEquals('testapp', $key, $secret);
+
+        // Can get in same run
+        $actualSecret = $appConfig->getValueString('testapp', $key);
+        $this->assertEquals($secret, $actualSecret);
+
+        // Can get freshly decrypted from DB
+        $newAppConfig = $this->generateAppConfig();
+        $actualSecret = $newAppConfig->getValueString('testapp', $key);
+        $this->assertEquals($secret, $actualSecret);
+    }
+
+    public function testMigratingNonSensitiveValueToSensitiveWithSetValue(): void {
+        $key = self::getUniqueID('secret');
+        $appConfig = $this->generateAppConfig();
+        $secret = sha1((string)time());
+
+        // Unencrypted
+        $appConfig->setValueString('testapp', $key, $secret);
+        $this->assertConfigKey('testapp', $key, $secret);
+
+        // Can get freshly decrypted from DB
+        $newAppConfig = $this->generateAppConfig();
+        $actualSecret = $newAppConfig->getValueString('testapp', $key);
+        $this->assertEquals($secret, $actualSecret);
+
+        // Encrypting on change
+        $appConfig->setValueString('testapp', $key, $secret, sensitive: true);
+        $this->assertConfigValueNotEquals('testapp', $key, $secret);
+
+        // Can get in same run
+        $actualSecret = $appConfig->getValueString('testapp', $key);
+        $this->assertEquals($secret, $actualSecret);
+
+        // Can get freshly decrypted from DB
+        $newAppConfig = $this->generateAppConfig();
+        $actualSecret = $newAppConfig->getValueString('testapp', $key);
+        $this->assertEquals($secret, $actualSecret);
+    }
+
+    public function testUpdateSensitiveValueToNonSensitiveWithUpdateSensitive(): void {
+        $key = self::getUniqueID('secret');
+        $appConfig = $this->generateAppConfig();
+        $secret = sha1((string)time());
+
+        // Encrypted
+        $appConfig->setValueString('testapp', $key, $secret, sensitive: true);
+        $this->assertConfigValueNotEquals('testapp', $key, $secret);
+
+        // Migrate to non-sensitive / non-encrypted
+        $appConfig->updateSensitive('testapp', $key, false);
+        $this->assertConfigKey('testapp', $key, $secret);
+    }
+
+    public function testUpdateNonSensitiveValueToSensitiveWithUpdateSensitive(): void {
+        $key = self::getUniqueID('secret');
+        $appConfig = $this->generateAppConfig();
+        $secret = sha1((string)time());
+
+        // Unencrypted
+        $appConfig->setValueString('testapp', $key, $secret);
+        $this->assertConfigKey('testapp', $key, $secret);
+
+        // Migrate to sensitive / encrypted
+        $appConfig->updateSensitive('testapp', $key, true);
+        $this->assertConfigValueNotEquals('testapp', $key, $secret);
+    }
+
+    protected function loadConfigValueFromDatabase(string $app, string $key): string|false {
+        $sql = $this->connection->getQueryBuilder();
+        $sql->select('configvalue')
+            ->from('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('appid', $app)
+            ->setParameter('configkey', $key);
+        $query = $sql->executeQuery();
+        $actual = $query->fetchOne();
+        $query->closeCursor();
+
+        return $actual;
+    }
+
+    protected function assertConfigKey(string $app, string $key, string|false $expected): void {
+        $this->assertEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
+    }
+
+    protected function assertConfigValueNotEquals(string $app, string $key, string|false $expected): void {
+        $this->assertNotEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -120,7 +120,7 @@ 
 				$type = $row[2] ?? IAppConfig::VALUE_MIXED;
 				if (($row[4] ?? false) === true) {
 					$type |= IAppConfig::VALUE_SENSITIVE;
-					$value = self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX') . $this->crypto->encrypt($value);
+					$value = self::invokePrivate(AppConfig::class, 'ENCRYPTION_PREFIX').$this->crypto->encrypt($value);
 					self::$baseStruct[$appId][$key]['encrypted'] = $value;
 				}
 
@@ -224,7 +224,7 @@ 
 			foreach ($appData as $row) {
 				$keys[] = $row[0];
 			}
-			$appKeys[] = [(string)$appId, $keys];
+			$appKeys[] = [(string) $appId, $keys];
 		}
 
 		return $appKeys;
@@ -243,7 +243,7 @@ 
 		foreach (self::$baseStruct as $appId => $appData) {
 			foreach ($appData as $row) {
 				$appKeys[] = [
-					(string)$appId, $row[0], $row[1], $row[2] ?? IAppConfig::VALUE_MIXED, $row[3] ?? false,
+					(string) $appId, $row[0], $row[1], $row[2] ?? IAppConfig::VALUE_MIXED, $row[3] ?? false,
 					$row[4] ?? false
 				];
 			}
@@ -1368,7 +1368,7 @@ 
 		$key = self::getUniqueID('secret');
 
 		$appConfig = $this->generateAppConfig();
-		$secret = md5((string)time());
+		$secret = md5((string) time());
 		$appConfig->setValueString('testapp', $key, $secret, sensitive: true);
 
 		$this->assertConfigValueNotEquals('testapp', $key, $secret);
@@ -1386,7 +1386,7 @@ 
 	public function testMigratingNonSensitiveValueToSensitiveWithSetValue(): void {
 		$key = self::getUniqueID('secret');
 		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
+		$secret = sha1((string) time());
 
 		// Unencrypted
 		$appConfig->setValueString('testapp', $key, $secret);
@@ -1414,7 +1414,7 @@ 
 	public function testUpdateSensitiveValueToNonSensitiveWithUpdateSensitive(): void {
 		$key = self::getUniqueID('secret');
 		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
+		$secret = sha1((string) time());
 
 		// Encrypted
 		$appConfig->setValueString('testapp', $key, $secret, sensitive: true);
@@ -1428,7 +1428,7 @@ 
 	public function testUpdateNonSensitiveValueToSensitiveWithUpdateSensitive(): void {
 		$key = self::getUniqueID('secret');
 		$appConfig = $this->generateAppConfig();
-		$secret = sha1((string)time());
+		$secret = sha1((string) time());
 
 		// Unencrypted
 		$appConfig->setValueString('testapp', $key, $secret);
@@ -1439,7 +1439,7 @@ 
 		$this->assertConfigValueNotEquals('testapp', $key, $secret);
 	}
 
-	protected function loadConfigValueFromDatabase(string $app, string $key): string|false {
+	protected function loadConfigValueFromDatabase(string $app, string $key): string | false {
 		$sql = $this->connection->getQueryBuilder();
 		$sql->select('configvalue')
 			->from('appconfig')
@@ -1454,11 +1454,11 @@ 
 		return $actual;
 	}
 
-	protected function assertConfigKey(string $app, string $key, string|false $expected): void {
+	protected function assertConfigKey(string $app, string $key, string | false $expected): void {
 		$this->assertEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
 	}
 
-	protected function assertConfigValueNotEquals(string $app, string $key, string|false $expected): void {
+	protected function assertConfigValueNotEquals(string $app, string $key, string | false $expected): void {
 		$this->assertNotEquals($expected, $this->loadConfigValueFromDatabase($app, $key));
 	}
 }

tests/lib/NaturalSortTest.php

Indentation +252 added lines, -252 removed lines

@@ -8,259 +8,259 @@
 namespace Test;
 
 class NaturalSortTest extends \Test\TestCase {
-	/**
-	 * @dataProvider naturalSortDataProvider
-	 */
-	public function testNaturalSortCompare($array, $sorted): void {
-		if (!class_exists('Collator')) {
-			$this->markTestSkipped('The intl module is not available, natural sorting might not work as expected.');
-			return;
-		}
-		$comparator = \OC\NaturalSort::getInstance();
-		usort($array, [$comparator, 'compare']);
-		$this->assertEquals($sorted, $array);
-	}
+    /**
+     * @dataProvider naturalSortDataProvider
+     */
+    public function testNaturalSortCompare($array, $sorted): void {
+        if (!class_exists('Collator')) {
+            $this->markTestSkipped('The intl module is not available, natural sorting might not work as expected.');
+            return;
+        }
+        $comparator = \OC\NaturalSort::getInstance();
+        usort($array, [$comparator, 'compare']);
+        $this->assertEquals($sorted, $array);
+    }
 
-	/**
-	 * @dataProvider defaultCollatorDataProvider
-	 */
-	public function testDefaultCollatorCompare($array, $sorted): void {
-		$comparator = new \OC\NaturalSort(new \OC\NaturalSort_DefaultCollator());
-		usort($array, [$comparator, 'compare']);
-		$this->assertEquals($sorted, $array);
-	}
+    /**
+     * @dataProvider defaultCollatorDataProvider
+     */
+    public function testDefaultCollatorCompare($array, $sorted): void {
+        $comparator = new \OC\NaturalSort(new \OC\NaturalSort_DefaultCollator());
+        usort($array, [$comparator, 'compare']);
+        $this->assertEquals($sorted, $array);
+    }
 
-	/**
-	 * Data provider for natural sorting with php5-intl's Collator.
-	 * Must provide the same result as in core/js/tests/specs/coreSpec.js
-	 * @return array test cases
-	 */
-	public static function naturalSortDataProvider(): array {
-		return [
-			// different casing
-			[
-				// unsorted
-				[
-					'aaa',
-					'bbb',
-					'BBB',
-					'AAA'
-				],
-				// sorted
-				[
-					'aaa',
-					'AAA',
-					'bbb',
-					'BBB'
-				]
-			],
-			// numbers
-			[
-				// unsorted
-				[
-					'124.txt',
-					'abc1',
-					'123.txt',
-					'abc',
-					'abc2',
-					'def (2).txt',
-					'ghi 10.txt',
-					'abc12',
-					'def.txt',
-					'def (1).txt',
-					'ghi 2.txt',
-					'def (10).txt',
-					'abc10',
-					'def (12).txt',
-					'z',
-					'ghi.txt',
-					'za',
-					'ghi 1.txt',
-					'ghi 12.txt',
-					'zz',
-					'15.txt',
-					'15b.txt',
-				],
-				// sorted
-				[
-					'15.txt',
-					'15b.txt',
-					'123.txt',
-					'124.txt',
-					'abc',
-					'abc1',
-					'abc2',
-					'abc10',
-					'abc12',
-					'def.txt',
-					'def (1).txt',
-					'def (2).txt',
-					'def (10).txt',
-					'def (12).txt',
-					'ghi.txt',
-					'ghi 1.txt',
-					'ghi 2.txt',
-					'ghi 10.txt',
-					'ghi 12.txt',
-					'z',
-					'za',
-					'zz',
-				]
-			],
-			// chinese characters
-			[
-				// unsorted
-				[
-					'十.txt',
-					'一.txt',
-					'二.txt',
-					'十 2.txt',
-					'三.txt',
-					'四.txt',
-					'abc.txt',
-					'五.txt',
-					'七.txt',
-					'八.txt',
-					'九.txt',
-					'六.txt',
-					'十一.txt',
-					'波.txt',
-					'破.txt',
-					'莫.txt',
-					'啊.txt',
-					'123.txt',
-				],
-				// sorted
-				[
-					'123.txt',
-					'abc.txt',
-					'一.txt',
-					'七.txt',
-					'三.txt',
-					'九.txt',
-					'二.txt',
-					'五.txt',
-					'八.txt',
-					'六.txt',
-					'十.txt',
-					'十 2.txt',
-					'十一.txt',
-					'啊.txt',
-					'四.txt',
-					'波.txt',
-					'破.txt',
-					'莫.txt',
-				]
-			],
-			// with umlauts
-			[
-				// unsorted
-				[
-					'öh.txt',
-					'Äh.txt',
-					'oh.txt',
-					'Üh 2.txt',
-					'Üh.txt',
-					'ah.txt',
-					'Öh.txt',
-					'uh.txt',
-					'üh.txt',
-					'äh.txt',
-				],
-				// sorted
-				[
-					'ah.txt',
-					'äh.txt',
-					'Äh.txt',
-					'oh.txt',
-					'öh.txt',
-					'Öh.txt',
-					'uh.txt',
-					'üh.txt',
-					'Üh.txt',
-					'Üh 2.txt',
-				]
-			],
-		];
-	}
+    /**
+     * Data provider for natural sorting with php5-intl's Collator.
+     * Must provide the same result as in core/js/tests/specs/coreSpec.js
+     * @return array test cases
+     */
+    public static function naturalSortDataProvider(): array {
+        return [
+            // different casing
+            [
+                // unsorted
+                [
+                    'aaa',
+                    'bbb',
+                    'BBB',
+                    'AAA'
+                ],
+                // sorted
+                [
+                    'aaa',
+                    'AAA',
+                    'bbb',
+                    'BBB'
+                ]
+            ],
+            // numbers
+            [
+                // unsorted
+                [
+                    '124.txt',
+                    'abc1',
+                    '123.txt',
+                    'abc',
+                    'abc2',
+                    'def (2).txt',
+                    'ghi 10.txt',
+                    'abc12',
+                    'def.txt',
+                    'def (1).txt',
+                    'ghi 2.txt',
+                    'def (10).txt',
+                    'abc10',
+                    'def (12).txt',
+                    'z',
+                    'ghi.txt',
+                    'za',
+                    'ghi 1.txt',
+                    'ghi 12.txt',
+                    'zz',
+                    '15.txt',
+                    '15b.txt',
+                ],
+                // sorted
+                [
+                    '15.txt',
+                    '15b.txt',
+                    '123.txt',
+                    '124.txt',
+                    'abc',
+                    'abc1',
+                    'abc2',
+                    'abc10',
+                    'abc12',
+                    'def.txt',
+                    'def (1).txt',
+                    'def (2).txt',
+                    'def (10).txt',
+                    'def (12).txt',
+                    'ghi.txt',
+                    'ghi 1.txt',
+                    'ghi 2.txt',
+                    'ghi 10.txt',
+                    'ghi 12.txt',
+                    'z',
+                    'za',
+                    'zz',
+                ]
+            ],
+            // chinese characters
+            [
+                // unsorted
+                [
+                    '十.txt',
+                    '一.txt',
+                    '二.txt',
+                    '十 2.txt',
+                    '三.txt',
+                    '四.txt',
+                    'abc.txt',
+                    '五.txt',
+                    '七.txt',
+                    '八.txt',
+                    '九.txt',
+                    '六.txt',
+                    '十一.txt',
+                    '波.txt',
+                    '破.txt',
+                    '莫.txt',
+                    '啊.txt',
+                    '123.txt',
+                ],
+                // sorted
+                [
+                    '123.txt',
+                    'abc.txt',
+                    '一.txt',
+                    '七.txt',
+                    '三.txt',
+                    '九.txt',
+                    '二.txt',
+                    '五.txt',
+                    '八.txt',
+                    '六.txt',
+                    '十.txt',
+                    '十 2.txt',
+                    '十一.txt',
+                    '啊.txt',
+                    '四.txt',
+                    '波.txt',
+                    '破.txt',
+                    '莫.txt',
+                ]
+            ],
+            // with umlauts
+            [
+                // unsorted
+                [
+                    'öh.txt',
+                    'Äh.txt',
+                    'oh.txt',
+                    'Üh 2.txt',
+                    'Üh.txt',
+                    'ah.txt',
+                    'Öh.txt',
+                    'uh.txt',
+                    'üh.txt',
+                    'äh.txt',
+                ],
+                // sorted
+                [
+                    'ah.txt',
+                    'äh.txt',
+                    'Äh.txt',
+                    'oh.txt',
+                    'öh.txt',
+                    'Öh.txt',
+                    'uh.txt',
+                    'üh.txt',
+                    'Üh.txt',
+                    'Üh 2.txt',
+                ]
+            ],
+        ];
+    }
 
-	/**
-	 * Data provider for natural sorting with \OC\NaturalSort_DefaultCollator.
-	 * Must provide the same result as in core/js/tests/specs/coreSpec.js
-	 * @return array test cases
-	 */
-	public static function defaultCollatorDataProvider(): array {
-		return [
-			// different casing
-			[
-				// unsorted
-				[
-					'aaa',
-					'bbb',
-					'BBB',
-					'AAA'
-				],
-				// sorted
-				[
-					'aaa',
-					'AAA',
-					'bbb',
-					'BBB'
-				]
-			],
-			// numbers
-			[
-				// unsorted
-				[
-					'124.txt',
-					'abc1',
-					'123.txt',
-					'abc',
-					'abc2',
-					'def (2).txt',
-					'ghi 10.txt',
-					'abc12',
-					'def.txt',
-					'def (1).txt',
-					'ghi 2.txt',
-					'def (10).txt',
-					'abc10',
-					'def (12).txt',
-					'z',
-					'ghi.txt',
-					'za',
-					'ghi 1.txt',
-					'ghi 12.txt',
-					'zz',
-					'15.txt',
-					'15b.txt',
-				],
-				// sorted
-				[
-					'15.txt',
-					'15b.txt',
-					'123.txt',
-					'124.txt',
-					'abc',
-					'abc1',
-					'abc2',
-					'abc10',
-					'abc12',
-					'def.txt',
-					'def (1).txt',
-					'def (2).txt',
-					'def (10).txt',
-					'def (12).txt',
-					'ghi.txt',
-					'ghi 1.txt',
-					'ghi 2.txt',
-					'ghi 10.txt',
-					'ghi 12.txt',
-					'z',
-					'za',
-					'zz',
-				]
-			],
-		];
-	}
+    /**
+     * Data provider for natural sorting with \OC\NaturalSort_DefaultCollator.
+     * Must provide the same result as in core/js/tests/specs/coreSpec.js
+     * @return array test cases
+     */
+    public static function defaultCollatorDataProvider(): array {
+        return [
+            // different casing
+            [
+                // unsorted
+                [
+                    'aaa',
+                    'bbb',
+                    'BBB',
+                    'AAA'
+                ],
+                // sorted
+                [
+                    'aaa',
+                    'AAA',
+                    'bbb',
+                    'BBB'
+                ]
+            ],
+            // numbers
+            [
+                // unsorted
+                [
+                    '124.txt',
+                    'abc1',
+                    '123.txt',
+                    'abc',
+                    'abc2',
+                    'def (2).txt',
+                    'ghi 10.txt',
+                    'abc12',
+                    'def.txt',
+                    'def (1).txt',
+                    'ghi 2.txt',
+                    'def (10).txt',
+                    'abc10',
+                    'def (12).txt',
+                    'z',
+                    'ghi.txt',
+                    'za',
+                    'ghi 1.txt',
+                    'ghi 12.txt',
+                    'zz',
+                    '15.txt',
+                    '15b.txt',
+                ],
+                // sorted
+                [
+                    '15.txt',
+                    '15b.txt',
+                    '123.txt',
+                    '124.txt',
+                    'abc',
+                    'abc1',
+                    'abc2',
+                    'abc10',
+                    'abc12',
+                    'def.txt',
+                    'def (1).txt',
+                    'def (2).txt',
+                    'def (10).txt',
+                    'def (12).txt',
+                    'ghi.txt',
+                    'ghi 1.txt',
+                    'ghi 2.txt',
+                    'ghi 10.txt',
+                    'ghi 12.txt',
+                    'z',
+                    'za',
+                    'zz',
+                ]
+            ],
+        ];
+    }
 }

tests/lib/ErrorHandlerTest.php

Indentation +50 added lines, -50 removed lines

@@ -16,62 +16,62 @@
 use Psr\Log\LoggerInterface;
 
 class ErrorHandlerTest extends TestCase {
-	private LoggerInterface&MockObject $logger;
-	private ErrorHandler $errorHandler;
-	private int $errorReporting;
+    private LoggerInterface&MockObject $logger;
+    private ErrorHandler $errorHandler;
+    private int $errorReporting;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->errorHandler = new ErrorHandler(
-			$this->logger
-		);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->errorHandler = new ErrorHandler(
+            $this->logger
+        );
 
-		$this->errorReporting = error_reporting(E_ALL);
-	}
+        $this->errorReporting = error_reporting(E_ALL);
+    }
 
-	protected function tearDown(): void {
-		error_reporting($this->errorReporting);
-		parent::tearDown();
-	}
+    protected function tearDown(): void {
+        error_reporting($this->errorReporting);
+        parent::tearDown();
+    }
 
-	/**
-	 * provide username, password combinations for testRemovePassword
-	 * @return array
-	 */
-	public static function passwordProvider(): array {
-		return [
-			['us:er', 'pass@word'],
-			['us:er', 'password'],
-			['user', '-C:R,w)@6*}'],
-			['user', 'pass:word'],
-			['user', 'pass@word'],
-			['user', 'password'],
-			['user:test@cloud', 'password'],
-			['user@owncloud.org', 'password'],
-			['user@test@owncloud.org', 'password'],
-		];
-	}
+    /**
+     * provide username, password combinations for testRemovePassword
+     * @return array
+     */
+    public static function passwordProvider(): array {
+        return [
+            ['us:er', 'pass@word'],
+            ['us:er', 'password'],
+            ['user', '-C:R,w)@6*}'],
+            ['user', 'pass:word'],
+            ['user', 'pass@word'],
+            ['user', 'password'],
+            ['user:test@cloud', 'password'],
+            ['user@owncloud.org', 'password'],
+            ['user@test@owncloud.org', 'password'],
+        ];
+    }
 
-	/**
-	 * @dataProvider passwordProvider
-	 * @param string $username
-	 * @param string $password
-	 */
-	public function testRemovePasswordFromError($username, $password): void {
-		$url = 'http://' . $username . ':' . $password . '@owncloud.org';
-		$expectedResult = 'http://xxx:xxx@owncloud.org';
-		$this->logger->expects(self::once())
-			->method('log')
-			->with(
-				ILogger::ERROR,
-				'Could not reach ' . $expectedResult . ' at file#4',
-				['app' => 'PHP'],
-			);
+    /**
+     * @dataProvider passwordProvider
+     * @param string $username
+     * @param string $password
+     */
+    public function testRemovePasswordFromError($username, $password): void {
+        $url = 'http://' . $username . ':' . $password . '@owncloud.org';
+        $expectedResult = 'http://xxx:xxx@owncloud.org';
+        $this->logger->expects(self::once())
+            ->method('log')
+            ->with(
+                ILogger::ERROR,
+                'Could not reach ' . $expectedResult . ' at file#4',
+                ['app' => 'PHP'],
+            );
 
-		$result = $this->errorHandler->onError(E_USER_ERROR, 'Could not reach ' . $url, 'file', 4);
+        $result = $this->errorHandler->onError(E_USER_ERROR, 'Could not reach ' . $url, 'file', 4);
 
-		self::assertTrue($result);
-	}
+        self::assertTrue($result);
+    }
 }

tests/lib/InstallerTest.php

Indentation +448 added lines, -448 removed lines

@@ -24,151 +24,151 @@ 
  * @group DB
  */
 class InstallerTest extends TestCase {
-	private static $appid = 'testapp';
-	private $appstore;
-	/** @var AppFetcher|\PHPUnit\Framework\MockObject\MockObject */
-	private $appFetcher;
-	/** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
-	private $clientService;
-	/** @var ITempManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $tempManager;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appFetcher = $this->createMock(AppFetcher::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->tempManager = $this->createMock(ITempManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->config = $this->createMock(IConfig::class);
-
-		$config = \OC::$server->getConfig();
-		$this->appstore = $config->setSystemValue('appstoreenabled', true);
-		$config->setSystemValue('appstoreenabled', true);
-		$installer = new Installer(
-			\OC::$server->get(AppFetcher::class),
-			\OC::$server->get(IClientService::class),
-			\OC::$server->getTempManager(),
-			\OC::$server->get(LoggerInterface::class),
-			$config,
-			false
-		);
-		$installer->removeApp(self::$appid);
-	}
-
-	protected function getInstaller() {
-		return new Installer(
-			$this->appFetcher,
-			$this->clientService,
-			$this->tempManager,
-			$this->logger,
-			$this->config,
-			false
-		);
-	}
-
-	protected function tearDown(): void {
-		$installer = new Installer(
-			\OC::$server->get(AppFetcher::class),
-			\OC::$server->get(IClientService::class),
-			\OC::$server->getTempManager(),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getConfig(),
-			false
-		);
-		$installer->removeApp(self::$appid);
-		\OC::$server->getConfig()->setSystemValue('appstoreenabled', $this->appstore);
-
-		parent::tearDown();
-	}
-
-	public function testInstallApp(): void {
-		// Read the current version of the app to check for bug #2572
-		\OCP\Server::get(IAppManager::class)->getAppVersion('testapp', true);
-
-		// Extract app
-		$pathOfTestApp = __DIR__ . '/../data/testapp.zip';
-		$tar = new ZIP($pathOfTestApp);
-		$tar->extract(\OC_App::getInstallPath());
-
-		// Install app
-		$installer = new Installer(
-			\OC::$server->get(AppFetcher::class),
-			\OC::$server->get(IClientService::class),
-			\OC::$server->getTempManager(),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getConfig(),
-			false
-		);
-		$this->assertNull(\OC::$server->getConfig()->getAppValue('testapp', 'enabled', null), 'Check that the app is not listed before installation');
-		$this->assertSame('testapp', $installer->installApp(self::$appid));
-		$this->assertSame('no', \OC::$server->getConfig()->getAppValue('testapp', 'enabled', null), 'Check that the app is listed after installation');
-		$this->assertSame('0.9', \OC::$server->getConfig()->getAppValue('testapp', 'installed_version'));
-		$installer->removeApp(self::$appid);
-	}
-
-	public static function updateArrayProvider(): array {
-		return [
-			// Update available
-			[
-				[
-					[
-						'id' => 'files',
-						'releases' => [
-							[
-								'version' => '1111.0'
-							],
-						],
-					],
-				],
-				'1111.0',
-			],
-			// No update available
-			[
-				[
-					[
-						'id' => 'files',
-						'releases' => [
-							[
-								'version' => '1.0'
-							],
-						],
-					],
-				],
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider updateArrayProvider
-	 * @param array $appArray
-	 * @param string|bool $updateAvailable
-	 */
-	public function testIsUpdateAvailable(array $appArray, $updateAvailable): void {
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-
-		$installer = $this->getInstaller();
-		$this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'));
-		$this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'), 'Cached result should be returned and fetcher should be only called once');
-	}
-
-
-	public function testDownloadAppWithRevokedCertificate(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('Certificate "4112" has been revoked');
-
-		$appArray = [
-			[
-				'id' => 'news',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+    private static $appid = 'testapp';
+    private $appstore;
+    /** @var AppFetcher|\PHPUnit\Framework\MockObject\MockObject */
+    private $appFetcher;
+    /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
+    private $clientService;
+    /** @var ITempManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $tempManager;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $logger;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    private $config;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appFetcher = $this->createMock(AppFetcher::class);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->tempManager = $this->createMock(ITempManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->config = $this->createMock(IConfig::class);
+
+        $config = \OC::$server->getConfig();
+        $this->appstore = $config->setSystemValue('appstoreenabled', true);
+        $config->setSystemValue('appstoreenabled', true);
+        $installer = new Installer(
+            \OC::$server->get(AppFetcher::class),
+            \OC::$server->get(IClientService::class),
+            \OC::$server->getTempManager(),
+            \OC::$server->get(LoggerInterface::class),
+            $config,
+            false
+        );
+        $installer->removeApp(self::$appid);
+    }
+
+    protected function getInstaller() {
+        return new Installer(
+            $this->appFetcher,
+            $this->clientService,
+            $this->tempManager,
+            $this->logger,
+            $this->config,
+            false
+        );
+    }
+
+    protected function tearDown(): void {
+        $installer = new Installer(
+            \OC::$server->get(AppFetcher::class),
+            \OC::$server->get(IClientService::class),
+            \OC::$server->getTempManager(),
+            \OC::$server->get(LoggerInterface::class),
+            \OC::$server->getConfig(),
+            false
+        );
+        $installer->removeApp(self::$appid);
+        \OC::$server->getConfig()->setSystemValue('appstoreenabled', $this->appstore);
+
+        parent::tearDown();
+    }
+
+    public function testInstallApp(): void {
+        // Read the current version of the app to check for bug #2572
+        \OCP\Server::get(IAppManager::class)->getAppVersion('testapp', true);
+
+        // Extract app
+        $pathOfTestApp = __DIR__ . '/../data/testapp.zip';
+        $tar = new ZIP($pathOfTestApp);
+        $tar->extract(\OC_App::getInstallPath());
+
+        // Install app
+        $installer = new Installer(
+            \OC::$server->get(AppFetcher::class),
+            \OC::$server->get(IClientService::class),
+            \OC::$server->getTempManager(),
+            \OC::$server->get(LoggerInterface::class),
+            \OC::$server->getConfig(),
+            false
+        );
+        $this->assertNull(\OC::$server->getConfig()->getAppValue('testapp', 'enabled', null), 'Check that the app is not listed before installation');
+        $this->assertSame('testapp', $installer->installApp(self::$appid));
+        $this->assertSame('no', \OC::$server->getConfig()->getAppValue('testapp', 'enabled', null), 'Check that the app is listed after installation');
+        $this->assertSame('0.9', \OC::$server->getConfig()->getAppValue('testapp', 'installed_version'));
+        $installer->removeApp(self::$appid);
+    }
+
+    public static function updateArrayProvider(): array {
+        return [
+            // Update available
+            [
+                [
+                    [
+                        'id' => 'files',
+                        'releases' => [
+                            [
+                                'version' => '1111.0'
+                            ],
+                        ],
+                    ],
+                ],
+                '1111.0',
+            ],
+            // No update available
+            [
+                [
+                    [
+                        'id' => 'files',
+                        'releases' => [
+                            [
+                                'version' => '1.0'
+                            ],
+                        ],
+                    ],
+                ],
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider updateArrayProvider
+     * @param array $appArray
+     * @param string|bool $updateAvailable
+     */
+    public function testIsUpdateAvailable(array $appArray, $updateAvailable): void {
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+
+        $installer = $this->getInstaller();
+        $this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'));
+        $this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'), 'Cached result should be returned and fetcher should be only called once');
+    }
+
+
+    public function testDownloadAppWithRevokedCertificate(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Certificate "4112" has been revoked');
+
+        $appArray = [
+            [
+                'id' => 'news',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhAQMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -192,27 +192,27 @@ 
 tczQMzLtVdTg5z8XMi//6TkAPxRPjYi8Vef/s2mLo7KystTmofxI/HZePSieJ9tj
 gLgK8d8sKL60JMmKHN3boHrsThKBVA==
 -----END CERTIFICATE-----',
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
 
 
-		$installer = $this->getInstaller();
-		$installer->downloadApp('news');
-	}
+        $installer = $this->getInstaller();
+        $installer->downloadApp('news');
+    }
 
 
-	public function testDownloadAppWithNotNextcloudCertificate(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('App with id news has a certificate not issued by a trusted Code Signing Authority');
+    public function testDownloadAppWithNotNextcloudCertificate(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('App with id news has a certificate not issued by a trusted Code Signing Authority');
 
-		$appArray = [
-			[
-				'id' => 'news',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+        $appArray = [
+            [
+                'id' => 'news',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIID8TCCAdkCAhAAMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD
 VQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93
 bkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE2
@@ -236,26 +236,26 @@ 
 crl5lBlKjXh2GP0+omSO3x1jX4+iQPCW2TWoyKkUdLu/hGHG2w8RrTeme+kATECH
 YSu356M=
 -----END CERTIFICATE-----',
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('news');
-	}
-
-
-	public function testDownloadAppWithDifferentCN(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('App with id news has a cert issued to passman');
-
-		$appArray = [
-			[
-				'id' => 'news',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('news');
+    }
+
+
+    public function testDownloadAppWithDifferentCN(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('App with id news has a cert issued to passman');
+
+        $appArray = [
+            [
+                'id' => 'news',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhDUMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -279,26 +279,26 @@ 
 u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
 5EpZaQ1l6H5DBXwrz58a8WTPC2Mu8g==
 -----END CERTIFICATE-----',
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('news');
-	}
-
-
-	public function testDownloadAppWithInvalidSignature(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('App with id passman has invalid signature');
-
-		$appArray = [
-			[
-				'id' => 'passman',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('news');
+    }
+
+
+    public function testDownloadAppWithInvalidSignature(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('App with id passman has invalid signature');
+
+        $appArray = [
+            [
+                'id' => 'passman',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhDUMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -322,51 +322,51 @@ 
 u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
 5EpZaQ1l6H5DBXwrz58a8WTPC2Mu8g==
 -----END CERTIFICATE-----',
-				'releases' => [
-					[
-						'download' => 'https://example.com',
-						'signature' => 'MySignature',
-					],
-					[
-						'download' => 'https://nextcloud.com',
-					],
-				],
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-		$realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFile')
-			->with('.tar.gz')
-			->willReturn($realTmpFile);
-		$client = $this->createMock(IClient::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('passman');
-	}
-
-
-	public function testDownloadAppWithMoreThanOneFolderDownloaded(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('Extracted app testapp has more than 1 folder');
-
-		$appArray = [
-			[
-				'id' => 'testapp',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+                'releases' => [
+                    [
+                        'download' => 'https://example.com',
+                        'signature' => 'MySignature',
+                    ],
+                    [
+                        'download' => 'https://nextcloud.com',
+                    ],
+                ],
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+        $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+        copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFile')
+            ->with('.tar.gz')
+            ->willReturn($realTmpFile);
+        $client = $this->createMock(IClient::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('passman');
+    }
+
+
+    public function testDownloadAppWithMoreThanOneFolderDownloaded(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Extracted app testapp has more than 1 folder');
+
+        $appArray = [
+            [
+                'id' => 'testapp',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -390,10 +390,10 @@ 
 Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
 cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
 -----END CERTIFICATE-----',
-				'releases' => [
-					[
-						'download' => 'https://example.com',
-						'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
+                'releases' => [
+                    [
+                        'download' => 'https://example.com',
+                        'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
 VlndvHyKdqJHDAACphR8tVV6EFrPermn7gEgWk7a51LbUM7sAN7RV7ijEooUo+TQ
 jNW9Ch48Wg3jvebMwWNr5t5U4MEXTP5f0YX/kxvkJoUrG3a3spt7ziEuHaq8IPvt
 Jj/JSDFhvRNpom7yNNcI1Ijoq8yC11sg7RJBNfrHdGPHPZVz2SyBiY9OcvgGSpUU
@@ -404,53 +404,53 @@ 
 GqEhdDmOHsxNaeJ08Hlptq5yLv3+0wEdtriVjgAZNVduHG1F1FkhPIrDHaB6pd67
 0AFvO/pZgMSHDRHD+safBgaLb5dBZ895Qvudbq3RQevVnO+YZQYZkpmjoF/+TQ7/
 YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
-					],
-					[
-						'download' => 'https://nextcloud.com',
-					],
-				],
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-		$realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFile')
-			->with('.tar.gz')
-			->willReturn($realTmpFile);
-		$realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
-		mkdir($realTmpFolder . '/testfolder');
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFolder')
-			->willReturn($realTmpFolder);
-		$client = $this->createMock(IClient::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('testapp');
-	}
-
-
-	public function testDownloadAppWithMismatchingIdentifier(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('App for id testapp has a wrong app ID in info.xml: testapp1');
-
-		$appArray = [
-			[
-				'id' => 'testapp',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+                    ],
+                    [
+                        'download' => 'https://nextcloud.com',
+                    ],
+                ],
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+        $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+        copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFile')
+            ->with('.tar.gz')
+            ->willReturn($realTmpFile);
+        $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+        mkdir($realTmpFolder . '/testfolder');
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFolder')
+            ->willReturn($realTmpFolder);
+        $client = $this->createMock(IClient::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('testapp');
+    }
+
+
+    public function testDownloadAppWithMismatchingIdentifier(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('App for id testapp has a wrong app ID in info.xml: testapp1');
+
+        $appArray = [
+            [
+                'id' => 'testapp',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -474,10 +474,10 @@ 
 Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
 cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
 -----END CERTIFICATE-----',
-				'releases' => [
-					[
-						'download' => 'https://example.com',
-						'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
+                'releases' => [
+                    [
+                        'download' => 'https://example.com',
+                        'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
 VlndvHyKdqJHDAACphR8tVV6EFrPermn7gEgWk7a51LbUM7sAN7RV7ijEooUo+TQ
 jNW9Ch48Wg3jvebMwWNr5t5U4MEXTP5f0YX/kxvkJoUrG3a3spt7ziEuHaq8IPvt
 Jj/JSDFhvRNpom7yNNcI1Ijoq8yC11sg7RJBNfrHdGPHPZVz2SyBiY9OcvgGSpUU
@@ -488,48 +488,48 @@ 
 GqEhdDmOHsxNaeJ08Hlptq5yLv3+0wEdtriVjgAZNVduHG1F1FkhPIrDHaB6pd67
 0AFvO/pZgMSHDRHD+safBgaLb5dBZ895Qvudbq3RQevVnO+YZQYZkpmjoF/+TQ7/
 YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
-					],
-					[
-						'download' => 'https://nextcloud.com',
-					],
-				],
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-		$realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFile')
-			->with('.tar.gz')
-			->willReturn($realTmpFile);
-		$realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFolder')
-			->willReturn($realTmpFolder);
-		$client = $this->createMock(IClient::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('testapp');
-	}
-
-	public function testDownloadAppSuccessful(): void {
-		$appArray = [
-			[
-				'id' => 'testapp',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+                    ],
+                    [
+                        'download' => 'https://nextcloud.com',
+                    ],
+                ],
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+        $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+        copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFile')
+            ->with('.tar.gz')
+            ->willReturn($realTmpFile);
+        $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFolder')
+            ->willReturn($realTmpFolder);
+        $client = $this->createMock(IClient::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('testapp');
+    }
+
+    public function testDownloadAppSuccessful(): void {
+        $appArray = [
+            [
+                'id' => 'testapp',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -553,10 +553,10 @@ 
 Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
 cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
 -----END CERTIFICATE-----',
-				'releases' => [
-					[
-						'download' => 'https://example.com',
-						'signature' => 'O5UWFRnSx4mSdEX83Uh9u7KW+Gl1OWU4uaFg6aYY19zc+lWP4rKCbAUH7Jo1Bohf
+                'releases' => [
+                    [
+                        'download' => 'https://example.com',
+                        'signature' => 'O5UWFRnSx4mSdEX83Uh9u7KW+Gl1OWU4uaFg6aYY19zc+lWP4rKCbAUH7Jo1Bohf
 qxQbhXs4cMqGmoL8dW4zeFUqSJCRk52LA+ciLezjPFv275q+BxEgyWOylLnbhBaz
 +v6lXLaeG0J/ry8wEdg+rwP8FCYPsvKlXSVbFjgubvCR/owKJJf5iL0B93noBwBN
 jfbcxi7Kh16HAKy6f/gVZ6hf/4Uo7iEFMCPEHjidope+ejUpqbd8XhQg5/yh7TQ7
@@ -567,63 +567,63 @@ 
 7yQWrsV7QvAzygAOFsC0TlSNJbmMCljouUk9di4CUZ+xsQ6n6TZtE7gsdljlKjPS
 3Ys+e3V1HUaVzv8SaSmKwjRoQxQxHWLtXpJS2Yq+i+gq7LuC+aStzxAzV/h2plDW
 358picx/PobNDi71Q97+/CAOq+4wDOwhKwls7lwudIs=',
-					],
-					[
-						'download' => 'https://nextcloud.com',
-					],
-				],
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-		$realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFile')
-			->with('.tar.gz')
-			->willReturn($realTmpFile);
-		$realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFolder')
-			->willReturn($realTmpFolder);
-		$client = $this->createMock(IClient::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('testapp');
-
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
-	}
-
-
-	public function testDownloadAppWithDowngrade(): void {
-		// Use previous test to download the application in version 0.9
-		$this->testDownloadAppSuccessful();
-
-		// Reset mocks
-		$this->appFetcher = $this->createMock(AppFetcher::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->tempManager = $this->createMock(ITempManager::class);
-
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('App for id testapp has version 0.9 and tried to update to lower version 0.8');
-
-		$appArray = [
-			[
-				'id' => 'testapp',
-				'certificate' => '-----BEGIN CERTIFICATE-----
+                    ],
+                    [
+                        'download' => 'https://nextcloud.com',
+                    ],
+                ],
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+        $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+        copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFile')
+            ->with('.tar.gz')
+            ->willReturn($realTmpFile);
+        $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFolder')
+            ->willReturn($realTmpFolder);
+        $client = $this->createMock(IClient::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('testapp');
+
+        $this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
+        $this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+    }
+
+
+    public function testDownloadAppWithDowngrade(): void {
+        // Use previous test to download the application in version 0.9
+        $this->testDownloadAppSuccessful();
+
+        // Reset mocks
+        $this->appFetcher = $this->createMock(AppFetcher::class);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->tempManager = $this->createMock(ITempManager::class);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('App for id testapp has version 0.9 and tried to update to lower version 0.8');
+
+        $appArray = [
+            [
+                'id' => 'testapp',
+                'certificate' => '-----BEGIN CERTIFICATE-----
 MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
 VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
 MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
@@ -647,10 +647,10 @@ 
 Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
 cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
 -----END CERTIFICATE-----',
-				'releases' => [
-					[
-						'download' => 'https://example.com',
-						'signature' => 'KMSao4cKdMIYxeT8Bm4lrmSeIQnk7YzJZh+Vz+4LVSBwF+OMmcujryQuWLXmbPfg
+                'releases' => [
+                    [
+                        'download' => 'https://example.com',
+                        'signature' => 'KMSao4cKdMIYxeT8Bm4lrmSeIQnk7YzJZh+Vz+4LVSBwF+OMmcujryQuWLXmbPfg
 4hGI9zS025469VNjUoCprn01H8NBq3O1cXz+ewG1oxYWMMQFZDkOtUQ+XZ27b91t
 y0l45H6C8j0sTeSrUb/LCjrdm+buUygkhC2RZxCI6tLi4rYWj0MiqDz98XkbB3te
 pW3ZND6mG6Jxn1fnd35paqZ/+URMftoLQ4K+6vJoBVGnug9nk1RpGLouICI0zCrz
@@ -661,44 +661,44 @@ 
 9WfeKJ/mavrSLVa7QqZ4RCcMigmijT1kdqbaEh05IZNrzs6VDcS2EIrbDX8SGXUk
 uDDkPXZEXqNDEjyONfDXVRLiqDa52Gg+I4vW/l/4ZOFgAWdZkqPPuZFaqzZpsJXm
 JXhrdaWDZ8fzpUjugrtC3qslsqL0dzgU37anS3HwrT8=',
-					],
-					[
-						'download' => 'https://nextcloud.com',
-					],
-				],
-			],
-		];
-		$this->appFetcher
-			->expects($this->once())
-			->method('get')
-			->willReturn($appArray);
-		$realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.0.8.tar.gz', $realTmpFile);
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFile')
-			->with('.tar.gz')
-			->willReturn($realTmpFile);
-		$realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
-		$this->tempManager
-			->expects($this->once())
-			->method('getTemporaryFolder')
-			->willReturn($realTmpFolder);
-		$client = $this->createMock(IClient::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
-
-		$installer = $this->getInstaller();
-		$installer->downloadApp('testapp');
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.8', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
-	}
+                    ],
+                    [
+                        'download' => 'https://nextcloud.com',
+                    ],
+                ],
+            ],
+        ];
+        $this->appFetcher
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($appArray);
+        $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+        copy(__DIR__ . '/../data/testapp.0.8.tar.gz', $realTmpFile);
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFile')
+            ->with('.tar.gz')
+            ->willReturn($realTmpFile);
+        $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+        $this->tempManager
+            ->expects($this->once())
+            ->method('getTemporaryFolder')
+            ->willReturn($realTmpFolder);
+        $client = $this->createMock(IClient::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
+        $this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+
+        $installer = $this->getInstaller();
+        $installer->downloadApp('testapp');
+        $this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
+        $this->assertEquals('0.8', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+    }
 }