Merge pull request #48049 from nextcloud/refactor/void-tests

refactor: Add void return type to PHPUnit test methods

42 files changed, 470 insertions, 470 deletions

diff --git a/tests/lib/AppFramework/AppTest.php b/tests/lib/AppFramework/AppTest.php
index 48f95564a22..3c535a4bf7a 100644
--- a/tests/lib/AppFramework/AppTest.php
+++ b/tests/lib/AppFramework/AppTest.php
@@ -71,7 +71,7 @@ class AppTest extends \Test\TestCase {
 	}
 
 
-	public function testControllerNameAndMethodAreBeingPassed() {
+	public function testControllerNameAndMethodAreBeingPassed(): void {
 		$return = ['HTTP/2.0 200 OK', [], [], null, new Response()];
 		$this->dispatcher->expects($this->once())
 			->method('dispatch')
@@ -87,19 +87,19 @@ class AppTest extends \Test\TestCase {
 	}
 
 
-	public function testBuildAppNamespace() {
+	public function testBuildAppNamespace(): void {
 		$ns = App::buildAppNamespace('someapp');
 		$this->assertEquals('OCA\Someapp', $ns);
 	}
 
 
-	public function testBuildAppNamespaceCore() {
+	public function testBuildAppNamespaceCore(): void {
 		$ns = App::buildAppNamespace('someapp', 'OC\\');
 		$this->assertEquals('OC\Someapp', $ns);
 	}
 
 
-	public function testBuildAppNamespaceInfoXml() {
+	public function testBuildAppNamespaceInfoXml(): void {
 		$ns = App::buildAppNamespace('namespacetestapp', 'OCA\\');
 		$this->assertEquals('OCA\NameSpaceTestApp', $ns);
 	}
@@ -111,7 +111,7 @@ class AppTest extends \Test\TestCase {
 	}
 
 
-	public function testOutputIsPrinted() {
+	public function testOutputIsPrinted(): void {
 		$return = ['HTTP/2.0 200 OK', [], [], $this->output, new Response()];
 		$this->dispatcher->expects($this->once())
 			->method('dispatch')
@@ -134,7 +134,7 @@ class AppTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataNoOutput
 	 */
-	public function testNoOutput(string $statusCode) {
+	public function testNoOutput(string $statusCode): void {
 		$return = [$statusCode, [], [], $this->output, new Response()];
 		$this->dispatcher->expects($this->once())
 			->method('dispatch')
@@ -150,7 +150,7 @@ class AppTest extends \Test\TestCase {
 	}
 
 
-	public function testCallbackIsCalled() {
+	public function testCallbackIsCalled(): void {
 		$mock = $this->getMockBuilder('OCP\AppFramework\Http\ICallbackResponse')
 			->getMock();
 
@@ -165,7 +165,7 @@ class AppTest extends \Test\TestCase {
 		App::main($this->controllerName, $this->controllerMethod, $this->container, []);
 	}
 
-	public function testCoreApp() {
+	public function testCoreApp(): void {
 		$this->container['AppName'] = 'core';
 		$this->container['OC\Core\Controller\Foo'] = $this->controller;
 		$this->container['urlParams'] = ['_route' => 'not-profiler'];
@@ -183,7 +183,7 @@ class AppTest extends \Test\TestCase {
 		App::main('Foo', $this->controllerMethod, $this->container);
 	}
 
-	public function testSettingsApp() {
+	public function testSettingsApp(): void {
 		$this->container['AppName'] = 'settings';
 		$this->container['OCA\Settings\Controller\Foo'] = $this->controller;
 		$this->container['urlParams'] = ['_route' => 'not-profiler'];
@@ -201,7 +201,7 @@ class AppTest extends \Test\TestCase {
 		App::main('Foo', $this->controllerMethod, $this->container);
 	}
 
-	public function testApp() {
+	public function testApp(): void {
 		$this->container['AppName'] = 'bar';
 		$this->container['OCA\Bar\Controller\Foo'] = $this->controller;
 		$this->container['urlParams'] = ['_route' => 'not-profiler'];
diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/lib/AppFramework/Controller/ApiControllerTest.php
index 6dea9938225..9dd980f975f 100644
--- a/tests/lib/AppFramework/Controller/ApiControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ApiControllerTest.php
@@ -21,7 +21,7 @@ class ApiControllerTest extends \Test\TestCase {
 	/** @var ChildApiController */
 	protected $controller;
 
-	public function testCors() {
+	public function testCors(): void {
 		$request = new Request(
 			['server' => ['HTTP_ORIGIN' => 'test']],
 			$this->createMock(IRequestId::class),
diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
index bec1b7a2a63..d6e0321023e 100644
--- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
@@ -51,13 +51,13 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 			])->getMock();
 	}
 
-	public function testShowAuthenticate() {
+	public function testShowAuthenticate(): void {
 		$expects = new TemplateResponse('core', 'publicshareauth', [], 'guest');
 
 		$this->assertEquals($expects, $this->controller->showAuthenticate());
 	}
 
-	public function testAuthenticateAuthenticated() {
+	public function testAuthenticateAuthenticated(): void {
 		$this->controller->method('isAuthenticated')
 			->willReturn(true);
 
@@ -74,7 +74,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->assertSame('myLink!', $result->getRedirectURL());
 	}
 
-	public function testAuthenticateInvalidPassword() {
+	public function testAuthenticateInvalidPassword(): void {
 		$this->controller->setToken('token');
 		$this->controller->method('isPasswordProtected')
 			->willReturn(true);
@@ -94,7 +94,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->assertEquals($expects, $result);
 	}
 
-	public function testAuthenticateValidPassword() {
+	public function testAuthenticateValidPassword(): void {
 		$this->controller->setToken('token');
 		$this->controller->method('isPasswordProtected')
 			->willReturn(true);
diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php
index 7a6b3460947..7c466e3a5b7 100644
--- a/tests/lib/AppFramework/Controller/ControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ControllerTest.php
@@ -79,21 +79,21 @@ class ControllerTest extends \Test\TestCase {
 	}
 
 
-	public function testFormatResonseInvalidFormat() {
+	public function testFormatResonseInvalidFormat(): void {
 		$this->expectException(\DomainException::class);
 
 		$this->controller->buildResponse(null, 'test');
 	}
 
 
-	public function testFormat() {
+	public function testFormat(): void {
 		$response = $this->controller->buildResponse(['hi'], 'json');
 
 		$this->assertEquals(['hi'], $response->getData());
 	}
 
 
-	public function testFormatDataResponseJSON() {
+	public function testFormatDataResponseJSON(): void {
 		$expectedHeaders = [
 			'test' => 'something',
 			'Cache-Control' => 'no-cache, no-store, must-revalidate',
@@ -113,7 +113,7 @@ class ControllerTest extends \Test\TestCase {
 	}
 
 
-	public function testCustomFormatter() {
+	public function testCustomFormatter(): void {
 		$response = $this->controller->custom('hi');
 		$response = $this->controller->buildResponse($response, 'json');
 
@@ -121,14 +121,14 @@ class ControllerTest extends \Test\TestCase {
 	}
 
 
-	public function testDefaultResponderToJSON() {
+	public function testDefaultResponderToJSON(): void {
 		$responder = $this->controller->getResponderByHTTPHeader('*/*');
 
 		$this->assertEquals('json', $responder);
 	}
 
 
-	public function testResponderAcceptHeaderParsed() {
+	public function testResponderAcceptHeaderParsed(): void {
 		$responder = $this->controller->getResponderByHTTPHeader(
 			'*/*, application/tom, application/json'
 		);
@@ -137,7 +137,7 @@ class ControllerTest extends \Test\TestCase {
 	}
 
 
-	public function testResponderAcceptHeaderParsedUpperCase() {
+	public function testResponderAcceptHeaderParsedUpperCase(): void {
 		$responder = $this->controller->getResponderByHTTPHeader(
 			'*/*, apPlication/ToM, application/json'
 		);
diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/lib/AppFramework/Controller/OCSControllerTest.php
index ea86c01a364..027881074c9 100644
--- a/tests/lib/AppFramework/Controller/OCSControllerTest.php
+++ b/tests/lib/AppFramework/Controller/OCSControllerTest.php
@@ -20,7 +20,7 @@ class ChildOCSController extends OCSController {
 
 
 class OCSControllerTest extends \Test\TestCase {
-	public function testCors() {
+	public function testCors(): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -45,7 +45,7 @@ class OCSControllerTest extends \Test\TestCase {
 	}
 
 
-	public function testXML() {
+	public function testXML(): void {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->createMock(IRequestId::class),
@@ -74,7 +74,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response->render());
 	}
 
-	public function testJSON() {
+	public function testJSON(): void {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->createMock(IRequestId::class),
@@ -91,7 +91,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response->render());
 	}
 
-	public function testXMLV2() {
+	public function testXMLV2(): void {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->createMock(IRequestId::class),
@@ -118,7 +118,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response->render());
 	}
 
-	public function testJSONV2() {
+	public function testJSONV2(): void {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->createMock(IRequestId::class),
diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
index be28843b03f..f8430d42ef1 100644
--- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
@@ -50,7 +50,7 @@ class PublicShareControllerTest extends \Test\TestCase {
 		$this->session = $this->createMock(ISession::class);
 	}
 
-	public function testGetToken() {
+	public function testGetToken(): void {
 		$controller = new TestController('app', $this->request, $this->session, 'hash', false);
 
 		$controller->setToken('test');
@@ -73,7 +73,7 @@ class PublicShareControllerTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataIsAuthenticated
 	 */
-	public function testIsAuthenticatedNotPasswordProtected(bool $protected, string $token1, string $token2, string $hash1, string $hash2, bool $expected) {
+	public function testIsAuthenticatedNotPasswordProtected(bool $protected, string $token1, string $token2, string $hash1, string $hash2, bool $expected): void {
 		$controller = new TestController('app', $this->request, $this->session, $hash2, $protected);
 
 		$this->session->method('get')
diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php
index a521b480f8f..c426faa757d 100644
--- a/tests/lib/AppFramework/Db/EntityTest.php
+++ b/tests/lib/AppFramework/Db/EntityTest.php
@@ -59,7 +59,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testResetUpdatedFields() {
+	public function testResetUpdatedFields(): void {
 		$entity = new TestEntity();
 		$entity->setId(3);
 		$entity->resetUpdatedFields();
@@ -68,7 +68,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testFromRow() {
+	public function testFromRow(): void {
 		$row = [
 			'pre_name' => 'john',
 			'email' => 'john@something.com'
@@ -80,7 +80,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testGetSetId() {
+	public function testGetSetId(): void {
 		$id = 3;
 		$this->entity->setId(3);
 
@@ -88,28 +88,28 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testColumnToPropertyNoReplacement() {
+	public function testColumnToPropertyNoReplacement(): void {
 		$column = 'my';
 		$this->assertEquals('my',
 			$this->entity->columnToProperty($column));
 	}
 
 
-	public function testColumnToProperty() {
+	public function testColumnToProperty(): void {
 		$column = 'my_attribute';
 		$this->assertEquals('myAttribute',
 			$this->entity->columnToProperty($column));
 	}
 
 
-	public function testPropertyToColumnNoReplacement() {
+	public function testPropertyToColumnNoReplacement(): void {
 		$property = 'my';
 		$this->assertEquals('my',
 			$this->entity->propertyToColumn($property));
 	}
 
 
-	public function testSetterMarksFieldUpdated() {
+	public function testSetterMarksFieldUpdated(): void {
 		$this->entity->setId(3);
 
 		$this->assertContains('id', array_keys($this->entity->getUpdatedFields()));
@@ -117,7 +117,7 @@ class EntityTest extends \Test\TestCase {
 
 
 
-	public function testCallShouldOnlyWorkForGetterSetter() {
+	public function testCallShouldOnlyWorkForGetterSetter(): void {
 		$this->expectException(\BadFunctionCallException::class);
 
 		$this->entity->something();
@@ -125,21 +125,21 @@ class EntityTest extends \Test\TestCase {
 
 
 
-	public function testGetterShouldFailIfAttributeNotDefined() {
+	public function testGetterShouldFailIfAttributeNotDefined(): void {
 		$this->expectException(\BadFunctionCallException::class);
 
 		$this->entity->getTest();
 	}
 
 
-	public function testSetterShouldFailIfAttributeNotDefined() {
+	public function testSetterShouldFailIfAttributeNotDefined(): void {
 		$this->expectException(\BadFunctionCallException::class);
 
 		$this->entity->setTest();
 	}
 
 
-	public function testFromRowShouldNotAssignEmptyArray() {
+	public function testFromRowShouldNotAssignEmptyArray(): void {
 		$row = [];
 		$entity2 = new TestEntity();
 
@@ -148,7 +148,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testIdGetsConvertedToInt() {
+	public function testIdGetsConvertedToInt(): void {
 		$row = ['id' => '4'];
 
 		$this->entity = TestEntity::fromRow($row);
@@ -156,7 +156,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testSetType() {
+	public function testSetType(): void {
 		$row = ['testId' => '4'];
 
 		$this->entity = TestEntity::fromRow($row);
@@ -164,7 +164,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testFromParams() {
+	public function testFromParams(): void {
 		$params = [
 			'testId' => 4,
 			'email' => 'john@doe'
@@ -177,7 +177,7 @@ class EntityTest extends \Test\TestCase {
 		$this->assertTrue($entity instanceof TestEntity);
 	}
 
-	public function testSlugify() {
+	public function testSlugify(): void {
 		$entity = new TestEntity();
 		$entity->setName('Slugify this!');
 		$this->assertEquals('slugify-this', $entity->slugify('name'));
@@ -186,20 +186,20 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testSetterCasts() {
+	public function testSetterCasts(): void {
 		$entity = new TestEntity();
 		$entity->setId('3');
 		$this->assertSame(3, $entity->getId());
 	}
 
 
-	public function testSetterDoesNotCastOnNull() {
+	public function testSetterDoesNotCastOnNull(): void {
 		$entity = new TestEntity();
 		$entity->setId(null);
 		$this->assertSame(null, $entity->getId());
 	}
 
-	public function testSetterConvertsResourcesToStringProperly() {
+	public function testSetterConvertsResourcesToStringProperly(): void {
 		$string = 'Definitely a string';
 		$stream = fopen('php://memory', 'r+');
 		fwrite($stream, $string);
@@ -212,7 +212,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testGetFieldTypes() {
+	public function testGetFieldTypes(): void {
 		$entity = new TestEntity();
 		$this->assertEquals([
 			'id' => 'integer',
@@ -224,20 +224,20 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testGetItInt() {
+	public function testGetItInt(): void {
 		$entity = new TestEntity();
 		$entity->setId(3);
 		$this->assertEquals('integer', gettype($entity->getId()));
 	}
 
 
-	public function testFieldsNotMarkedUpdatedIfNothingChanges() {
+	public function testFieldsNotMarkedUpdatedIfNothingChanges(): void {
 		$entity = new TestEntity('hey');
 		$entity->setName('hey');
 		$this->assertEquals(0, count($entity->getUpdatedFields()));
 	}
 
-	public function testIsGetter() {
+	public function testIsGetter(): void {
 		$entity = new TestEntity();
 		$entity->setTrueOrFalse(false);
 		$entity->setAnotherBool(false);
@@ -246,7 +246,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function testIsGetterShoudFailForOtherType() {
+	public function testIsGetterShoudFailForOtherType(): void {
 		$this->expectException(\BadFunctionCallException::class);
 
 		$entity = new TestEntity();
diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php
index 1f5250b1456..f08beca05ca 100644
--- a/tests/lib/AppFramework/Db/QBMapperTest.php
+++ b/tests/lib/AppFramework/Db/QBMapperTest.php
@@ -108,7 +108,7 @@ class QBMapperTest extends \Test\TestCase {
 	}
 
 	
-	public function testInsertEntityParameterTypeMapping() {
+	public function testInsertEntityParameterTypeMapping(): void {
 		$entity = new QBTestEntity();
 		$entity->setIntProp(123);
 		$entity->setBoolProp(true);
@@ -145,7 +145,7 @@ class QBMapperTest extends \Test\TestCase {
 	}
 
 	
-	public function testUpdateEntityParameterTypeMapping() {
+	public function testUpdateEntityParameterTypeMapping(): void {
 		$entity = new QBTestEntity();
 		$entity->setId(789);
 		$entity->setIntProp(123);
@@ -195,7 +195,7 @@ class QBMapperTest extends \Test\TestCase {
 	}
 
 	
-	public function testGetParameterTypeForProperty() {
+	public function testGetParameterTypeForProperty(): void {
 		$entity = new QBTestEntity();
 
 		$intType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'intProp');
diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php
index 94264f0de02..f3d2cff1ffd 100644
--- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php
+++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php
@@ -35,24 +35,24 @@ class DIContainerTest extends \Test\TestCase {
 	}
 
 
-	public function testProvidesRequest() {
+	public function testProvidesRequest(): void {
 		$this->assertTrue(isset($this->container['Request']));
 	}
 
-	public function testProvidesMiddlewareDispatcher() {
+	public function testProvidesMiddlewareDispatcher(): void {
 		$this->assertTrue(isset($this->container['MiddlewareDispatcher']));
 	}
 
-	public function testProvidesAppName() {
+	public function testProvidesAppName(): void {
 		$this->assertTrue(isset($this->container['AppName']));
 	}
 
 
-	public function testAppNameIsSetCorrectly() {
+	public function testAppNameIsSetCorrectly(): void {
 		$this->assertEquals('name', $this->container['AppName']);
 	}
 
-	public function testMiddlewareDispatcherIncludesSecurityMiddleware() {
+	public function testMiddlewareDispatcherIncludesSecurityMiddleware(): void {
 		$this->container['Request'] = new Request(
 			['method' => 'GET'],
 			$this->createMock(IRequestId::class),
@@ -135,7 +135,7 @@ class DIContainerTest extends \Test\TestCase {
 		$this->fail('Bootstrap registered middleware not found');
 	}
 
-	public function testInvalidAppClass() {
+	public function testInvalidAppClass(): void {
 		$this->expectException(QueryException::class);
 		$this->container->query('\OCA\Name\Foo');
 	}
diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
index ad126ad99e2..54c691d2392 100644
--- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
+++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
@@ -48,7 +48,7 @@ class DIIntergrationTests extends TestCase {
 		$this->container = new DIContainer('App1', [], $this->server);
 	}
 
-	public function testInjectFromServer() {
+	public function testInjectFromServer(): void {
 		$this->server->registerService(Interface1::class, function () {
 			return new ClassA1();
 		});
@@ -64,7 +64,7 @@ class DIIntergrationTests extends TestCase {
 		$this->assertSame(ClassA1::class, get_class($res->interface1));
 	}
 
-	public function testInjectDepFromServer() {
+	public function testInjectDepFromServer(): void {
 		$this->server->registerService(Interface1::class, function () {
 			return new ClassA1();
 		});
@@ -80,7 +80,7 @@ class DIIntergrationTests extends TestCase {
 		$this->assertSame(ClassA1::class, get_class($res->interface1));
 	}
 
-	public function testOverwriteDepFromServer() {
+	public function testOverwriteDepFromServer(): void {
 		$this->server->registerService(Interface1::class, function () {
 			return new ClassA1();
 		});
@@ -100,7 +100,7 @@ class DIIntergrationTests extends TestCase {
 		$this->assertSame(ClassA2::class, get_class($res->interface1));
 	}
 
-	public function testIgnoreOverwriteInServerClass() {
+	public function testIgnoreOverwriteInServerClass(): void {
 		$this->server->registerService(Interface1::class, function () {
 			return new ClassA1();
 		});
diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
index 465f9ee0a07..aa2b29418e4 100644
--- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
@@ -23,19 +23,19 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->contentSecurityPolicy = new ContentSecurityPolicy();
 	}
 
-	public function testGetPolicyDefault() {
+	public function testGetPolicyDefault(): void {
 		$defaultPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 		$this->assertSame($defaultPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptDomainValid() {
+	public function testGetPolicyScriptDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' www.nextcloud.com;style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptDomainValidMultiple() {
+	public function testGetPolicyScriptDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' www.nextcloud.com www.nextcloud.org;style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -43,7 +43,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomain() {
+	public function testGetPolicyDisallowScriptDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -51,7 +51,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomainMultiple() {
+	public function testGetPolicyDisallowScriptDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' www.nextcloud.com;style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -59,7 +59,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomainMultipleStacked() {
+	public function testGetPolicyDisallowScriptDomainMultipleStacked(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -67,21 +67,21 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptDisallowEval() {
+	public function testGetPolicyScriptDisallowEval(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->allowEvalScript(false);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDomainValid() {
+	public function testGetPolicyStyleDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' www.nextcloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDomainValidMultiple() {
+	public function testGetPolicyStyleDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' www.nextcloud.com www.nextcloud.org 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -89,7 +89,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomain() {
+	public function testGetPolicyDisallowStyleDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -97,7 +97,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomainMultiple() {
+	public function testGetPolicyDisallowStyleDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' www.nextcloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -105,7 +105,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomainMultipleStacked() {
+	public function testGetPolicyDisallowStyleDomainMultipleStacked(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -113,35 +113,35 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleAllowInline() {
+	public function testGetPolicyStyleAllowInline(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleAllowInlineWithDomain() {
+	public function testGetPolicyStyleAllowInlineWithDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' www.nextcloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDisallowInline() {
+	public function testGetPolicyStyleDisallowInline(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(false);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyImageDomainValid() {
+	public function testGetPolicyImageDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.nextcloud.com;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyImageDomainValidMultiple() {
+	public function testGetPolicyImageDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.nextcloud.com www.nextcloud.org;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -149,7 +149,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomain() {
+	public function testGetPolicyDisallowImageDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -157,7 +157,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomainMultiple() {
+	public function testGetPolicyDisallowImageDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.nextcloud.com;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -165,7 +165,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomainMultipleStakes() {
+	public function testGetPolicyDisallowImageDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -173,14 +173,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFontDomainValid() {
+	public function testGetPolicyFontDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data: www.nextcloud.com;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFontDomainValidMultiple() {
+	public function testGetPolicyFontDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data: www.nextcloud.com www.nextcloud.org;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -188,7 +188,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomain() {
+	public function testGetPolicyDisallowFontDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -196,7 +196,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomainMultiple() {
+	public function testGetPolicyDisallowFontDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data: www.nextcloud.com;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -204,7 +204,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomainMultipleStakes() {
+	public function testGetPolicyDisallowFontDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -212,14 +212,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyConnectDomainValid() {
+	public function testGetPolicyConnectDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self' www.nextcloud.com;media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyConnectDomainValidMultiple() {
+	public function testGetPolicyConnectDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self' www.nextcloud.com www.nextcloud.org;media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -227,7 +227,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomain() {
+	public function testGetPolicyDisallowConnectDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -235,7 +235,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomainMultiple() {
+	public function testGetPolicyDisallowConnectDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self' www.nextcloud.com;media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -243,7 +243,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomainMultipleStakes() {
+	public function testGetPolicyDisallowConnectDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -251,14 +251,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyMediaDomainValid() {
+	public function testGetPolicyMediaDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self' www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyMediaDomainValidMultiple() {
+	public function testGetPolicyMediaDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self' www.nextcloud.com www.nextcloud.org;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -266,7 +266,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomain() {
+	public function testGetPolicyDisallowMediaDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -274,7 +274,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomainMultiple() {
+	public function testGetPolicyDisallowMediaDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self' www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -282,7 +282,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomainMultipleStakes() {
+	public function testGetPolicyDisallowMediaDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -290,14 +290,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyObjectDomainValid() {
+	public function testGetPolicyObjectDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';object-src www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyObjectDomainValidMultiple() {
+	public function testGetPolicyObjectDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';object-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -305,7 +305,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomain() {
+	public function testGetPolicyDisallowObjectDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -313,7 +313,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomainMultiple() {
+	public function testGetPolicyDisallowObjectDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';object-src www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -321,7 +321,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomainMultipleStakes() {
+	public function testGetPolicyDisallowObjectDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -329,14 +329,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetAllowedFrameDomain() {
+	public function testGetAllowedFrameDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-src www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFrameDomainValidMultiple() {
+	public function testGetPolicyFrameDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -344,7 +344,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomain() {
+	public function testGetPolicyDisallowFrameDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -352,7 +352,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomainMultiple() {
+	public function testGetPolicyDisallowFrameDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-src www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -360,7 +360,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomainMultipleStakes() {
+	public function testGetPolicyDisallowFrameDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -368,14 +368,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetAllowedChildSrcDomain() {
+	public function testGetAllowedChildSrcDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';child-src child.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyChildSrcValidMultiple() {
+	public function testGetPolicyChildSrcValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';child-src child.nextcloud.com child.nextcloud.org;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.nextcloud.com');
@@ -383,7 +383,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomain() {
+	public function testGetPolicyDisallowChildSrcDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -391,7 +391,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomainMultiple() {
+	public function testGetPolicyDisallowChildSrcDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';child-src www.nextcloud.com;frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -399,7 +399,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomainMultipleStakes() {
+	public function testGetPolicyDisallowChildSrcDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -409,14 +409,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 
 
 
-	public function testGetAllowedFrameAncestorDomain() {
+	public function testGetAllowedFrameAncestorDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self' sub.nextcloud.com;form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameAncestorDomain('sub.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFrameAncestorValidMultiple() {
+	public function testGetPolicyFrameAncestorValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self' sub.nextcloud.com foo.nextcloud.com;form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameAncestorDomain('sub.nextcloud.com');
@@ -424,7 +424,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameAncestorDomain() {
+	public function testGetPolicyDisallowFrameAncestorDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameAncestorDomain('www.nextcloud.com');
@@ -432,7 +432,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameAncestorDomainMultiple() {
+	public function testGetPolicyDisallowFrameAncestorDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self' www.nextcloud.com;form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameAncestorDomain('www.nextcloud.com');
@@ -440,7 +440,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameAncestorDomainMultipleStakes() {
+	public function testGetPolicyDisallowFrameAncestorDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -448,21 +448,21 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyUnsafeEval() {
+	public function testGetPolicyUnsafeEval(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->allowEvalScript(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyUnsafeWasmEval() {
+	public function testGetPolicyUnsafeWasmEval(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' 'wasm-unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->allowEvalWasm(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyNonce() {
+	public function testGetPolicyNonce(): void {
 		$nonce = base64_encode('my-nonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'nonce-$nonce';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
@@ -471,7 +471,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyNonceDefault() {
+	public function testGetPolicyNonceDefault(): void {
 		$nonce = base64_encode('my-nonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'nonce-$nonce';script-src-elem 'strict-dynamic' 'nonce-$nonce';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
@@ -479,7 +479,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyNonceStrictDynamic() {
+	public function testGetPolicyNonceStrictDynamic(): void {
 		$nonce = base64_encode('my-nonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'strict-dynamic' 'nonce-$nonce';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
@@ -489,7 +489,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyNonceStrictDynamicDefault() {
+	public function testGetPolicyNonceStrictDynamicDefault(): void {
 		$nonce = base64_encode('my-nonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'strict-dynamic' 'nonce-$nonce';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
@@ -498,14 +498,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStrictDynamicOnScriptsOff() {
+	public function testGetPolicyStrictDynamicOnScriptsOff(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->useStrictDynamicOnScripts(false);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStrictDynamicAndStrictDynamicOnScripts() {
+	public function testGetPolicyStrictDynamicAndStrictDynamicOnScripts(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self';form-action 'self'";
 
 		$this->contentSecurityPolicy->useStrictDynamic(true);
diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php
index 39f7e76ea0c..7ae19e7d5d8 100644
--- a/tests/lib/AppFramework/Http/DataResponseTest.php
+++ b/tests/lib/AppFramework/Http/DataResponseTest.php
@@ -24,7 +24,7 @@ class DataResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetData() {
+	public function testSetData(): void {
 		$params = ['hi', 'yo'];
 		$this->response->setData($params);
 
@@ -32,7 +32,7 @@ class DataResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testConstructorAllowsToSetData() {
+	public function testConstructorAllowsToSetData(): void {
 		$data = ['hi'];
 		$code = 300;
 		$response = new DataResponse($data, $code);
@@ -42,7 +42,7 @@ class DataResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testConstructorAllowsToSetHeaders() {
+	public function testConstructorAllowsToSetHeaders(): void {
 		$data = ['hi'];
 		$code = 300;
 		$headers = ['test' => 'something'];
@@ -63,7 +63,7 @@ class DataResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testChainability() {
+	public function testChainability(): void {
 		$params = ['hi', 'yo'];
 		$this->response->setData($params)
 			->setStatus(Http::STATUS_NOT_FOUND);
diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index ef37a0b8942..94bcfcc4af2 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -230,7 +230,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testDispatcherReturnsArrayWith2Entries() {
+	public function testDispatcherReturnsArrayWith2Entries(): void {
 		$this->setMiddlewareExpectations('');
 
 		$response = $this->dispatcher->dispatch($this->controller, $this->controllerMethod);
@@ -240,7 +240,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testHeadersAndOutputAreReturned() {
+	public function testHeadersAndOutputAreReturned(): void {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = ['hell' => 'yeah'];
@@ -255,7 +255,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testExceptionCallsAfterException() {
+	public function testExceptionCallsAfterException(): void {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = ['hell' => 'yeah'];
@@ -270,7 +270,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testExceptionThrowsIfCanNotBeHandledByAfterException() {
+	public function testExceptionThrowsIfCanNotBeHandledByAfterException(): void {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = ['hell' => 'yeah'];
@@ -300,7 +300,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testControllerParametersInjected() {
+	public function testControllerParametersInjected(): void {
 		$this->request = new Request(
 			[
 				'post' => [
@@ -332,7 +332,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testControllerParametersInjectedDefaultOverwritten() {
+	public function testControllerParametersInjectedDefaultOverwritten(): void {
 		$this->request = new Request(
 			[
 				'post' => [
@@ -366,7 +366,7 @@ class DispatcherTest extends \Test\TestCase {
 
 
 
-	public function testResponseTransformedByUrlFormat() {
+	public function testResponseTransformedByUrlFormat(): void {
 		$this->request = new Request(
 			[
 				'post' => [
@@ -401,7 +401,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testResponseTransformsDataResponse() {
+	public function testResponseTransformsDataResponse(): void {
 		$this->request = new Request(
 			[
 				'post' => [
@@ -436,7 +436,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testResponseTransformedByAcceptHeader() {
+	public function testResponseTransformedByAcceptHeader(): void {
 		$this->request = new Request(
 			[
 				'post' => [
@@ -472,7 +472,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testResponsePrimarilyTransformedByParameterFormat() {
+	public function testResponsePrimarilyTransformedByParameterFormat(): void {
 		$this->request = new Request(
 			[
 				'post' => [
diff --git a/tests/lib/AppFramework/Http/DownloadResponseTest.php b/tests/lib/AppFramework/Http/DownloadResponseTest.php
index 425e5ecde1f..8ac5954e00d 100644
--- a/tests/lib/AppFramework/Http/DownloadResponseTest.php
+++ b/tests/lib/AppFramework/Http/DownloadResponseTest.php
@@ -19,7 +19,7 @@ class DownloadResponseTest extends \Test\TestCase {
 		parent::setUp();
 	}
 
-	public function testHeaders() {
+	public function testHeaders(): void {
 		$response = new ChildDownloadResponse('file', 'content');
 		$headers = $response->getHeaders();
 
@@ -30,7 +30,7 @@ class DownloadResponseTest extends \Test\TestCase {
 	/**
 	 * @dataProvider filenameEncodingProvider
 	 */
-	public function testFilenameEncoding(string $input, string $expected) {
+	public function testFilenameEncoding(string $input, string $expected): void {
 		$response = new ChildDownloadResponse($input, 'content');
 		$headers = $response->getHeaders();
 
diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
index 28158414351..3110f632fa7 100644
--- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
@@ -23,19 +23,19 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->contentSecurityPolicy = new EmptyContentSecurityPolicy();
 	}
 
-	public function testGetPolicyDefault() {
+	public function testGetPolicyDefault(): void {
 		$defaultPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 		$this->assertSame($defaultPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptDomainValid() {
+	public function testGetPolicyScriptDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptDomainValidMultiple() {
+	public function testGetPolicyScriptDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -43,7 +43,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomain() {
+	public function testGetPolicyDisallowScriptDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -51,7 +51,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomainMultiple() {
+	public function testGetPolicyDisallowScriptDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -59,7 +59,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowScriptDomainMultipleStacked() {
+	public function testGetPolicyDisallowScriptDomainMultipleStacked(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.nextcloud.com');
@@ -67,28 +67,28 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptAllowEval() {
+	public function testGetPolicyScriptAllowEval(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src  'unsafe-eval';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->allowEvalScript(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyScriptAllowWasmEval() {
+	public function testGetPolicyScriptAllowWasmEval(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src  'wasm-unsafe-eval';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->allowEvalWasm(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDomainValid() {
+	public function testGetPolicyStyleDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';style-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDomainValidMultiple() {
+	public function testGetPolicyStyleDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';style-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -96,7 +96,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomain() {
+	public function testGetPolicyDisallowStyleDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -104,7 +104,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomainMultiple() {
+	public function testGetPolicyDisallowStyleDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';style-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -112,7 +112,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowStyleDomainMultipleStacked() {
+	public function testGetPolicyDisallowStyleDomainMultipleStacked(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -120,14 +120,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleAllowInline() {
+	public function testGetPolicyStyleAllowInline(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';style-src  'unsafe-inline';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleAllowInlineWithDomain() {
+	public function testGetPolicyStyleAllowInlineWithDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';style-src www.nextcloud.com 'unsafe-inline';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.nextcloud.com');
@@ -135,21 +135,21 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyStyleDisallowInline() {
+	public function testGetPolicyStyleDisallowInline(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(false);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyImageDomainValid() {
+	public function testGetPolicyImageDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';img-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyImageDomainValidMultiple() {
+	public function testGetPolicyImageDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';img-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -157,7 +157,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomain() {
+	public function testGetPolicyDisallowImageDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -165,7 +165,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomainMultiple() {
+	public function testGetPolicyDisallowImageDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';img-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -173,7 +173,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowImageDomainMultipleStakes() {
+	public function testGetPolicyDisallowImageDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.nextcloud.com');
@@ -181,14 +181,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFontDomainValid() {
+	public function testGetPolicyFontDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';font-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFontDomainValidMultiple() {
+	public function testGetPolicyFontDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';font-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -196,7 +196,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomain() {
+	public function testGetPolicyDisallowFontDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -204,7 +204,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomainMultiple() {
+	public function testGetPolicyDisallowFontDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';font-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -212,7 +212,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFontDomainMultipleStakes() {
+	public function testGetPolicyDisallowFontDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.nextcloud.com');
@@ -220,14 +220,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyConnectDomainValid() {
+	public function testGetPolicyConnectDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';connect-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyConnectDomainValidMultiple() {
+	public function testGetPolicyConnectDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';connect-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -235,7 +235,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomain() {
+	public function testGetPolicyDisallowConnectDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -243,7 +243,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomainMultiple() {
+	public function testGetPolicyDisallowConnectDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';connect-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -251,7 +251,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowConnectDomainMultipleStakes() {
+	public function testGetPolicyDisallowConnectDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.nextcloud.com');
@@ -259,14 +259,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyMediaDomainValid() {
+	public function testGetPolicyMediaDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';media-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyMediaDomainValidMultiple() {
+	public function testGetPolicyMediaDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';media-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -274,7 +274,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomain() {
+	public function testGetPolicyDisallowMediaDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -282,7 +282,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomainMultiple() {
+	public function testGetPolicyDisallowMediaDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';media-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -290,7 +290,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowMediaDomainMultipleStakes() {
+	public function testGetPolicyDisallowMediaDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.nextcloud.com');
@@ -298,14 +298,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyObjectDomainValid() {
+	public function testGetPolicyObjectDomainValid(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';object-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyObjectDomainValidMultiple() {
+	public function testGetPolicyObjectDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';object-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -313,7 +313,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomain() {
+	public function testGetPolicyDisallowObjectDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -321,7 +321,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomainMultiple() {
+	public function testGetPolicyDisallowObjectDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';object-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -329,7 +329,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowObjectDomainMultipleStakes() {
+	public function testGetPolicyDisallowObjectDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.nextcloud.com');
@@ -337,14 +337,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetAllowedFrameDomain() {
+	public function testGetAllowedFrameDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyFrameDomainValidMultiple() {
+	public function testGetPolicyFrameDomainValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-src www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -352,7 +352,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomain() {
+	public function testGetPolicyDisallowFrameDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -360,7 +360,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomainMultiple() {
+	public function testGetPolicyDisallowFrameDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -368,7 +368,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowFrameDomainMultipleStakes() {
+	public function testGetPolicyDisallowFrameDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.nextcloud.com');
@@ -376,14 +376,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetAllowedChildSrcDomain() {
+	public function testGetAllowedChildSrcDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';child-src child.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyChildSrcValidMultiple() {
+	public function testGetPolicyChildSrcValidMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';child-src child.nextcloud.com child.nextcloud.org;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.nextcloud.com');
@@ -391,7 +391,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomain() {
+	public function testGetPolicyDisallowChildSrcDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -399,7 +399,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomainMultiple() {
+	public function testGetPolicyDisallowChildSrcDomainMultiple(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';child-src www.nextcloud.com;frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -407,7 +407,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyDisallowChildSrcDomainMultipleStakes() {
+	public function testGetPolicyDisallowChildSrcDomainMultipleStakes(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.nextcloud.com');
@@ -415,7 +415,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithJsNonceAndScriptDomains() {
+	public function testGetPolicyWithJsNonceAndScriptDomains(): void {
 		$nonce = base64_encode('MyJsNonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'nonce-$nonce' www.nextcloud.com www.nextcloud.org;frame-ancestors 'none'";
 
@@ -425,7 +425,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithJsNonceAndStrictDynamic() {
+	public function testGetPolicyWithJsNonceAndStrictDynamic(): void {
 		$nonce = base64_encode('MyJsNonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'strict-dynamic' 'nonce-$nonce' www.nextcloud.com;frame-ancestors 'none'";
 
@@ -435,7 +435,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithJsNonceAndStrictDynamicAndStrictDynamicOnScripts() {
+	public function testGetPolicyWithJsNonceAndStrictDynamicAndStrictDynamicOnScripts(): void {
 		$nonce = base64_encode('MyJsNonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'strict-dynamic' 'nonce-$nonce' www.nextcloud.com;frame-ancestors 'none'";
 
@@ -447,7 +447,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithJsNonceAndStrictDynamicOnScripts() {
+	public function testGetPolicyWithJsNonceAndStrictDynamicOnScripts(): void {
 		$nonce = base64_encode('MyJsNonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'nonce-$nonce' www.nextcloud.com;script-src-elem 'strict-dynamic' 'nonce-$nonce' www.nextcloud.com;frame-ancestors 'none'";
 
@@ -457,14 +457,14 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithStrictDynamicOnScripts() {
+	public function testGetPolicyWithStrictDynamicOnScripts(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->useStrictDynamicOnScripts(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithJsNonceAndSelfScriptDomain() {
+	public function testGetPolicyWithJsNonceAndSelfScriptDomain(): void {
 		$nonce = base64_encode('MyJsNonce');
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'nonce-$nonce';frame-ancestors 'none'";
 
@@ -473,21 +473,21 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithoutJsNonceAndSelfScriptDomain() {
+	public function testGetPolicyWithoutJsNonceAndSelfScriptDomain(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';frame-ancestors 'none'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain("'self'");
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithReportUri() {
+	public function testGetPolicyWithReportUri(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none';report-uri https://my-report-uri.com";
 
 		$this->contentSecurityPolicy->addReportTo('https://my-report-uri.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
-	public function testGetPolicyWithMultipleReportUri() {
+	public function testGetPolicyWithMultipleReportUri(): void {
 		$expectedPolicy = "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none';report-uri https://my-report-uri.com https://my-other-report-uri.com";
 
 		$this->contentSecurityPolicy->addReportTo('https://my-report-uri.com');
diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
index ca65fcd978c..71342485552 100644
--- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
+++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
@@ -19,19 +19,19 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->policy = new EmptyFeaturePolicy();
 	}
 
-	public function testGetPolicyDefault() {
+	public function testGetPolicyDefault(): void {
 		$defaultPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'";
 		$this->assertSame($defaultPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyAutoplayDomainValid() {
+	public function testGetPolicyAutoplayDomainValid(): void {
 		$expectedPolicy = "autoplay www.nextcloud.com;camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedAutoplayDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyAutoplayDomainValidMultiple() {
+	public function testGetPolicyAutoplayDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay www.nextcloud.com www.nextcloud.org;camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedAutoplayDomain('www.nextcloud.com');
@@ -39,14 +39,14 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyCameraDomainValid() {
+	public function testGetPolicyCameraDomainValid(): void {
 		$expectedPolicy = "autoplay 'none';camera www.nextcloud.com;fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedCameraDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyCameraDomainValidMultiple() {
+	public function testGetPolicyCameraDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'none';camera www.nextcloud.com www.nextcloud.org;fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedCameraDomain('www.nextcloud.com');
@@ -54,14 +54,14 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyFullScreenDomainValid() {
+	public function testGetPolicyFullScreenDomainValid(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen www.nextcloud.com;geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedFullScreenDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyFullScreenDomainValidMultiple() {
+	public function testGetPolicyFullScreenDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen www.nextcloud.com www.nextcloud.org;geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedFullScreenDomain('www.nextcloud.com');
@@ -69,14 +69,14 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyGeoLocationDomainValid() {
+	public function testGetPolicyGeoLocationDomainValid(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation www.nextcloud.com;microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedGeoLocationDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyGeoLocationDomainValidMultiple() {
+	public function testGetPolicyGeoLocationDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation www.nextcloud.com www.nextcloud.org;microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedGeoLocationDomain('www.nextcloud.com');
@@ -84,14 +84,14 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyMicrophoneDomainValid() {
+	public function testGetPolicyMicrophoneDomainValid(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone www.nextcloud.com;payment 'none'";
 
 		$this->policy->addAllowedMicrophoneDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyMicrophoneDomainValidMultiple() {
+	public function testGetPolicyMicrophoneDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone www.nextcloud.com www.nextcloud.org;payment 'none'";
 
 		$this->policy->addAllowedMicrophoneDomain('www.nextcloud.com');
@@ -99,14 +99,14 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyPaymentDomainValid() {
+	public function testGetPolicyPaymentDomainValid(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment www.nextcloud.com";
 
 		$this->policy->addAllowedPaymentDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyPaymentDomainValidMultiple() {
+	public function testGetPolicyPaymentDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment www.nextcloud.com www.nextcloud.org";
 
 		$this->policy->addAllowedPaymentDomain('www.nextcloud.com');
diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php
index ce6a87406e8..6ea990fb111 100644
--- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php
+++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php
@@ -19,19 +19,19 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->policy = new FeaturePolicy();
 	}
 
-	public function testGetPolicyDefault() {
+	public function testGetPolicyDefault(): void {
 		$defaultPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation 'none';microphone 'none';payment 'none'";
 		$this->assertSame($defaultPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyAutoplayDomainValid() {
+	public function testGetPolicyAutoplayDomainValid(): void {
 		$expectedPolicy = "autoplay 'self' www.nextcloud.com;camera 'none';fullscreen 'self';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedAutoplayDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyAutoplayDomainValidMultiple() {
+	public function testGetPolicyAutoplayDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self' www.nextcloud.com www.nextcloud.org;camera 'none';fullscreen 'self';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedAutoplayDomain('www.nextcloud.com');
@@ -39,14 +39,14 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyCameraDomainValid() {
+	public function testGetPolicyCameraDomainValid(): void {
 		$expectedPolicy = "autoplay 'self';camera www.nextcloud.com;fullscreen 'self';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedCameraDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyCameraDomainValidMultiple() {
+	public function testGetPolicyCameraDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self';camera www.nextcloud.com www.nextcloud.org;fullscreen 'self';geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedCameraDomain('www.nextcloud.com');
@@ -54,14 +54,14 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyFullScreenDomainValid() {
+	public function testGetPolicyFullScreenDomainValid(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self' www.nextcloud.com;geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedFullScreenDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyFullScreenDomainValidMultiple() {
+	public function testGetPolicyFullScreenDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self' www.nextcloud.com www.nextcloud.org;geolocation 'none';microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedFullScreenDomain('www.nextcloud.com');
@@ -69,14 +69,14 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyGeoLocationDomainValid() {
+	public function testGetPolicyGeoLocationDomainValid(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation www.nextcloud.com;microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedGeoLocationDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyGeoLocationDomainValidMultiple() {
+	public function testGetPolicyGeoLocationDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation www.nextcloud.com www.nextcloud.org;microphone 'none';payment 'none'";
 
 		$this->policy->addAllowedGeoLocationDomain('www.nextcloud.com');
@@ -84,14 +84,14 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyMicrophoneDomainValid() {
+	public function testGetPolicyMicrophoneDomainValid(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation 'none';microphone www.nextcloud.com;payment 'none'";
 
 		$this->policy->addAllowedMicrophoneDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyMicrophoneDomainValidMultiple() {
+	public function testGetPolicyMicrophoneDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation 'none';microphone www.nextcloud.com www.nextcloud.org;payment 'none'";
 
 		$this->policy->addAllowedMicrophoneDomain('www.nextcloud.com');
@@ -99,14 +99,14 @@ class FeaturePolicyTest extends \Test\TestCase {
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyPaymentDomainValid() {
+	public function testGetPolicyPaymentDomainValid(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation 'none';microphone 'none';payment www.nextcloud.com";
 
 		$this->policy->addAllowedPaymentDomain('www.nextcloud.com');
 		$this->assertSame($expectedPolicy, $this->policy->buildPolicy());
 	}
 
-	public function testGetPolicyPaymentDomainValidMultiple() {
+	public function testGetPolicyPaymentDomainValidMultiple(): void {
 		$expectedPolicy = "autoplay 'self';camera 'none';fullscreen 'self';geolocation 'none';microphone 'none';payment www.nextcloud.com www.nextcloud.org";
 
 		$this->policy->addAllowedPaymentDomain('www.nextcloud.com');
diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
index a75c6fdd591..5f602b2e1c6 100644
--- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
+++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
@@ -34,23 +34,23 @@ class FileDisplayResponseTest extends \Test\TestCase {
 		$this->response = new FileDisplayResponse($this->file);
 	}
 
-	public function testHeader() {
+	public function testHeader(): void {
 		$headers = $this->response->getHeaders();
 		$this->assertArrayHasKey('Content-Disposition', $headers);
 		$this->assertSame('inline; filename="myFileName"', $headers['Content-Disposition']);
 	}
 
-	public function testETag() {
+	public function testETag(): void {
 		$this->assertSame('myETag', $this->response->getETag());
 	}
 
-	public function testLastModified() {
+	public function testLastModified(): void {
 		$lastModified = $this->response->getLastModified();
 		$this->assertNotNull($lastModified);
 		$this->assertSame(1464825600, $lastModified->getTimestamp());
 	}
 
-	public function test304() {
+	public function test304(): void {
 		$output = $this->getMockBuilder('OCP\AppFramework\Http\IOutput')
 			->disableOriginalConstructor()
 			->getMock();
@@ -67,7 +67,7 @@ class FileDisplayResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testNon304() {
+	public function testNon304(): void {
 		$output = $this->getMockBuilder('OCP\AppFramework\Http\IOutput')
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php
index 46d2bb9d17a..d3ec8438554 100644
--- a/tests/lib/AppFramework/Http/HttpTest.php
+++ b/tests/lib/AppFramework/Http/HttpTest.php
@@ -26,19 +26,19 @@ class HttpTest extends \Test\TestCase {
 	}
 
 
-	public function testProtocol() {
+	public function testProtocol(): void {
 		$header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
 		$this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header);
 	}
 
 
-	public function testProtocol10() {
+	public function testProtocol10(): void {
 		$this->http = new Http($this->server, 'HTTP/1.0');
 		$header = $this->http->getStatusHeader(Http::STATUS_OK);
 		$this->assertEquals('HTTP/1.0 200 OK', $header);
 	}
 
-	public function testTempRedirectBecomesFoundInHttp10() {
+	public function testTempRedirectBecomesFoundInHttp10(): void {
 		$http = new Http([], 'HTTP/1.0');
 
 		$header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php
index bacc5999348..175ed852c7b 100644
--- a/tests/lib/AppFramework/Http/JSONResponseTest.php
+++ b/tests/lib/AppFramework/Http/JSONResponseTest.php
@@ -23,13 +23,13 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testHeader() {
+	public function testHeader(): void {
 		$headers = $this->json->getHeaders();
 		$this->assertEquals('application/json; charset=utf-8', $headers['Content-Type']);
 	}
 
 
-	public function testSetData() {
+	public function testSetData(): void {
 		$params = ['hi', 'yo'];
 		$this->json->setData($params);
 
@@ -37,7 +37,7 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetRender() {
+	public function testSetRender(): void {
 		$params = ['test' => 'hi'];
 		$this->json->setData($params);
 
@@ -65,13 +65,13 @@ class JSONResponseTest extends \Test\TestCase {
 	 * @param array $input
 	 * @param string $expected
 	 */
-	public function testRender(array $input, $expected) {
+	public function testRender(array $input, $expected): void {
 		$this->json->setData($input);
 		$this->assertEquals($expected, $this->json->render());
 	}
 
 
-	public function testRenderWithNonUtf8Encoding() {
+	public function testRenderWithNonUtf8Encoding(): void {
 		$this->expectException(\JsonException::class);
 		$this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
 
@@ -80,7 +80,7 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->json->render();
 	}
 
-	public function testConstructorAllowsToSetData() {
+	public function testConstructorAllowsToSetData(): void {
 		$data = ['hi'];
 		$code = 300;
 		$response = new JSONResponse($data, $code);
@@ -90,7 +90,7 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($code, $response->getStatus());
 	}
 
-	public function testChainability() {
+	public function testChainability(): void {
 		$params = ['hi', 'yo'];
 		$this->json->setData($params)
 			->setStatus(Http::STATUS_NOT_FOUND);
diff --git a/tests/lib/AppFramework/Http/OutputTest.php b/tests/lib/AppFramework/Http/OutputTest.php
index cad49ae77ba..58b17c08141 100644
--- a/tests/lib/AppFramework/Http/OutputTest.php
+++ b/tests/lib/AppFramework/Http/OutputTest.php
@@ -9,19 +9,19 @@ namespace Test\AppFramework\Http;
 use OC\AppFramework\Http\Output;
 
 class OutputTest extends \Test\TestCase {
-	public function testSetOutput() {
+	public function testSetOutput(): void {
 		$this->expectOutputString('foo');
 		$output = new Output('');
 		$output->setOutput('foo');
 	}
 
-	public function testSetReadfile() {
+	public function testSetReadfile(): void {
 		$this->expectOutputString(file_get_contents(__FILE__));
 		$output = new Output('');
 		$output->setReadfile(__FILE__);
 	}
 
-	public function testSetReadfileStream() {
+	public function testSetReadfileStream(): void {
 		$this->expectOutputString(file_get_contents(__FILE__));
 		$output = new Output('');
 		$output->setReadfile(fopen(__FILE__, 'r'));
diff --git a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
index 6b6e6fd429c..d963705bc24 100644
--- a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
+++ b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
@@ -12,12 +12,12 @@ use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use Test\TestCase;
 
 class PublicTemplateResponseTest extends TestCase {
-	public function testSetParamsConstructor() {
+	public function testSetParamsConstructor(): void {
 		$template = new PublicTemplateResponse('app', 'home', ['key' => 'value']);
 		$this->assertEquals(['key' => 'value'], $template->getParams());
 	}
 
-	public function testAdditionalElements() {
+	public function testAdditionalElements(): void {
 		$template = new PublicTemplateResponse('app', 'home', ['key' => 'value']);
 		$template->setHeaderTitle('Header');
 		$template->setHeaderDetails('Details');
@@ -26,7 +26,7 @@ class PublicTemplateResponseTest extends TestCase {
 		$this->assertEquals('Details', $template->getHeaderDetails());
 	}
 
-	public function testActionSingle() {
+	public function testActionSingle(): void {
 		$actions = [
 			new Http\Template\SimpleMenuAction('link', 'Download', 'download', 'downloadLink', 0)
 		];
@@ -39,7 +39,7 @@ class PublicTemplateResponseTest extends TestCase {
 	}
 
 
-	public function testActionMultiple() {
+	public function testActionMultiple(): void {
 		$actions = [
 			new Http\Template\SimpleMenuAction('link1', 'Download1', 'download1', 'downloadLink1', 100),
 			new Http\Template\SimpleMenuAction('link2', 'Download2', 'download2', 'downloadLink2', 20),
@@ -54,7 +54,7 @@ class PublicTemplateResponseTest extends TestCase {
 	}
 
 
-	public function testGetRenderAs() {
+	public function testGetRenderAs(): void {
 		$template = new PublicTemplateResponse('app', 'home', ['key' => 'value']);
 		$this->assertEquals(['key' => 'value'], $template->getParams());
 		$this->assertEquals('public', $template->getRenderAs());
diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php
index dd0142b77a7..f6319782e79 100644
--- a/tests/lib/AppFramework/Http/RedirectResponseTest.php
+++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php
@@ -23,7 +23,7 @@ class RedirectResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testHeaders() {
+	public function testHeaders(): void {
 		$headers = $this->response->getHeaders();
 		$this->assertEquals('/url', $headers['Location']);
 		$this->assertEquals(Http::STATUS_SEE_OTHER,
@@ -31,7 +31,7 @@ class RedirectResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testGetRedirectUrl() {
+	public function testGetRedirectUrl(): void {
 		$this->assertEquals('/url', $this->response->getRedirectUrl());
 	}
 }
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index f97341cb265..1c7f07580cc 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -47,7 +47,7 @@ class RequestTest extends \Test\TestCase {
 		parent::tearDown();
 	}
 
-	public function testRequestAccessors() {
+	public function testRequestAccessors(): void {
 		$vars = [
 			'get' => ['name' => 'John Q. Public', 'nickname' => 'Joey'],
 			'method' => 'GET',
@@ -77,7 +77,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	// urlParams has precedence over POST which has precedence over GET
-	public function testPrecedence() {
+	public function testPrecedence(): void {
 		$vars = [
 			'get' => ['name' => 'John Q. Public', 'nickname' => 'Joey'],
 			'post' => ['name' => 'Jane Doe', 'nickname' => 'Janey'],
@@ -100,7 +100,7 @@ class RequestTest extends \Test\TestCase {
 
 
 
-	public function testImmutableArrayAccess() {
+	public function testImmutableArrayAccess(): void {
 		$this->expectException(\RuntimeException::class);
 
 		$vars = [
@@ -120,7 +120,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	public function testImmutableMagicAccess() {
+	public function testImmutableMagicAccess(): void {
 		$this->expectException(\RuntimeException::class);
 
 		$vars = [
@@ -140,7 +140,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	public function testGetTheMethodRight() {
+	public function testGetTheMethodRight(): void {
 		$this->expectException(\LogicException::class);
 
 		$vars = [
@@ -159,7 +159,7 @@ class RequestTest extends \Test\TestCase {
 		$request->post;
 	}
 
-	public function testTheMethodIsRight() {
+	public function testTheMethodIsRight(): void {
 		$vars = [
 			'get' => ['name' => 'John Q. Public', 'nickname' => 'Joey'],
 			'method' => 'GET',
@@ -179,7 +179,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('Joey', $result['nickname']);
 	}
 
-	public function testJsonPost() {
+	public function testJsonPost(): void {
 		global $data;
 		$data = '{"name": "John Q. Public", "nickname": "Joey"}';
 		$vars = [
@@ -203,7 +203,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('Joey', $request['nickname']);
 	}
 
-	public function testScimJsonPost() {
+	public function testScimJsonPost(): void {
 		global $data;
 		$data = '{"userName":"testusername", "displayName":"Example User"}';
 		$vars = [
@@ -227,7 +227,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('Example User', $request['displayName']);
 	}
 
-	public function testCustomJsonPost() {
+	public function testCustomJsonPost(): void {
 		global $data;
 		$data = '{"propertyA":"sometestvalue", "propertyB":"someothertestvalue"}';
 
@@ -262,7 +262,7 @@ class RequestTest extends \Test\TestCase {
 	/**
 	 * @dataProvider notJsonDataProvider
 	 */
-	public function testNotJsonPost($testData) {
+	public function testNotJsonPost($testData): void {
 		global $data;
 		$data = $testData;
 		$vars = [
@@ -283,7 +283,7 @@ class RequestTest extends \Test\TestCase {
 		// ensure there's no error attempting to decode the content
 	}
 
-	public function testNotScimJsonPost() {
+	public function testNotScimJsonPost(): void {
 		global $data;
 		$data = 'this is not valid scim json';
 		$vars = [
@@ -304,7 +304,7 @@ class RequestTest extends \Test\TestCase {
 		// ensure there's no error attempting to decode the content
 	}
 
-	public function testNotCustomJsonPost() {
+	public function testNotCustomJsonPost(): void {
 		global $data;
 		$data = 'this is not valid json';
 		$vars = [
@@ -325,7 +325,7 @@ class RequestTest extends \Test\TestCase {
 		// ensure there's no error attempting to decode the content
 	}
 
-	public function testPatch() {
+	public function testPatch(): void {
 		global $data;
 		$data = http_build_query(['name' => 'John Q. Public', 'nickname' => 'Joey'], '', '&');
 
@@ -349,7 +349,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('Joey', $result['nickname']);
 	}
 
-	public function testJsonPatchAndPut() {
+	public function testJsonPatchAndPut(): void {
 		global $data;
 
 		// PUT content
@@ -395,7 +395,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame(null, $result['nickname']);
 	}
 
-	public function testScimJsonPatchAndPut() {
+	public function testScimJsonPatchAndPut(): void {
 		global $data;
 
 		// PUT content
@@ -441,7 +441,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame(null, $result['displayName']);
 	}
 
-	public function testCustomJsonPatchAndPut() {
+	public function testCustomJsonPatchAndPut(): void {
 		global $data;
 
 		// PUT content
@@ -487,7 +487,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame(null, $result['propertyB']);
 	}
 
-	public function testPutStream() {
+	public function testPutStream(): void {
 		global $data;
 		$data = file_get_contents(__DIR__ . '/../../../data/testimage.png');
 
@@ -522,7 +522,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	public function testSetUrlParameters() {
+	public function testSetUrlParameters(): void {
 		$vars = [
 			'post' => [],
 			'method' => 'POST',
@@ -771,7 +771,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param mixed $input
 	 * @param string $expected
 	 */
-	public function testGetHttpProtocol($input, $expected) {
+	public function testGetHttpProtocol($input, $expected): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -787,7 +787,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame($expected, $request->getHttpProtocol());
 	}
 
-	public function testGetServerProtocolWithOverride() {
+	public function testGetServerProtocolWithOverride(): void {
 		$this->config
 			->expects($this->exactly(3))
 			->method('getSystemValueString')
@@ -807,7 +807,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('customProtocol', $request->getServerProtocol());
 	}
 
-	public function testGetServerProtocolWithProtoValid() {
+	public function testGetServerProtocolWithProtoValid(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -848,7 +848,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('http', $requestHttp->getServerProtocol());
 	}
 
-	public function testGetServerProtocolWithHttpsServerValueOn() {
+	public function testGetServerProtocolWithHttpsServerValueOn(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -869,7 +869,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('https', $request->getServerProtocol());
 	}
 
-	public function testGetServerProtocolWithHttpsServerValueOff() {
+	public function testGetServerProtocolWithHttpsServerValueOff(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -890,7 +890,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('http', $request->getServerProtocol());
 	}
 
-	public function testGetServerProtocolWithHttpsServerValueEmpty() {
+	public function testGetServerProtocolWithHttpsServerValueEmpty(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -911,7 +911,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('http', $request->getServerProtocol());
 	}
 
-	public function testGetServerProtocolDefault() {
+	public function testGetServerProtocolDefault(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -928,7 +928,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('http', $request->getServerProtocol());
 	}
 
-	public function testGetServerProtocolBehindLoadBalancers() {
+	public function testGetServerProtocolBehindLoadBalancers(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -961,7 +961,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param array $userAgent
 	 * @param bool $matches
 	 */
-	public function testUserAgent($testAgent, $userAgent, $matches) {
+	public function testUserAgent($testAgent, $userAgent, $matches): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -983,7 +983,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param array $userAgent
 	 * @param bool $matches
 	 */
-	public function testUndefinedUserAgent($testAgent, $userAgent, $matches) {
+	public function testUndefinedUserAgent($testAgent, $userAgent, $matches): void {
 		$request = new Request(
 			[],
 			$this->requestId,
@@ -1174,7 +1174,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame($version, $matches[1]);
 	}
 
-	public function testInsecureServerHostServerNameHeader() {
+	public function testInsecureServerHostServerNameHeader(): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1190,7 +1190,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('from.server.name:8080', $request->getInsecureServerHost());
 	}
 
-	public function testInsecureServerHostHttpHostHeader() {
+	public function testInsecureServerHostHttpHostHeader(): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1207,7 +1207,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('from.host.header:8080', $request->getInsecureServerHost());
 	}
 
-	public function testInsecureServerHostHttpFromForwardedHeaderSingle() {
+	public function testInsecureServerHostHttpFromForwardedHeaderSingle(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -1236,7 +1236,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('from.forwarded.host:8080', $request->getInsecureServerHost());
 	}
 
-	public function testInsecureServerHostHttpFromForwardedHeaderStacked() {
+	public function testInsecureServerHostHttpFromForwardedHeaderStacked(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -1265,7 +1265,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('from.forwarded.host2:8080', $request->getInsecureServerHost());
 	}
 
-	public function testGetServerHostWithOverwriteHost() {
+	public function testGetServerHostWithOverwriteHost(): void {
 		$this->config
 			->method('getSystemValueString')
 			->willReturnCallback(function ($key, $default) {
@@ -1289,7 +1289,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('my.overwritten.host', $request->getServerHost());
 	}
 
-	public function testGetServerHostWithTrustedDomain() {
+	public function testGetServerHostWithTrustedDomain(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -1318,7 +1318,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('my.trusted.host', $request->getServerHost());
 	}
 
-	public function testGetServerHostWithUntrustedDomain() {
+	public function testGetServerHostWithUntrustedDomain(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -1347,7 +1347,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('my.trusted.host', $request->getServerHost());
 	}
 
-	public function testGetServerHostWithNoTrustedDomain() {
+	public function testGetServerHostWithNoTrustedDomain(): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) {
@@ -1390,7 +1390,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param $expected
 	 * @param $trustedDomain
 	 */
-	public function testGetServerHostTrustedDomain($expected, $trustedDomain) {
+	public function testGetServerHostTrustedDomain($expected, $trustedDomain): void {
 		$this->config
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) use ($trustedDomain) {
@@ -1419,7 +1419,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame($expected, $request->getServerHost());
 	}
 
-	public function testGetOverwriteHostDefaultNull() {
+	public function testGetOverwriteHostDefaultNull(): void {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValueString')
@@ -1436,7 +1436,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertNull(self::invokePrivate($request, 'getOverwriteHost'));
 	}
 
-	public function testGetOverwriteHostWithOverwrite() {
+	public function testGetOverwriteHostWithOverwrite(): void {
 		$this->config
 			->expects($this->exactly(3))
 			->method('getSystemValueString')
@@ -1457,7 +1457,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	public function testGetPathInfoNotProcessible() {
+	public function testGetPathInfoNotProcessible(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')');
 
@@ -1478,7 +1478,7 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	public function testGetRawPathInfoNotProcessible() {
+	public function testGetRawPathInfoNotProcessible(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')');
 
@@ -1504,7 +1504,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param string $scriptName
 	 * @param string $expected
 	 */
-	public function testGetPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expected) {
+	public function testGetPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expected): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1527,7 +1527,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param string $scriptName
 	 * @param string $expected
 	 */
-	public function testGetRawPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expected) {
+	public function testGetRawPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expected): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1550,7 +1550,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param string $scriptName
 	 * @param string $expected
 	 */
-	public function testGetRawPathInfoWithoutSetEnv($requestUri, $scriptName, $expected) {
+	public function testGetRawPathInfoWithoutSetEnv($requestUri, $scriptName, $expected): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1573,7 +1573,7 @@ class RequestTest extends \Test\TestCase {
 	 * @param string $scriptName
 	 * @param string $expected
 	 */
-	public function testGetPathInfoWithoutSetEnv($requestUri, $scriptName, $expected) {
+	public function testGetPathInfoWithoutSetEnv($requestUri, $scriptName, $expected): void {
 		$request = new Request(
 			[
 				'server' => [
@@ -1623,7 +1623,7 @@ class RequestTest extends \Test\TestCase {
 		];
 	}
 
-	public function testGetRequestUriWithoutOverwrite() {
+	public function testGetRequestUriWithoutOverwrite(): void {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValueString')
@@ -1655,7 +1655,7 @@ class RequestTest extends \Test\TestCase {
 	/**
 	 * @dataProvider providesGetRequestUriWithOverwriteData
 	 */
-	public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot, $overwriteCondAddr, $remoteAddr = '') {
+	public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot, $overwriteCondAddr, $remoteAddr = ''): void {
 		$this->config
 			->expects($this->exactly(2))
 			->method('getSystemValueString')
@@ -1688,7 +1688,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame($expectedUri, $request->getRequestUri());
 	}
 
-	public function testPassesCSRFCheckWithGet() {
+	public function testPassesCSRFCheckWithGet(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1718,7 +1718,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithPost() {
+	public function testPassesCSRFCheckWithPost(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1748,7 +1748,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithHeader() {
+	public function testPassesCSRFCheckWithHeader(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1778,7 +1778,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithGetAndWithoutCookies() {
+	public function testPassesCSRFCheckWithGetAndWithoutCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1802,7 +1802,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithPostAndWithoutCookies() {
+	public function testPassesCSRFCheckWithPostAndWithoutCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1826,7 +1826,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithHeaderAndWithoutCookies() {
+	public function testPassesCSRFCheckWithHeaderAndWithoutCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1850,7 +1850,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testFailsCSRFCheckWithHeaderAndNotAllChecksPassing() {
+	public function testFailsCSRFCheckWithHeaderAndNotAllChecksPassing(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1877,7 +1877,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesCSRFCheck());
 	}
 
-	public function testPassesStrictCookieCheckWithAllCookiesAndStrict() {
+	public function testPassesStrictCookieCheckWithAllCookiesAndStrict(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName', 'getCookieParams'])
@@ -1909,7 +1909,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesStrictCookieCheck());
 	}
 
-	public function testFailsStrictCookieCheckWithAllCookiesAndMissingStrict() {
+	public function testFailsStrictCookieCheckWithAllCookiesAndMissingStrict(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName', 'getCookieParams'])
@@ -1941,7 +1941,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesStrictCookieCheck());
 	}
 
-	public function testGetCookieParams() {
+	public function testGetCookieParams(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder(Request::class)
 			->setMethods(['getScriptName'])
@@ -1957,7 +1957,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame(session_get_cookie_params(), $actual);
 	}
 
-	public function testPassesStrictCookieCheckWithAllCookies() {
+	public function testPassesStrictCookieCheckWithAllCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1982,7 +1982,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesStrictCookieCheck());
 	}
 
-	public function testPassesStrictCookieCheckWithRandomCookies() {
+	public function testPassesStrictCookieCheckWithRandomCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2005,7 +2005,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesStrictCookieCheck());
 	}
 
-	public function testFailsStrictCookieCheckWithSessionCookie() {
+	public function testFailsStrictCookieCheckWithSessionCookie(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2028,7 +2028,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesStrictCookieCheck());
 	}
 
-	public function testFailsStrictCookieCheckWithRememberMeCookie() {
+	public function testFailsStrictCookieCheckWithRememberMeCookie(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2051,7 +2051,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesStrictCookieCheck());
 	}
 
-	public function testFailsCSRFCheckWithPostAndWithCookies() {
+	public function testFailsCSRFCheckWithPostAndWithCookies(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2078,7 +2078,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesCSRFCheck());
 	}
 
-	public function testFailStrictCookieCheckWithOnlyLaxCookie() {
+	public function testFailStrictCookieCheckWithOnlyLaxCookie(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2102,7 +2102,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesStrictCookieCheck());
 	}
 
-	public function testFailStrictCookieCheckWithOnlyStrictCookie() {
+	public function testFailStrictCookieCheckWithOnlyStrictCookie(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2126,7 +2126,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesStrictCookieCheck());
 	}
 
-	public function testPassesLaxCookieCheck() {
+	public function testPassesLaxCookieCheck(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2150,7 +2150,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesLaxCookieCheck());
 	}
 
-	public function testFailsLaxCookieCheckWithOnlyStrictCookie() {
+	public function testFailsLaxCookieCheckWithOnlyStrictCookie(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2174,7 +2174,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesLaxCookieCheck());
 	}
 
-	public function testSkipCookieCheckForOCSRequests() {
+	public function testSkipCookieCheckForOCSRequests(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2214,7 +2214,7 @@ class RequestTest extends \Test\TestCase {
 	 * @dataProvider invalidTokenDataProvider
 	 * @param string $invalidToken
 	 */
-	public function testPassesCSRFCheckWithInvalidToken($invalidToken) {
+	public function testPassesCSRFCheckWithInvalidToken($invalidToken): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2241,7 +2241,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithoutTokenFail() {
+	public function testPassesCSRFCheckWithoutTokenFail(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -2257,7 +2257,7 @@ class RequestTest extends \Test\TestCase {
 		$this->assertFalse($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithOCSAPIRequestHeader() {
+	public function testPassesCSRFCheckWithOCSAPIRequestHeader(): void {
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php
index d01d29e7071..28614b14b40 100644
--- a/tests/lib/AppFramework/Http/ResponseTest.php
+++ b/tests/lib/AppFramework/Http/ResponseTest.php
@@ -24,14 +24,14 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testAddHeader() {
+	public function testAddHeader(): void {
 		$this->childResponse->addHeader(' hello ', 'world');
 		$headers = $this->childResponse->getHeaders();
 		$this->assertEquals('world', $headers['hello']);
 	}
 
 
-	public function testSetHeaders() {
+	public function testSetHeaders(): void {
 		$expected = [
 			'Last-Modified' => 1,
 			'ETag' => 3,
@@ -50,7 +50,7 @@ class ResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $headers);
 	}
 
-	public function testOverwriteCsp() {
+	public function testOverwriteCsp(): void {
 		$expected = [
 			'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self' 'unsafe-inline';style-src 'self' 'unsafe-inline';img-src 'self';font-src 'self' data:;connect-src 'self';media-src 'self'",
 		];
@@ -62,31 +62,31 @@ class ResponseTest extends \Test\TestCase {
 		$this->assertEquals(array_merge($expected, $headers), $headers);
 	}
 
-	public function testGetCsp() {
+	public function testGetCsp(): void {
 		$policy = new Http\ContentSecurityPolicy();
 
 		$this->childResponse->setContentSecurityPolicy($policy);
 		$this->assertEquals($policy, $this->childResponse->getContentSecurityPolicy());
 	}
 
-	public function testGetCspEmpty() {
+	public function testGetCspEmpty(): void {
 		$this->assertEquals(new Http\EmptyContentSecurityPolicy(), $this->childResponse->getContentSecurityPolicy());
 	}
 
-	public function testAddHeaderValueNullDeletesIt() {
+	public function testAddHeaderValueNullDeletesIt(): void {
 		$this->childResponse->addHeader('hello', 'world');
 		$this->childResponse->addHeader('hello', null);
 		$this->assertEquals(5, count($this->childResponse->getHeaders()));
 	}
 
 
-	public function testCacheHeadersAreDisabledByDefault() {
+	public function testCacheHeadersAreDisabledByDefault(): void {
 		$headers = $this->childResponse->getHeaders();
 		$this->assertEquals('no-cache, no-store, must-revalidate', $headers['Cache-Control']);
 	}
 
 
-	public function testAddCookie() {
+	public function testAddCookie(): void {
 		$this->childResponse->addCookie('foo', 'bar');
 		$this->childResponse->addCookie('bar', 'foo', new \DateTime('1970-01-01'));
 
@@ -106,7 +106,7 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetCookies() {
+	public function testSetCookies(): void {
 		$expected = [
 			'foo' => [
 				'value' => 'bar',
@@ -125,7 +125,7 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testInvalidateCookie() {
+	public function testInvalidateCookie(): void {
 		$this->childResponse->addCookie('foo', 'bar');
 		$this->childResponse->invalidateCookie('foo');
 		$expected = [
@@ -142,7 +142,7 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testInvalidateCookies() {
+	public function testInvalidateCookies(): void {
 		$this->childResponse->addCookie('foo', 'bar');
 		$this->childResponse->addCookie('bar', 'foo');
 		$expected = [
@@ -179,12 +179,12 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testRenderReturnNullByDefault() {
+	public function testRenderReturnNullByDefault(): void {
 		$this->assertEquals(null, $this->childResponse->render());
 	}
 
 
-	public function testGetStatus() {
+	public function testGetStatus(): void {
 		$default = $this->childResponse->getStatus();
 
 		$this->childResponse->setStatus(Http::STATUS_NOT_FOUND);
@@ -194,13 +194,13 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testGetEtag() {
+	public function testGetEtag(): void {
 		$this->childResponse->setEtag('hi');
 		$this->assertSame('hi', $this->childResponse->getEtag());
 	}
 
 
-	public function testGetLastModified() {
+	public function testGetLastModified(): void {
 		$lastModified = new \DateTime('now', new \DateTimeZone('GMT'));
 		$lastModified->setTimestamp(1);
 		$this->childResponse->setLastModified($lastModified);
@@ -209,7 +209,7 @@ class ResponseTest extends \Test\TestCase {
 
 
 
-	public function testCacheSecondsZero() {
+	public function testCacheSecondsZero(): void {
 		$this->childResponse->cacheFor(0);
 
 		$headers = $this->childResponse->getHeaders();
@@ -218,7 +218,7 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testCacheSeconds() {
+	public function testCacheSeconds(): void {
 		$time = $this->createMock(ITimeFactory::class);
 		$time->method('getTime')
 			->willReturn(1234567);
@@ -234,7 +234,7 @@ class ResponseTest extends \Test\TestCase {
 
 
 
-	public function testEtagLastModifiedHeaders() {
+	public function testEtagLastModifiedHeaders(): void {
 		$lastModified = new \DateTime('now', new \DateTimeZone('GMT'));
 		$lastModified->setTimestamp(1);
 		$this->childResponse->setLastModified($lastModified);
@@ -242,7 +242,7 @@ class ResponseTest extends \Test\TestCase {
 		$this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
 	}
 
-	public function testChainability() {
+	public function testChainability(): void {
 		$lastModified = new \DateTime('now', new \DateTimeZone('GMT'));
 		$lastModified->setTimestamp(1);
 
@@ -262,13 +262,13 @@ class ResponseTest extends \Test\TestCase {
 			$headers['Cache-Control']);
 	}
 
-	public function testThrottle() {
+	public function testThrottle(): void {
 		$this->assertFalse($this->childResponse->isThrottled());
 		$this->childResponse->throttle();
 		$this->assertTrue($this->childResponse->isThrottled());
 	}
 
-	public function testGetThrottleMetadata() {
+	public function testGetThrottleMetadata(): void {
 		$this->childResponse->throttle(['foo' => 'bar']);
 		$this->assertSame(['foo' => 'bar'], $this->childResponse->getThrottleMetadata());
 	}
diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php
index 637fb025142..87f6097a07a 100644
--- a/tests/lib/AppFramework/Http/StreamResponseTest.php
+++ b/tests/lib/AppFramework/Http/StreamResponseTest.php
@@ -23,7 +23,7 @@ class StreamResponseTest extends \Test\TestCase {
 			->getMock();
 	}
 
-	public function testOutputNotModified() {
+	public function testOutputNotModified(): void {
 		$path = __FILE__;
 		$this->output->expects($this->once())
 			->method('getHttpResponseCode')
@@ -35,7 +35,7 @@ class StreamResponseTest extends \Test\TestCase {
 		$response->callback($this->output);
 	}
 
-	public function testOutputOk() {
+	public function testOutputOk(): void {
 		$path = __FILE__;
 		$this->output->expects($this->once())
 			->method('getHttpResponseCode')
@@ -49,7 +49,7 @@ class StreamResponseTest extends \Test\TestCase {
 		$response->callback($this->output);
 	}
 
-	public function testOutputNotFound() {
+	public function testOutputNotFound(): void {
 		$path = __FILE__ . 'test';
 		$this->output->expects($this->once())
 			->method('getHttpResponseCode')
@@ -64,7 +64,7 @@ class StreamResponseTest extends \Test\TestCase {
 		$response->callback($this->output);
 	}
 
-	public function testOutputReadFileError() {
+	public function testOutputReadFileError(): void {
 		$path = __FILE__;
 		$this->output->expects($this->once())
 			->method('getHttpResponseCode')
diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php
index df9824d3032..ad0fe808b76 100644
--- a/tests/lib/AppFramework/Http/TemplateResponseTest.php
+++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php
@@ -24,7 +24,7 @@ class TemplateResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetParamsConstructor() {
+	public function testSetParamsConstructor(): void {
 		$params = ['hi' => 'yo'];
 		$this->tpl = new TemplateResponse('app', 'home', $params);
 
@@ -32,7 +32,7 @@ class TemplateResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetRenderAsConstructor() {
+	public function testSetRenderAsConstructor(): void {
 		$renderAs = 'myrender';
 		$this->tpl = new TemplateResponse('app', 'home', [], $renderAs);
 
@@ -40,7 +40,7 @@ class TemplateResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetParams() {
+	public function testSetParams(): void {
 		$params = ['hi' => 'yo'];
 		$this->tpl->setParams($params);
 
@@ -48,17 +48,17 @@ class TemplateResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testGetTemplateName() {
+	public function testGetTemplateName(): void {
 		$this->assertEquals('home', $this->tpl->getTemplateName());
 	}
 
-	public function testGetRenderAs() {
+	public function testGetRenderAs(): void {
 		$render = 'myrender';
 		$this->tpl->renderAs($render);
 		$this->assertEquals($render, $this->tpl->getRenderAs());
 	}
 
-	public function testChainability() {
+	public function testChainability(): void {
 		$params = ['hi' => 'yo'];
 		$this->tpl->setParams($params)
 			->setStatus(Http::STATUS_NOT_FOUND);
diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
index 890735008fc..22b1b13aaee 100644
--- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
@@ -44,7 +44,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 		$this->controller = $this->createMock(Controller::class);
 	}
 
-	public function testNoTemplateResponse() {
+	public function testNoTemplateResponse(): void {
 		$this->userSession->expects($this->never())
 			->method($this->anything());
 		$this->dispatcher->expects($this->never())
@@ -53,7 +53,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 		$this->middleWare->afterController($this->controller, 'myMethod', $this->createMock(Response::class));
 	}
 
-	public function testPublicShareController() {
+	public function testPublicShareController(): void {
 		$this->userSession->expects($this->never())
 			->method($this->anything());
 		$this->dispatcher->expects($this->never())
@@ -62,7 +62,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 		$this->middleWare->afterController($this->createMock(PublicShareController::class), 'myMethod', $this->createMock(Response::class));
 	}
 
-	public function testStandaloneTemplateResponse() {
+	public function testStandaloneTemplateResponse(): void {
 		$this->userSession->expects($this->never())
 			->method($this->anything());
 		$this->dispatcher->expects($this->once())
@@ -78,7 +78,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 		$this->middleWare->afterController($this->controller, 'myMethod', $this->createMock(StandaloneTemplateResponse::class));
 	}
 
-	public function testTemplateResponseNotLoggedIn() {
+	public function testTemplateResponseNotLoggedIn(): void {
 		$this->userSession->method('isLoggedIn')
 			->willReturn(false);
 		$this->dispatcher->expects($this->once())
@@ -94,7 +94,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 		$this->middleWare->afterController($this->controller, 'myMethod', $this->createMock(TemplateResponse::class));
 	}
 
-	public function testTemplateResponseLoggedIn() {
+	public function testTemplateResponseLoggedIn(): void {
 		$events = [];
 
 		$this->userSession->method('isLoggedIn')
diff --git a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php
index a0848b70796..010ce3fff6d 100644
--- a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php
@@ -36,7 +36,7 @@ class CompressionMiddlewareTest extends \Test\TestCase {
 		$this->controller = $this->createMock(Controller::class);
 	}
 
-	public function testGzipOCSV1() {
+	public function testGzipOCSV1(): void {
 		$this->request->method('getHeader')
 			->with('Accept-Encoding')
 			->willReturn('gzip');
@@ -58,7 +58,7 @@ class CompressionMiddlewareTest extends \Test\TestCase {
 		$this->assertSame($output, gzdecode($result));
 	}
 
-	public function testGzipOCSV2() {
+	public function testGzipOCSV2(): void {
 		$this->request->method('getHeader')
 			->with('Accept-Encoding')
 			->willReturn('gzip');
@@ -80,7 +80,7 @@ class CompressionMiddlewareTest extends \Test\TestCase {
 		$this->assertSame($output, gzdecode($result));
 	}
 
-	public function testGzipJSONResponse() {
+	public function testGzipJSONResponse(): void {
 		$this->request->method('getHeader')
 			->with('Accept-Encoding')
 			->willReturn('gzip');
@@ -102,7 +102,7 @@ class CompressionMiddlewareTest extends \Test\TestCase {
 		$this->assertSame($output, gzdecode($result));
 	}
 
-	public function testNoGzipDataResponse() {
+	public function testNoGzipDataResponse(): void {
 		$this->request->method('getHeader')
 			->with('Accept-Encoding')
 			->willReturn('gzip');
@@ -122,7 +122,7 @@ class CompressionMiddlewareTest extends \Test\TestCase {
 		$this->assertSame($output, $result);
 	}
 
-	public function testNoGzipNo200() {
+	public function testNoGzipNo200(): void {
 		$this->request->method('getHeader')
 			->with('Accept-Encoding')
 			->willReturn('gzip');
diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
index cddec9bf256..fae5f5d9f1c 100644
--- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
@@ -129,7 +129,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterExceptionShouldReturnResponseOfMiddleware() {
+	public function testAfterExceptionShouldReturnResponseOfMiddleware(): void {
 		$response = new Response();
 		$m1 = $this->getMockBuilder('\OCP\AppFramework\Middleware')
 			->setMethods(['afterException', 'beforeController'])
@@ -152,7 +152,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterExceptionShouldThrowAgainWhenNotHandled() {
+	public function testAfterExceptionShouldThrowAgainWhenNotHandled(): void {
 		$m1 = new TestMiddleware(false);
 		$m2 = new TestMiddleware(true);
 
@@ -165,7 +165,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeControllerCorrectArguments() {
+	public function testBeforeControllerCorrectArguments(): void {
 		$m1 = $this->getMiddleware();
 		$this->dispatcher->beforeController($this->controller, $this->method);
 
@@ -174,7 +174,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterControllerCorrectArguments() {
+	public function testAfterControllerCorrectArguments(): void {
 		$m1 = $this->getMiddleware();
 
 		$this->dispatcher->afterController($this->controller, $this->method, $this->response);
@@ -185,7 +185,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterExceptionCorrectArguments() {
+	public function testAfterExceptionCorrectArguments(): void {
 		$m1 = $this->getMiddleware();
 
 		$this->expectException(\Exception::class);
@@ -199,7 +199,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeOutputCorrectArguments() {
+	public function testBeforeOutputCorrectArguments(): void {
 		$m1 = $this->getMiddleware();
 
 		$this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
@@ -210,7 +210,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeControllerOrder() {
+	public function testBeforeControllerOrder(): void {
 		$m1 = $this->getMiddleware();
 		$m2 = $this->getMiddleware();
 
@@ -220,7 +220,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 		$this->assertEquals(2, $m2->beforeControllerOrder);
 	}
 
-	public function testAfterControllerOrder() {
+	public function testAfterControllerOrder(): void {
 		$m1 = $this->getMiddleware();
 		$m2 = $this->getMiddleware();
 
@@ -231,7 +231,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterExceptionOrder() {
+	public function testAfterExceptionOrder(): void {
 		$m1 = $this->getMiddleware();
 		$m2 = $this->getMiddleware();
 
@@ -244,7 +244,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testBeforeOutputOrder() {
+	public function testBeforeOutputOrder(): void {
 		$m1 = $this->getMiddleware();
 		$m2 = $this->getMiddleware();
 
@@ -255,7 +255,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares() {
+	public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(): void {
 		$m1 = $this->getMiddleware();
 		$m2 = $this->getMiddleware(true);
 		$m3 = $this->createMock(Middleware::class);
diff --git a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
index e41bb45e069..58ae6b13aed 100644
--- a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
@@ -56,7 +56,7 @@ class NotModifiedMiddlewareTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataModified
 	 */
-	public function testMiddleware(?string $etag, string $etagHeader, ?\DateTime $lastModified, string $lastModifiedHeader, bool $notModifiedSet) {
+	public function testMiddleware(?string $etag, string $etagHeader, ?\DateTime $lastModified, string $lastModifiedHeader, bool $notModifiedSet): void {
 		$this->request->method('getHeader')
 			->willReturnCallback(function (string $name) use ($etagHeader, $lastModifiedHeader) {
 				if ($name === 'IF_NONE_MATCH') {
diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php
index 28b2ba34fca..6724f841c5e 100644
--- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php
@@ -74,7 +74,7 @@ class OCSMiddlewareTest extends \Test\TestCase {
 	 * @param string $message
 	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv1($controller, $exception, $forward, $message = '', $code = 0) {
+	public function testAfterExceptionOCSv1($controller, $exception, $forward, $message = '', $code = 0): void {
 		$this->request
 			->method('getScriptName')
 			->willReturn('/ocs/v1.php');
@@ -110,7 +110,7 @@ class OCSMiddlewareTest extends \Test\TestCase {
 	 * @param string $message
 	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv2($controller, $exception, $forward, $message = '', $code = 0) {
+	public function testAfterExceptionOCSv2($controller, $exception, $forward, $message = '', $code = 0): void {
 		$this->request
 			->method('getScriptName')
 			->willReturn('/ocs/v2.php');
@@ -144,7 +144,7 @@ class OCSMiddlewareTest extends \Test\TestCase {
 	 * @param string $message
 	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv2SubFolder($controller, $exception, $forward, $message = '', $code = 0) {
+	public function testAfterExceptionOCSv2SubFolder($controller, $exception, $forward, $message = '', $code = 0): void {
 		$this->request
 			->method('getScriptName')
 			->willReturn('/mysubfolder/ocs/v2.php');
@@ -201,7 +201,7 @@ class OCSMiddlewareTest extends \Test\TestCase {
 	 * @param bool $converted
 	 * @param int $convertedOCSStatus
 	 */
-	public function testAfterController($controller, $response, $converted, $convertedOCSStatus = 0) {
+	public function testAfterController($controller, $response, $converted, $convertedOCSStatus = 0): void {
 		$OCSMiddleware = new OCSMiddleware($this->request);
 		$newResponse = $OCSMiddleware->afterController($controller, 'foo', $response);
 
diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
index 64a9efbfe60..8433aa93f4a 100644
--- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
@@ -51,7 +51,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
-	public function testBeforeControllerNoPublicShareController() {
+	public function testBeforeControllerNoPublicShareController(): void {
 		$controller = $this->createMock(Controller::class);
 
 		$this->middleware->beforeController($controller, 'method');
@@ -69,7 +69,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataShareApi
 	 */
-	public function testBeforeControllerShareApiDisabled(string $shareApi, string $shareLinks) {
+	public function testBeforeControllerShareApiDisabled(string $shareApi, string $shareLinks): void {
 		$controller = $this->createMock(PublicShareController::class);
 
 		$this->config->method('getAppValue')
@@ -82,7 +82,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($controller, 'mehod');
 	}
 
-	public function testBeforeControllerNoTokenParam() {
+	public function testBeforeControllerNoTokenParam(): void {
 		$controller = $this->createMock(PublicShareController::class);
 
 		$this->config->method('getAppValue')
@@ -95,7 +95,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($controller, 'mehod');
 	}
 
-	public function testBeforeControllerInvalidToken() {
+	public function testBeforeControllerInvalidToken(): void {
 		$controller = $this->createMock(PublicShareController::class);
 
 		$this->config->method('getAppValue')
@@ -117,7 +117,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($controller, 'mehod');
 	}
 
-	public function testBeforeControllerValidTokenNotAuthenticated() {
+	public function testBeforeControllerValidTokenNotAuthenticated(): void {
 		$controller = $this->getMockBuilder(PublicShareController::class)
 			->setConstructorArgs(['app', $this->request, $this->session])
 			->getMock();
@@ -142,7 +142,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($controller, 'mehod');
 	}
 
-	public function testBeforeControllerValidTokenAuthenticateMethod() {
+	public function testBeforeControllerValidTokenAuthenticateMethod(): void {
 		$controller = $this->getMockBuilder(PublicShareController::class)
 			->setConstructorArgs(['app', $this->request, $this->session])
 			->getMock();
@@ -167,7 +167,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function testBeforeControllerValidTokenShowAuthenticateMethod() {
+	public function testBeforeControllerValidTokenShowAuthenticateMethod(): void {
 		$controller = $this->getMockBuilder(PublicShareController::class)
 			->setConstructorArgs(['app', $this->request, $this->session])
 			->getMock();
@@ -192,7 +192,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function testBeforeControllerAuthPublicShareController() {
+	public function testBeforeControllerAuthPublicShareController(): void {
 		$controller = $this->getMockBuilder(AuthPublicShareController::class)
 			->setConstructorArgs(['app', $this->request, $this->session, $this->createMock(IURLGenerator::class)])
 			->getMock();
@@ -221,7 +221,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($controller, 'method');
 	}
 
-	public function testAfterExceptionNoPublicShareController() {
+	public function testAfterExceptionNoPublicShareController(): void {
 		$controller = $this->createMock(Controller::class);
 		$exception = new \Exception();
 
@@ -232,7 +232,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		}
 	}
 
-	public function testAfterExceptionPublicShareControllerNotFoundException() {
+	public function testAfterExceptionPublicShareControllerNotFoundException(): void {
 		$controller = $this->createMock(PublicShareController::class);
 		$exception = new NotFoundException();
 
@@ -241,7 +241,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($result->getStatus(), Http::STATUS_NOT_FOUND);
 	}
 
-	public function testAfterExceptionPublicShareController() {
+	public function testAfterExceptionPublicShareController(): void {
 		$controller = $this->createMock(PublicShareController::class);
 		$exception = new \Exception();
 
@@ -252,7 +252,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		}
 	}
 
-	public function testAfterExceptionAuthPublicShareController() {
+	public function testAfterExceptionAuthPublicShareController(): void {
 		$controller = $this->getMockBuilder(AuthPublicShareController::class)
 			->setConstructorArgs([
 				'app',
diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
index 00538dda4b0..b703b10c554 100644
--- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
@@ -308,7 +308,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->beforeController($this->controller, $method);
 	}
 
-	public function testAfterExceptionWithSecurityExceptionNoStatus() {
+	public function testAfterExceptionWithSecurityExceptionNoStatus(): void {
 		$request = new Request(
 			['server' => [
 				'PHP_AUTH_USER' => 'user',
@@ -324,7 +324,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response);
 	}
 
-	public function testAfterExceptionWithSecurityExceptionWithStatus() {
+	public function testAfterExceptionWithSecurityExceptionWithStatus(): void {
 		$request = new Request(
 			['server' => [
 				'PHP_AUTH_USER' => 'user',
@@ -340,7 +340,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response);
 	}
 
-	public function testAfterExceptionWithRegularException() {
+	public function testAfterExceptionWithRegularException(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('A regular exception');
 
diff --git a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php
index dd6ee9531b2..b0b41b27cb9 100644
--- a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php
@@ -39,7 +39,7 @@ class CSPMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
-	public function testAfterController() {
+	public function testAfterController(): void {
 		$this->cspNonceManager
 			->expects($this->once())
 			->method('browserSupportsCspV3')
@@ -71,7 +71,7 @@ class CSPMiddlewareTest extends \Test\TestCase {
 		$this->middleware->afterController($this->controller, 'test', $response);
 	}
 
-	public function testAfterControllerEmptyCSP() {
+	public function testAfterControllerEmptyCSP(): void {
 		$response = $this->createMock(Response::class);
 		$emptyPolicy = new EmptyContentSecurityPolicy();
 		$response->expects($this->any())
@@ -83,7 +83,7 @@ class CSPMiddlewareTest extends \Test\TestCase {
 		$this->middleware->afterController($this->controller, 'test', $response);
 	}
 
-	public function testAfterControllerWithContentSecurityPolicy3Support() {
+	public function testAfterControllerWithContentSecurityPolicy3Support(): void {
 		$this->cspNonceManager
 			->expects($this->once())
 			->method('browserSupportsCspV3')
diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
index 1cdd99b1aae..55a70d4c040 100644
--- a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
@@ -34,7 +34,7 @@ class FeaturePolicyMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
-	public function testAfterController() {
+	public function testAfterController(): void {
 		$response = $this->createMock(Response::class);
 		$defaultPolicy = new FeaturePolicy();
 		$defaultPolicy->addAllowedCameraDomain('defaultpolicy');
@@ -56,7 +56,7 @@ class FeaturePolicyMiddlewareTest extends \Test\TestCase {
 		$this->middleware->afterController($this->controller, 'test', $response);
 	}
 
-	public function testAfterControllerEmptyCSP() {
+	public function testAfterControllerEmptyCSP(): void {
 		$response = $this->createMock(Response::class);
 		$emptyPolicy = new EmptyFeaturePolicy();
 		$response->method('getFeaturePolicy')
diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
index a9f3258e8d3..148335d270f 100644
--- a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
@@ -61,7 +61,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		);
 	}
 
-	public function testNoAnnotationNorAttribute() {
+	public function testNoAnnotationNorAttribute(): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 		$this->session->expects($this->never())
 			->method($this->anything());
@@ -71,7 +71,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, __FUNCTION__);
 	}
 
-	public function testDifferentAnnotation() {
+	public function testDifferentAnnotation(): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 		$this->session->expects($this->never())
 			->method($this->anything());
@@ -84,7 +84,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 	/**
 	 * @dataProvider dataProvider
 	 */
-	public function testAnnotation($backend, $lastConfirm, $currentTime, $exception) {
+	public function testAnnotation($backend, $lastConfirm, $currentTime, $exception): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 
 		$this->user->method('getBackendClassName')
@@ -119,7 +119,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 	/**
 	 * @dataProvider dataProvider
 	 */
-	public function testAttribute($backend, $lastConfirm, $currentTime, $exception) {
+	public function testAttribute($backend, $lastConfirm, $currentTime, $exception): void {
 		$this->reflector->reflect($this->controller, __FUNCTION__);
 
 		$this->user->method('getBackendClassName')
@@ -164,7 +164,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 		];
 	}
 
-	public function testSSO() {
+	public function testSSO(): void {
 		static $sessionId = 'mySession1d';
 
 		$this->reflector->reflect($this->controller, __FUNCTION__);
diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
index b4d7ee10f7c..0ca4a455cba 100644
--- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
@@ -33,7 +33,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		$this->middleware = new SameSiteCookieMiddleware($this->request, $this->reflector);
 	}
 
-	public function testBeforeControllerNoIndex() {
+	public function testBeforeControllerNoIndex(): void {
 		$this->request->method('getScriptName')
 			->willReturn('/ocs/v2.php');
 
@@ -41,7 +41,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testBeforeControllerIndexHasAnnotation() {
+	public function testBeforeControllerIndexHasAnnotation(): void {
 		$this->request->method('getScriptName')
 			->willReturn('/index.php');
 
@@ -53,7 +53,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testBeforeControllerIndexNoAnnotationPassingCheck() {
+	public function testBeforeControllerIndexNoAnnotationPassingCheck(): void {
 		$this->request->method('getScriptName')
 			->willReturn('/index.php');
 
@@ -68,7 +68,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testBeforeControllerIndexNoAnnotationFailingCheck() {
+	public function testBeforeControllerIndexNoAnnotationFailingCheck(): void {
 		$this->expectException(LaxSameSiteCookieFailedException::class);
 
 		$this->request->method('getScriptName')
@@ -84,7 +84,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->createMock(Controller::class), 'foo');
 	}
 
-	public function testAfterExceptionNoLaxCookie() {
+	public function testAfterExceptionNoLaxCookie(): void {
 		$ex = new SecurityException();
 
 		try {
@@ -95,7 +95,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 		}
 	}
 
-	public function testAfterExceptionLaxCookie() {
+	public function testAfterExceptionLaxCookie(): void {
 		$ex = new LaxSameSiteCookieFailedException();
 
 		$this->request->method('getRequestUri')
diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
index b7af6984237..07e368fd1e6 100644
--- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@@ -347,7 +347,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataNoCSRFRequiredPublicPage
 	 */
-	public function testNoCsrfCheck(string $method) {
+	public function testNoCsrfCheck(string $method): void {
 		$this->request->expects($this->never())
 			->method('passesCSRFCheck')
 			->willReturn(false);
@@ -591,13 +591,13 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 	}
 
 
-	public function testAfterExceptionNotCaughtThrowsItAgain() {
+	public function testAfterExceptionNotCaughtThrowsItAgain(): void {
 		$ex = new \Exception();
 		$this->expectException(\Exception::class);
 		$this->middleware->afterException($this->controller, 'test', $ex);
 	}
 
-	public function testAfterExceptionReturnsRedirectForNotLoggedInUser() {
+	public function testAfterExceptionReturnsRedirectForNotLoggedInUser(): void {
 		$this->request = new Request(
 			[
 				'server' =>
@@ -632,7 +632,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response);
 	}
 
-	public function testAfterExceptionRedirectsToWebRootAfterStrictCookieFail() {
+	public function testAfterExceptionRedirectsToWebRootAfterStrictCookieFail(): void {
 		$this->request = new Request(
 			[
 				'server' => [
@@ -677,7 +677,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 	 * @dataProvider exceptionProvider
 	 * @param SecurityException $exception
 	 */
-	public function testAfterExceptionReturnsTemplateResponse(SecurityException $exception) {
+	public function testAfterExceptionReturnsTemplateResponse(SecurityException $exception): void {
 		$this->request = new Request(
 			[
 				'server' =>
@@ -703,7 +703,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response);
 	}
 
-	public function testAfterAjaxExceptionReturnsJSONError() {
+	public function testAfterAjaxExceptionReturnsJSONError(): void {
 		$response = $this->middleware->afterException($this->controller, 'test',
 			$this->secAjaxException);
 
diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php
index 00b586e6cc4..32b57e7bf21 100644
--- a/tests/lib/AppFramework/Routing/RoutingTest.php
+++ b/tests/lib/AppFramework/Routing/RoutingTest.php
@@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
 class RoutingTest extends \Test\TestCase {
-	public function testSimpleRoute() {
+	public function testSimpleRoute(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET']
 		]];
@@ -28,7 +28,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleRouteWithUnderScoreNames() {
+	public function testSimpleRouteWithUnderScoreNames(): void {
 		$routes = ['routes' => [
 			['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'root' => '']
 		]];
@@ -36,7 +36,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent', [], [], '', true);
 	}
 
-	public function testSimpleOCSRoute() {
+	public function testSimpleOCSRoute(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET']
 		]
@@ -45,7 +45,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleRouteWithMissingVerb() {
+	public function testSimpleRouteWithMissingVerb(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open']
 		]];
@@ -53,7 +53,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleOCSRouteWithMissingVerb() {
+	public function testSimpleOCSRouteWithMissingVerb(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open']
 		]
@@ -62,7 +62,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleRouteWithLowercaseVerb() {
+	public function testSimpleRouteWithLowercaseVerb(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
 		]];
@@ -70,7 +70,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleOCSRouteWithLowercaseVerb() {
+	public function testSimpleOCSRouteWithLowercaseVerb(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
 		]
@@ -79,7 +79,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
-	public function testSimpleRouteWithRequirements() {
+	public function testSimpleRouteWithRequirements(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'requirements' => ['something']]
 		]];
@@ -87,7 +87,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', ['something']);
 	}
 
-	public function testSimpleOCSRouteWithRequirements() {
+	public function testSimpleOCSRouteWithRequirements(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'requirements' => ['something']]
 		]
@@ -96,7 +96,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', ['something']);
 	}
 
-	public function testSimpleRouteWithDefaults() {
+	public function testSimpleRouteWithDefaults(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', [], 'defaults' => ['param' => 'foobar']]
 		]];
@@ -105,7 +105,7 @@ class RoutingTest extends \Test\TestCase {
 	}
 
 
-	public function testSimpleOCSRouteWithDefaults() {
+	public function testSimpleOCSRouteWithDefaults(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'defaults' => ['param' => 'foobar']]
 		]
@@ -114,7 +114,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], ['param' => 'foobar']);
 	}
 
-	public function testSimpleRouteWithPostfix() {
+	public function testSimpleRouteWithPostfix(): void {
 		$routes = ['routes' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'postfix' => '_something']
 		]];
@@ -122,7 +122,7 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something');
 	}
 
-	public function testSimpleOCSRouteWithPostfix() {
+	public function testSimpleOCSRouteWithPostfix(): void {
 		$routes = ['ocs' => [
 			['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'postfix' => '_something']
 		]
@@ -132,7 +132,7 @@ class RoutingTest extends \Test\TestCase {
 	}
 
 
-	public function testSimpleRouteWithBrokenName() {
+	public function testSimpleRouteWithBrokenName(): void {
 		$this->expectException(\UnexpectedValueException::class);
 
 		$routes = ['routes' => [
@@ -160,7 +160,7 @@ class RoutingTest extends \Test\TestCase {
 	}
 
 
-	public function testSimpleOCSRouteWithBrokenName() {
+	public function testSimpleOCSRouteWithBrokenName(): void {
 		$this->expectException(\UnexpectedValueException::class);
 
 		$routes = ['ocs' => [
@@ -187,7 +187,7 @@ class RoutingTest extends \Test\TestCase {
 		$config->register();
 	}
 
-	public function testSimpleOCSRouteWithUnderScoreNames() {
+	public function testSimpleOCSRouteWithUnderScoreNames(): void {
 		$routes = ['ocs' => [
 			['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
 		]];
@@ -195,31 +195,31 @@ class RoutingTest extends \Test\TestCase {
 		$this->assertSimpleOCSRoute($routes, 'admin_folders.open_current', 'DELETE', '/apps/app1/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent');
 	}
 
-	public function testOCSResource() {
+	public function testOCSResource(): void {
 		$routes = ['ocs-resources' => ['account' => ['url' => '/accounts']]];
 
 		$this->assertOCSResource($routes, 'account', '/apps/app1/accounts', 'AccountController', 'id');
 	}
 
-	public function testOCSResourceWithUnderScoreName() {
+	public function testOCSResourceWithUnderScoreName(): void {
 		$routes = ['ocs-resources' => ['admin_accounts' => ['url' => '/admin/accounts']]];
 
 		$this->assertOCSResource($routes, 'admin_accounts', '/apps/app1/admin/accounts', 'AdminAccountsController', 'id');
 	}
 
-	public function testOCSResourceWithRoot() {
+	public function testOCSResourceWithRoot(): void {
 		$routes = ['ocs-resources' => ['admin_accounts' => ['url' => '/admin/accounts', 'root' => '/core/endpoint']]];
 
 		$this->assertOCSResource($routes, 'admin_accounts', '/core/endpoint/admin/accounts', 'AdminAccountsController', 'id');
 	}
 
-	public function testResource() {
+	public function testResource(): void {
 		$routes = ['resources' => ['account' => ['url' => '/accounts']]];
 
 		$this->assertResource($routes, 'account', '/apps/app1/accounts', 'AccountController', 'id');
 	}
 
-	public function testResourceWithUnderScoreName() {
+	public function testResourceWithUnderScoreName(): void {
 		$routes = ['resources' => ['admin_accounts' => ['url' => '/admin/accounts']]];
 
 		$this->assertResource($routes, 'admin_accounts', '/apps/app1/admin/accounts', 'AdminAccountsController', 'id');
diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php
index e3a1f3a288e..e0748d89f7f 100644
--- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php
+++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php
@@ -56,7 +56,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	/**
 	 * @Annotation
 	 */
-	public function testReadAnnotation() {
+	public function testReadAnnotation(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -69,7 +69,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	/**
 	 * @Annotation(parameter=value)
 	 */
-	public function testGetAnnotationParameterSingle() {
+	public function testGetAnnotationParameterSingle(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			self::class,
@@ -82,7 +82,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	/**
 	 * @Annotation(parameter1=value1, parameter2=value2,parameter3=value3)
 	 */
-	public function testGetAnnotationParameterMultiple() {
+	public function testGetAnnotationParameterMultiple(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			self::class,
@@ -98,7 +98,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	 * @Annotation
 	 * @param test
 	 */
-	public function testReadAnnotationNoLowercase() {
+	public function testReadAnnotationNoLowercase(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -114,7 +114,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	 * @Annotation
 	 * @param int $test
 	 */
-	public function testReadTypeIntAnnotations() {
+	public function testReadTypeIntAnnotations(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -135,7 +135,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	/**
 	 * @requires PHP 7
 	 */
-	public function testReadTypeIntAnnotationsScalarTypes() {
+	public function testReadTypeIntAnnotationsScalarTypes(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -153,7 +153,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	 * @Annotation
 	 * @param double $test something special
 	 */
-	public function testReadTypeDoubleAnnotations() {
+	public function testReadTypeDoubleAnnotations(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -167,7 +167,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	 * @Annotation
 	 * @param string $foo
 	 */
-	public function testReadTypeWhitespaceAnnotations() {
+	public function testReadTypeWhitespaceAnnotations(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -180,7 +180,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 
 	public function arguments($arg, $arg2 = 'hi') {
 	}
-	public function testReflectParameters() {
+	public function testReflectParameters(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -193,7 +193,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 
 	public function arguments2($arg) {
 	}
-	public function testReflectParameters2() {
+	public function testReflectParameters2(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect(
 			'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
@@ -204,7 +204,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	}
 
 
-	public function testInheritance() {
+	public function testInheritance(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect('Test\AppFramework\Utility\EndController', 'test');
 
@@ -212,7 +212,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	}
 
 
-	public function testInheritanceOverride() {
+	public function testInheritanceOverride(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect('Test\AppFramework\Utility\EndController', 'test2');
 
@@ -221,14 +221,14 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
 	}
 
 
-	public function testInheritanceOverrideNoDocblock() {
+	public function testInheritanceOverrideNoDocblock(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect('Test\AppFramework\Utility\EndController', 'test3');
 
 		$this->assertFalse($reader->hasAnnotation('Annotation'));
 	}
 
-	public function testRangeDetection() {
+	public function testRangeDetection(): void {
 		$reader = new ControllerMethodReflector();
 		$reader->reflect('Test\AppFramework\Utility\EndController', 'test4');
 
diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php
index d27d29db951..d3e9dec18e0 100644
--- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php
+++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php
@@ -67,7 +67,7 @@ class SimpleContainerTest extends \Test\TestCase {
 
 
 
-	public function testRegister() {
+	public function testRegister(): void {
 		$this->container->registerParameter('test', 'abc');
 		$this->assertEquals('abc', $this->container->query('test'));
 	}
@@ -76,7 +76,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	/**
 	 * Test querying a class that is not registered without autoload enabled
 	 */
-	public function testNothingRegistered() {
+	public function testNothingRegistered(): void {
 		try {
 			$this->container->query('something really hard', false);
 			$this->fail('Expected `QueryException` exception was not thrown');
@@ -90,7 +90,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	/**
 	 * Test querying a class that is not registered with autoload enabled
 	 */
-	public function testNothingRegistered_autoload() {
+	public function testNothingRegistered_autoload(): void {
 		try {
 			$this->container->query('something really hard');
 			$this->fail('Expected `QueryException` exception was not thrown');
@@ -102,26 +102,26 @@ class SimpleContainerTest extends \Test\TestCase {
 
 
 
-	public function testNotAClass() {
+	public function testNotAClass(): void {
 		$this->expectException(\OCP\AppFramework\QueryException::class);
 
 		$this->container->query('Test\AppFramework\Utility\TestInterface');
 	}
 
 
-	public function testNoConstructorClass() {
+	public function testNoConstructorClass(): void {
 		$object = $this->container->query('Test\AppFramework\Utility\ClassEmptyConstructor');
 		$this->assertTrue($object instanceof ClassEmptyConstructor);
 	}
 
 
-	public function testInstancesOnlyOnce() {
+	public function testInstancesOnlyOnce(): void {
 		$object = $this->container->query('Test\AppFramework\Utility\ClassEmptyConstructor');
 		$object2 = $this->container->query('Test\AppFramework\Utility\ClassEmptyConstructor');
 		$this->assertSame($object, $object2);
 	}
 
-	public function testConstructorSimple() {
+	public function testConstructorSimple(): void {
 		$this->container->registerParameter('test', 'abc');
 		$object = $this->container->query(
 			'Test\AppFramework\Utility\ClassSimpleConstructor'
@@ -131,7 +131,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	}
 
 
-	public function testConstructorComplex() {
+	public function testConstructorComplex(): void {
 		$this->container->registerParameter('test', 'abc');
 		$object = $this->container->query(
 			'Test\AppFramework\Utility\ClassComplexConstructor'
@@ -142,7 +142,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	}
 
 
-	public function testConstructorComplexInterface() {
+	public function testConstructorComplexInterface(): void {
 		$this->container->registerParameter('test', 'abc');
 		$this->container->registerService(
 			'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) {
@@ -157,7 +157,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	}
 
 
-	public function testOverrideService() {
+	public function testOverrideService(): void {
 		$this->container->registerService(
 			'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) {
 				return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor');
@@ -172,13 +172,13 @@ class SimpleContainerTest extends \Test\TestCase {
 		$this->assertTrue($object instanceof ClassEmptyConstructor);
 	}
 
-	public function testRegisterAliasParamter() {
+	public function testRegisterAliasParamter(): void {
 		$this->container->registerParameter('test', 'abc');
 		$this->container->registerAlias('test1', 'test');
 		$this->assertEquals('abc', $this->container->query('test1'));
 	}
 
-	public function testRegisterAliasService() {
+	public function testRegisterAliasService(): void {
 		$this->container->registerService('test', function () {
 			return new \StdClass;
 		}, true);
@@ -203,7 +203,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	/**
 	 * @dataProvider sanitizeNameProvider
 	 */
-	public function testSanitizeName($register, $query) {
+	public function testSanitizeName($register, $query): void {
 		$this->container->registerService($register, function () {
 			return 'abc';
 		});
@@ -211,7 +211,7 @@ class SimpleContainerTest extends \Test\TestCase {
 	}
 
 
-	public function testConstructorComplexNoTestParameterFound() {
+	public function testConstructorComplexNoTestParameterFound(): void {
 		$this->expectException(\OCP\AppFramework\QueryException::class);
 
 		$object = $this->container->query(
@@ -219,7 +219,7 @@ class SimpleContainerTest extends \Test\TestCase {
 		);
 	}
 
-	public function testRegisterFactory() {
+	public function testRegisterFactory(): void {
 		$this->container->registerService('test', function () {
 			return new \StdClass();
 		}, false);
@@ -227,7 +227,7 @@ class SimpleContainerTest extends \Test\TestCase {
 			$this->container->query('test'), $this->container->query('test'));
 	}
 
-	public function testRegisterAliasFactory() {
+	public function testRegisterAliasFactory(): void {
 		$this->container->registerService('test', function () {
 			return new \StdClass();
 		}, false);