refactor: Add void return type to PHPUnit test methods

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

19 files changed, 71 insertions, 71 deletions

diff --git a/apps/settings/tests/Activity/SecurityFilterTest.php b/apps/settings/tests/Activity/SecurityFilterTest.php
index 637c717da02..f3f94df3d21 100644
--- a/apps/settings/tests/Activity/SecurityFilterTest.php
+++ b/apps/settings/tests/Activity/SecurityFilterTest.php
@@ -31,15 +31,15 @@ class SecurityFilterTest extends TestCase {
 		$this->filter = new SecurityFilter($this->urlGenerator, $this->l10n);
 	}
 
-	public function testAllowedApps() {
+	public function testAllowedApps(): void {
 		$this->assertEquals([], $this->filter->allowedApps());
 	}
 
-	public function testFilterTypes() {
+	public function testFilterTypes(): void {
 		$this->assertEquals(['security'], $this->filter->filterTypes(['comments', 'security']));
 	}
 
-	public function testGetIcon() {
+	public function testGetIcon(): void {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('core', 'actions/password.svg')
@@ -51,11 +51,11 @@ class SecurityFilterTest extends TestCase {
 		$this->assertEquals('abs/path/to/icon.svg', $this->filter->getIcon());
 	}
 
-	public function testGetIdentifier() {
+	public function testGetIdentifier(): void {
 		$this->assertEquals('security', $this->filter->getIdentifier());
 	}
 
-	public function testGetName() {
+	public function testGetName(): void {
 		$this->l10n->expects($this->once())
 			->method('t')
 			->with('Security')
@@ -63,7 +63,7 @@ class SecurityFilterTest extends TestCase {
 		$this->assertEquals('translated', $this->filter->getName());
 	}
 
-	public function testGetPriority() {
+	public function testGetPriority(): void {
 		$this->assertEquals(30, $this->filter->getPriority());
 	}
 }
diff --git a/apps/settings/tests/Activity/SecurityProviderTest.php b/apps/settings/tests/Activity/SecurityProviderTest.php
index 9d10b1e596e..b00c62281cc 100644
--- a/apps/settings/tests/Activity/SecurityProviderTest.php
+++ b/apps/settings/tests/Activity/SecurityProviderTest.php
@@ -39,7 +39,7 @@ class SecurityProviderTest extends TestCase {
 		$this->provider = new SecurityProvider($this->l10n, $this->urlGenerator, $this->activityManager);
 	}
 
-	public function testParseUnrelated() {
+	public function testParseUnrelated(): void {
 		$lang = 'ru';
 		$event = $this->createMock(IEvent::class);
 		$event->expects($this->once())
@@ -60,7 +60,7 @@ class SecurityProviderTest extends TestCase {
 	/**
 	 * @dataProvider subjectData
 	 */
-	public function testParse($subject) {
+	public function testParse($subject): void {
 		$lang = 'ru';
 		$event = $this->createMock(IEvent::class);
 		$l = $this->createMock(IL10N::class);
@@ -96,7 +96,7 @@ class SecurityProviderTest extends TestCase {
 		$this->provider->parse($lang, $event);
 	}
 
-	public function testParseInvalidSubject() {
+	public function testParseInvalidSubject(): void {
 		$lang = 'ru';
 		$l = $this->createMock(IL10N::class);
 		$event = $this->createMock(IEvent::class);
diff --git a/apps/settings/tests/Activity/SecuritySettingTest.php b/apps/settings/tests/Activity/SecuritySettingTest.php
index dd28d757e72..1b2b0e3361c 100644
--- a/apps/settings/tests/Activity/SecuritySettingTest.php
+++ b/apps/settings/tests/Activity/SecuritySettingTest.php
@@ -23,19 +23,19 @@ class SecuritySettingTest extends TestCase {
 		$this->setting = new SecuritySetting($this->l10n);
 	}
 
-	public function testCanChangeMail() {
+	public function testCanChangeMail(): void {
 		$this->assertFalse($this->setting->canChangeMail());
 	}
 
-	public function testCanChangeStream() {
+	public function testCanChangeStream(): void {
 		$this->assertFalse($this->setting->canChangeStream());
 	}
 
-	public function testGetIdentifier() {
+	public function testGetIdentifier(): void {
 		$this->assertEquals('security', $this->setting->getIdentifier());
 	}
 
-	public function testGetName() {
+	public function testGetName(): void {
 		$this->l10n->expects($this->once())
 			->method('t')
 			->with('Security')
@@ -43,11 +43,11 @@ class SecuritySettingTest extends TestCase {
 		$this->assertEquals('Sicherheit', $this->setting->getName());
 	}
 
-	public function testGetPriority() {
+	public function testGetPriority(): void {
 		$this->assertEquals(30, $this->setting->getPriority());
 	}
 
-	public function testIsDefaultEnabled() {
+	public function testIsDefaultEnabled(): void {
 		$this->assertTrue($this->setting->isDefaultEnabledMail());
 		$this->assertTrue($this->setting->isDefaultEnabledStream());
 	}
diff --git a/apps/settings/tests/AppInfo/ApplicationTest.php b/apps/settings/tests/AppInfo/ApplicationTest.php
index 60c37e42015..677efdc64bf 100644
--- a/apps/settings/tests/AppInfo/ApplicationTest.php
+++ b/apps/settings/tests/AppInfo/ApplicationTest.php
@@ -38,7 +38,7 @@ class ApplicationTest extends TestCase {
 		$this->container = $this->app->getContainer();
 	}
 
-	public function testContainerAppName() {
+	public function testContainerAppName(): void {
 		$this->app = new Application();
 		$this->assertEquals('settings', $this->container->getAppName());
 	}
@@ -62,7 +62,7 @@ class ApplicationTest extends TestCase {
 	 * @param string $service
 	 * @param string $expected
 	 */
-	public function testContainerQuery($service, $expected) {
+	public function testContainerQuery($service, $expected): void {
 		$this->assertTrue($this->container->query($service) instanceof $expected);
 	}
 }
diff --git a/apps/settings/tests/Controller/AdminSettingsControllerTest.php b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
index 578348a3031..60ba5e0750e 100644
--- a/apps/settings/tests/Controller/AdminSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
@@ -87,7 +87,7 @@ class AdminSettingsControllerTest extends TestCase {
 		parent::tearDown();
 	}
 
-	public function testIndex() {
+	public function testIndex(): void {
 		$user = $this->createMock(IUser::class);
 		$this->userSession
 			->method('getUser')
diff --git a/apps/settings/tests/Controller/AppSettingsControllerTest.php b/apps/settings/tests/Controller/AppSettingsControllerTest.php
index 71d263ac935..c219ee2fc9f 100644
--- a/apps/settings/tests/Controller/AppSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AppSettingsControllerTest.php
@@ -116,7 +116,7 @@ class AppSettingsControllerTest extends TestCase {
 		);
 	}
 
-	public function testListCategories() {
+	public function testListCategories(): void {
 		$this->installer->expects($this->any())
 			->method('isUpdateAvailable')
 			->willReturn(false);
@@ -171,7 +171,7 @@ class AppSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->appSettingsController->listCategories());
 	}
 
-	public function testViewApps() {
+	public function testViewApps(): void {
 		$this->bundleFetcher->expects($this->once())->method('getBundles')->willReturn([]);
 		$this->installer->expects($this->any())
 			->method('isUpdateAvailable')
@@ -204,7 +204,7 @@ class AppSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->appSettingsController->viewApps());
 	}
 
-	public function testViewAppsAppstoreNotEnabled() {
+	public function testViewAppsAppstoreNotEnabled(): void {
 		$this->installer->expects($this->any())
 			->method('isUpdateAvailable')
 			->willReturn(false);
diff --git a/apps/settings/tests/Controller/AuthSettingsControllerTest.php b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
index a054d5e306c..13213992d94 100644
--- a/apps/settings/tests/Controller/AuthSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
@@ -74,7 +74,7 @@ class AuthSettingsControllerTest extends TestCase {
 		);
 	}
 
-	public function testCreate() {
+	public function testCreate(): void {
 		$name = 'Nexus 4';
 		$sessionToken = $this->createMock(IToken::class);
 		$deviceToken = $this->createMock(IToken::class);
@@ -123,7 +123,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $response->getData());
 	}
 
-	public function testCreateSessionNotAvailable() {
+	public function testCreateSessionNotAvailable(): void {
 		$name = 'personal phone';
 
 		$this->session->expects($this->once())
@@ -136,7 +136,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->controller->create($name));
 	}
 
-	public function testCreateInvalidToken() {
+	public function testCreateInvalidToken(): void {
 		$name = 'Company IPhone';
 
 		$this->session->expects($this->once())
@@ -153,7 +153,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->controller->create($name));
 	}
 
-	public function testDestroy() {
+	public function testDestroy(): void {
 		$tokenId = 124;
 		$token = $this->createMock(PublicKeyToken::class);
 
@@ -175,7 +175,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertEquals([], $this->controller->destroy($tokenId));
 	}
 
-	public function testDestroyExpired() {
+	public function testDestroyExpired(): void {
 		$tokenId = 124;
 		$token = $this->createMock(PublicKeyToken::class);
 
@@ -199,7 +199,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertSame([], $this->controller->destroy($tokenId));
 	}
 
-	public function testDestroyWrongUser() {
+	public function testDestroyWrongUser(): void {
 		$tokenId = 124;
 		$token = $this->createMock(PublicKeyToken::class);
 
@@ -331,7 +331,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertSame([], $this->controller->update($tokenId, [IToken::SCOPE_FILESYSTEM => true], 'App password'));
 	}
 
-	public function testUpdateExpired() {
+	public function testUpdateExpired(): void {
 		$tokenId = 42;
 		$token = $this->createMock(PublicKeyToken::class);
 
@@ -351,7 +351,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertSame([], $this->controller->update($tokenId, [IToken::SCOPE_FILESYSTEM => true], 'App password'));
 	}
 
-	public function testUpdateTokenWrongUser() {
+	public function testUpdateTokenWrongUser(): void {
 		$tokenId = 42;
 		$token = $this->createMock(PublicKeyToken::class);
 
@@ -371,7 +371,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->assertSame(\OCP\AppFramework\Http::STATUS_NOT_FOUND, $response->getStatus());
 	}
 
-	public function testUpdateTokenNonExisting() {
+	public function testUpdateTokenNonExisting(): void {
 		$this->tokenProvider->expects($this->once())
 			->method('getTokenById')
 			->with($this->equalTo(42))
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index fde13cfee31..27f7aa1b696 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -84,7 +84,7 @@ class CheckSetupControllerTest extends TestCase {
 			])->getMock();
 	}
 
-	public function testCheck() {
+	public function testCheck(): void {
 		$this->config->expects($this->any())
 			->method('getAppValue')
 			->willReturnMap([
@@ -142,7 +142,7 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->checkSetupController->check());
 	}
 
-	public function testRescanFailedIntegrityCheck() {
+	public function testRescanFailedIntegrityCheck(): void {
 		$this->checker
 			->expects($this->once())
 			->method('runInstanceVerification');
@@ -156,7 +156,7 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->checkSetupController->rescanFailedIntegrityCheck());
 	}
 
-	public function testGetFailedIntegrityCheckDisabled() {
+	public function testGetFailedIntegrityCheckDisabled(): void {
 		$this->checker
 			->expects($this->once())
 			->method('isCodeCheckEnforced')
@@ -167,7 +167,7 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 
-	public function testGetFailedIntegrityCheckFilesWithNoErrorsFound() {
+	public function testGetFailedIntegrityCheckFilesWithNoErrorsFound(): void {
 		$this->checker
 			->expects($this->once())
 			->method('isCodeCheckEnforced')
@@ -187,7 +187,7 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->checkSetupController->getFailedIntegrityCheckFiles());
 	}
 
-	public function testGetFailedIntegrityCheckFilesWithSomeErrorsFound() {
+	public function testGetFailedIntegrityCheckFilesWithSomeErrorsFound(): void {
 		$this->checker
 			->expects($this->once())
 			->method('isCodeCheckEnforced')
diff --git a/apps/settings/tests/Controller/DelegationControllerTest.php b/apps/settings/tests/Controller/DelegationControllerTest.php
index 2d03e316ce9..5994ddf298d 100644
--- a/apps/settings/tests/Controller/DelegationControllerTest.php
+++ b/apps/settings/tests/Controller/DelegationControllerTest.php
@@ -32,7 +32,7 @@ class DelegationControllerTest extends TestCase {
 		);
 	}
 
-	public function testSaveSettings() {
+	public function testSaveSettings(): void {
 		$setting = 'MySecretSetting';
 		$oldGroups = [];
 		$oldGroups[] = AuthorizedGroup::fromParams(['groupId' => 'hello', 'class' => $setting]);
diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php
index 52642884d23..d4d1e319a8e 100644
--- a/apps/settings/tests/Controller/MailSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php
@@ -58,7 +58,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
 		);
 	}
 
-	public function testSetMailSettings() {
+	public function testSetMailSettings(): void {
 		$this->config->expects($this->exactly(2))
 			->method('setSystemValues')
 			->withConsecutive(
@@ -113,7 +113,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
 	}
 
-	public function testStoreCredentials() {
+	public function testStoreCredentials(): void {
 		$this->config
 			->expects($this->once())
 			->method('setSystemValues')
@@ -126,7 +126,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
 	}
 
-	public function testSendTestMail() {
+	public function testSendTestMail(): void {
 		$user = $this->createMock(User::class);
 		$user->expects($this->any())
 			->method('getUID')
diff --git a/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php b/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
index 91b532b05f8..c34b2907dfd 100644
--- a/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
@@ -37,7 +37,7 @@ class TwoFactorSettingsControllerTest extends TestCase {
 		);
 	}
 
-	public function testIndex() {
+	public function testIndex(): void {
 		$state = new EnforcementState(true);
 		$this->mandatoryTwoFactor->expects($this->once())
 			->method('getState')
@@ -49,7 +49,7 @@ class TwoFactorSettingsControllerTest extends TestCase {
 		$this->assertEquals($expected, $resp);
 	}
 
-	public function testUpdate() {
+	public function testUpdate(): void {
 		$state = new EnforcementState(true);
 		$this->mandatoryTwoFactor->expects($this->once())
 			->method('setState')
diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
index e1407cb1b55..db346ab89f2 100644
--- a/apps/settings/tests/Controller/UsersControllerTest.php
+++ b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -249,7 +249,7 @@ class UsersControllerTest extends \Test\TestCase {
 	 * @param bool $validEmail
 	 * @param $expectedStatus
 	 */
-	public function testSetUserSettings($email, $validEmail, $expectedStatus) {
+	public function testSetUserSettings($email, $validEmail, $expectedStatus): void {
 		$controller = $this->getController(false, ['saveUserSettings']);
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('johndoe');
@@ -303,7 +303,7 @@ class UsersControllerTest extends \Test\TestCase {
 		];
 	}
 
-	public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed() {
+	public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void {
 		$controller = $this->getController(false, ['saveUserSettings']);
 
 		$avatarScope = IAccountManager::SCOPE_PUBLISHED;
@@ -401,7 +401,7 @@ class UsersControllerTest extends \Test\TestCase {
 		);
 	}
 
-	public function testSetUserSettingsWhenFederatedFilesharingNotEnabled() {
+	public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void {
 		$controller = $this->getController(false, ['saveUserSettings']);
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('johndoe');
@@ -488,7 +488,7 @@ class UsersControllerTest extends \Test\TestCase {
 	 * @param string $property
 	 * @param string $propertyValue
 	 */
-	public function testSetUserSettingsSubset($property, $propertyValue) {
+	public function testSetUserSettingsSubset($property, $propertyValue): void {
 		$controller = $this->getController(false, ['saveUserSettings']);
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('johndoe');
@@ -619,7 +619,7 @@ class UsersControllerTest extends \Test\TestCase {
 	public function testSaveUserSettings($data,
 		$oldEmailAddress,
 		$oldDisplayName
-	) {
+	): void {
 		$controller = $this->getController();
 		$user = $this->createMock(IUser::class);
 
@@ -742,7 +742,7 @@ class UsersControllerTest extends \Test\TestCase {
 		string $oldDisplayName,
 		bool  $setDisplayNameResult,
 		bool $canChangeEmail
-	) {
+	): void {
 		$this->expectException(ForbiddenException::class);
 
 		$controller = $this->getController();
@@ -826,7 +826,7 @@ class UsersControllerTest extends \Test\TestCase {
 	 *
 	 * @dataProvider dataTestGetVerificationCode
 	 */
-	public function testGetVerificationCode($account, $type, $dataBefore, $expectedData, $onlyVerificationCode) {
+	public function testGetVerificationCode($account, $type, $dataBefore, $expectedData, $onlyVerificationCode): void {
 		$message = 'Use my Federated Cloud ID to share with me: user@nextcloud.com';
 		$signature = 'theSignature';
 
@@ -912,7 +912,7 @@ class UsersControllerTest extends \Test\TestCase {
 	/**
 	 * test get verification code in case no valid user was given
 	 */
-	public function testGetVerificationCodeInvalidUser() {
+	public function testGetVerificationCodeInvalidUser(): void {
 		$controller = $this->getController();
 		$this->userSession->expects($this->once())->method('getUser')->willReturn(null);
 		$result = $controller->getVerificationCode('account', false);
@@ -931,7 +931,7 @@ class UsersControllerTest extends \Test\TestCase {
 	public function testCanAdminChangeUserPasswords($encryptionEnabled,
 		$encryptionModuleLoaded,
 		$masterKeyEnabled,
-		$expected) {
+		$expected): void {
 		$controller = $this->getController();
 
 		$this->encryptionManager->expects($this->any())
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index 2f9f7bcba7b..579ab2cdbb0 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -102,7 +102,7 @@ class NewUserMailHelperTest extends TestCase {
 		);
 	}
 
-	public function testGenerateTemplateWithPasswordResetToken() {
+	public function testGenerateTemplateWithPasswordResetToken(): void {
 		$this->secureRandom
 			->expects($this->once())
 			->method('generate')
@@ -357,7 +357,7 @@ EOF;
 		$this->assertSame('OC\Mail\EMailTemplate', get_class($result));
 	}
 
-	public function testGenerateTemplateWithoutPasswordResetToken() {
+	public function testGenerateTemplateWithoutPasswordResetToken(): void {
 		$this->urlGenerator
 			->expects($this->any())
 			->method('getAbsoluteURL')
@@ -593,7 +593,7 @@ EOF;
 		$this->assertSame('OC\Mail\EMailTemplate', get_class($result));
 	}
 
-	public function testGenerateTemplateWithoutUserId() {
+	public function testGenerateTemplateWithoutUserId(): void {
 		$this->urlGenerator
 			->expects($this->any())
 			->method('getAbsoluteURL')
@@ -816,7 +816,7 @@ EOF;
 		$this->assertSame('OC\Mail\EMailTemplate', get_class($result));
 	}
 
-	public function testSendMail() {
+	public function testSendMail(): void {
 		/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
 		$user = $this->createMock(IUser::class);
 		$user
diff --git a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
index 1a832c528bf..c4672a06d49 100644
--- a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
+++ b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
@@ -44,7 +44,7 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeControllerAsUserWithExemption() {
+	public function testBeforeControllerAsUserWithExemption(): void {
 		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\NotAdminException::class);
 
 		$this->reflector
@@ -58,7 +58,7 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeControllerAsUserWithoutExemption() {
+	public function testBeforeControllerAsUserWithoutExemption(): void {
 		$this->reflector
 			->expects($this->once())
 			->method('hasAnnotation')
@@ -67,7 +67,7 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 		$this->subadminMiddleware->beforeController($this->controller, 'foo');
 	}
 
-	public function testBeforeControllerAsSubAdminWithoutExemption() {
+	public function testBeforeControllerAsSubAdminWithoutExemption(): void {
 		$this->reflector
 			->expects($this->exactly(2))
 			->method('hasAnnotation')
@@ -78,7 +78,7 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 		$this->subadminMiddlewareAsSubAdmin->beforeController($this->controller, 'foo');
 	}
 
-	public function testBeforeControllerAsSubAdminWithExemption() {
+	public function testBeforeControllerAsSubAdminWithExemption(): void {
 		$this->reflector
 			->expects($this->once())
 			->method('hasAnnotation')
@@ -87,14 +87,14 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 		$this->subadminMiddlewareAsSubAdmin->beforeController($this->controller, 'foo');
 	}
 
-	public function testAfterNotAdminException() {
+	public function testAfterNotAdminException(): void {
 		$expectedResponse = new TemplateResponse('core', '403', [], 'guest');
 		$expectedResponse->setStatus(403);
 		$this->assertEquals($expectedResponse, $this->subadminMiddleware->afterException($this->controller, 'foo', new NotAdminException('')));
 	}
 
 
-	public function testAfterRegularException() {
+	public function testAfterRegularException(): void {
 		$this->expectException(\Exception::class);
 
 		$expectedResponse = new TemplateResponse('core', '403', [], 'guest');
diff --git a/apps/settings/tests/Settings/Admin/MailTest.php b/apps/settings/tests/Settings/Admin/MailTest.php
index cab0596ad44..021dbac241b 100644
--- a/apps/settings/tests/Settings/Admin/MailTest.php
+++ b/apps/settings/tests/Settings/Admin/MailTest.php
@@ -30,7 +30,7 @@ class MailTest extends TestCase {
 		);
 	}
 
-	public function testGetForm() {
+	public function testGetForm(): void {
 		$this->config
 			->expects($this->any())
 			->method('getSystemValue')
@@ -69,11 +69,11 @@ class MailTest extends TestCase {
 		$this->assertEquals($expected, $this->admin->getForm());
 	}
 
-	public function testGetSection() {
+	public function testGetSection(): void {
 		$this->assertSame('server', $this->admin->getSection());
 	}
 
-	public function testGetPriority() {
+	public function testGetPriority(): void {
 		$this->assertSame(10, $this->admin->getPriority());
 	}
 }
diff --git a/apps/settings/tests/Settings/Admin/SecurityTest.php b/apps/settings/tests/Settings/Admin/SecurityTest.php
index 4af8ad496ce..95b5e988397 100644
--- a/apps/settings/tests/Settings/Admin/SecurityTest.php
+++ b/apps/settings/tests/Settings/Admin/SecurityTest.php
@@ -57,7 +57,7 @@ class SecurityTest extends TestCase {
 	 * @dataProvider encryptionSettingsProvider
 	 * @param bool $enabled
 	 */
-	public function testGetFormWithOnlyOneBackend($enabled) {
+	public function testGetFormWithOnlyOneBackend($enabled): void {
 		$this->manager
 			->expects($this->once())
 			->method('isEnabled')
@@ -87,7 +87,7 @@ class SecurityTest extends TestCase {
 	 * @dataProvider encryptionSettingsProvider
 	 * @param bool $enabled
 	 */
-	public function testGetFormWithMultipleBackends($enabled) {
+	public function testGetFormWithMultipleBackends($enabled): void {
 		$this->manager
 			->expects($this->once())
 			->method('isEnabled')
@@ -113,11 +113,11 @@ class SecurityTest extends TestCase {
 		$this->assertEquals($expected, $this->admin->getForm());
 	}
 
-	public function testGetSection() {
+	public function testGetSection(): void {
 		$this->assertSame('security', $this->admin->getSection());
 	}
 
-	public function testGetPriority() {
+	public function testGetPriority(): void {
 		$this->assertSame(10, $this->admin->getPriority());
 	}
 }
diff --git a/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php b/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
index d2cd10e34d3..44641ee98b3 100644
--- a/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
+++ b/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
@@ -57,7 +57,7 @@ class AuthtokensTest extends TestCase {
 		);
 	}
 
-	public function testGetForm() {
+	public function testGetForm(): void {
 		$token1 = new PublicKeyToken();
 		$token1->setId(100);
 		$token2 = new PublicKeyToken();
diff --git a/apps/settings/tests/Settings/Personal/Security/PasswordTest.php b/apps/settings/tests/Settings/Personal/Security/PasswordTest.php
index 4ed7583339e..62f2c998943 100644
--- a/apps/settings/tests/Settings/Personal/Security/PasswordTest.php
+++ b/apps/settings/tests/Settings/Personal/Security/PasswordTest.php
@@ -38,7 +38,7 @@ class PasswordTest extends TestCase {
 		);
 	}
 
-	public function testGetForm() {
+	public function testGetForm(): void {
 		$user = $this->createMock(IUser::class);
 		$this->userManager->expects($this->once())
 			->method('get')
diff --git a/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php b/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
index 24fd28c5e9f..db3141e3a26 100644
--- a/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
+++ b/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
@@ -46,7 +46,7 @@ class AppDirsWithDifferentOwnerTest extends TestCase {
 	 *
 	 * @return void
 	 */
-	public function testAppDirectoryOwnersOk() {
+	public function testAppDirectoryOwnersOk(): void {
 		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
 		mkdir($tempDir);
 		mkdir($tempDir . DIRECTORY_SEPARATOR . 'app1');
@@ -73,7 +73,7 @@ class AppDirsWithDifferentOwnerTest extends TestCase {
 	 *
 	 * @return void
 	 */
-	public function testAppDirectoryOwnersNotWritable() {
+	public function testAppDirectoryOwnersNotWritable(): void {
 		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
 		\OC::$APPSROOTS = [
 			[