refactor: Add void return type to PHPUnit test methods

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

11 files changed, 120 insertions, 120 deletions

diff --git a/tests/lib/DB/ConnectionFactoryTest.php b/tests/lib/DB/ConnectionFactoryTest.php
index d889021f2b4..23bde34a8fb 100644
--- a/tests/lib/DB/ConnectionFactoryTest.php
+++ b/tests/lib/DB/ConnectionFactoryTest.php
@@ -31,7 +31,7 @@ class ConnectionFactoryTest extends TestCase {
 	 * @param string $host
 	 * @param array $expected
 	 */
-	public function testSplitHostFromPortAndSocket($host, array $expected) {
+	public function testSplitHostFromPortAndSocket($host, array $expected): void {
 		/** @var SystemConfig $config */
 		$config = $this->createMock(SystemConfig::class);
 		$cacheFactory = $this->createMock(ICacheFactory::class);
diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php
index a088ca1baf0..531e0a3805a 100644
--- a/tests/lib/DB/MigrationsTest.php
+++ b/tests/lib/DB/MigrationsTest.php
@@ -55,14 +55,14 @@ class MigrationsTest extends \Test\TestCase {
 		$this->appManager = Server::get(IAppManager::class);
 	}
 
-	public function testGetters() {
+	public function testGetters(): void {
 		$this->assertEquals('testing', $this->migrationService->getApp());
 		$this->assertEquals(\OC::$SERVERROOT . '/apps/testing/lib/Migration', $this->migrationService->getMigrationsDirectory());
 		$this->assertEquals('OCA\Testing\Migration', $this->migrationService->getMigrationsNamespace());
 		$this->assertEquals('test_oc_migrations', $this->migrationService->getMigrationsTableName());
 	}
 
-	public function testCore() {
+	public function testCore(): void {
 		$this->migrationService = new MigrationService('core', $this->db);
 
 		$this->assertEquals('core', $this->migrationService->getApp());
@@ -72,7 +72,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testExecuteUnknownStep() {
+	public function testExecuteUnknownStep(): void {
 		$this->expectException(\InvalidArgumentException::class);
 		$this->expectExceptionMessage('Version 20170130180000 is unknown.');
 
@@ -80,7 +80,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testUnknownApp() {
+	public function testUnknownApp(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('App not found');
 
@@ -88,7 +88,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testExecuteStepWithUnknownClass() {
+	public function testExecuteStepWithUnknownClass(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Migration step \'X\' is unknown');
 
@@ -102,7 +102,7 @@ class MigrationsTest extends \Test\TestCase {
 		$this->migrationService->executeStep('20170130180000');
 	}
 
-	public function testExecuteStepWithSchemaChange() {
+	public function testExecuteStepWithSchemaChange(): void {
 		$schema = $this->createMock(Schema::class);
 		$this->db->expects($this->any())
 			->method('createSchema')
@@ -145,7 +145,7 @@ class MigrationsTest extends \Test\TestCase {
 		$this->migrationService->executeStep('20170130180000');
 	}
 
-	public function testExecuteStepWithoutSchemaChange() {
+	public function testExecuteStepWithoutSchemaChange(): void {
 		$schema = $this->createMock(Schema::class);
 		$this->db->expects($this->any())
 			->method('createSchema')
@@ -189,7 +189,7 @@ class MigrationsTest extends \Test\TestCase {
 	 * @param string $alias
 	 * @param string $expected
 	 */
-	public function testGetMigration($alias, $expected) {
+	public function testGetMigration($alias, $expected): void {
 		$this->migrationService = $this->getMockBuilder(MigrationService::class)
 			->setMethods(['getMigratedVersions', 'findMigrations'])
 			->setConstructorArgs(['testing', $this->db])
@@ -209,7 +209,7 @@ class MigrationsTest extends \Test\TestCase {
 		$this->assertEquals($expected, $migration);
 	}
 
-	public function testMigrate() {
+	public function testMigrate(): void {
 		$this->migrationService = $this->getMockBuilder(MigrationService::class)
 			->setMethods(['getMigratedVersions', 'findMigrations', 'executeStep'])
 			->setConstructorArgs(['testing', $this->db])
@@ -230,7 +230,7 @@ class MigrationsTest extends \Test\TestCase {
 		$this->migrationService->migrate();
 	}
 
-	public function testEnsureOracleConstraintsValid() {
+	public function testEnsureOracleConstraintsValid(): void {
 		$column = $this->createMock(Column::class);
 		$column->expects($this->once())
 			->method('getName')
@@ -293,7 +293,7 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleConstraints', [$sourceSchema, $schema, 3]);
 	}
 
-	public function testEnsureOracleConstraintsValidWithPrimaryKey() {
+	public function testEnsureOracleConstraintsValidWithPrimaryKey(): void {
 		$index = $this->createMock(Index::class);
 		$index->expects($this->any())
 			->method('getName')
@@ -336,7 +336,7 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleConstraints', [$sourceSchema, $schema, 3]);
 	}
 
-	public function testEnsureOracleConstraintsValidWithPrimaryKeyDefault() {
+	public function testEnsureOracleConstraintsValidWithPrimaryKeyDefault(): void {
 		$defaultName = 'PRIMARY';
 		if ($this->db->getDatabaseProvider() === IDBConnection::PLATFORM_POSTGRES) {
 			$defaultName = \str_repeat('a', 26) . '_' . \str_repeat('b', 30) . '_seq';
@@ -390,7 +390,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongTableName() {
+	public function testEnsureOracleConstraintsTooLongTableName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$table = $this->createMock(Table::class);
@@ -415,7 +415,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongPrimaryWithDefault() {
+	public function testEnsureOracleConstraintsTooLongPrimaryWithDefault(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$defaultName = 'PRIMARY';
@@ -468,7 +468,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongPrimaryWithName() {
+	public function testEnsureOracleConstraintsTooLongPrimaryWithName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$index = $this->createMock(Index::class);
@@ -511,7 +511,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongColumnName() {
+	public function testEnsureOracleConstraintsTooLongColumnName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$column = $this->createMock(Column::class);
@@ -545,7 +545,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongIndexName() {
+	public function testEnsureOracleConstraintsTooLongIndexName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$index = $this->createMock(Index::class);
@@ -582,7 +582,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongForeignKeyName() {
+	public function testEnsureOracleConstraintsTooLongForeignKeyName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$foreignKey = $this->createMock(ForeignKeyConstraint::class);
@@ -622,7 +622,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsNoPrimaryKey() {
+	public function testEnsureOracleConstraintsNoPrimaryKey(): void {
 		$this->markTestSkipped('Test disabled for now due to multiple reasons, see https://github.com/nextcloud/server/pull/31580#issuecomment-1069182234 for details.');
 		$this->expectException(\InvalidArgumentException::class);
 
@@ -663,7 +663,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsTooLongSequenceName() {
+	public function testEnsureOracleConstraintsTooLongSequenceName(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$sequence = $this->createMock(Sequence::class);
@@ -691,7 +691,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsBooleanNotNull() {
+	public function testEnsureOracleConstraintsBooleanNotNull(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$column = $this->createMock(Column::class);
@@ -731,7 +731,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testEnsureOracleConstraintsStringLength4000() {
+	public function testEnsureOracleConstraintsStringLength4000(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$column = $this->createMock(Column::class);
@@ -771,7 +771,7 @@ class MigrationsTest extends \Test\TestCase {
 	}
 
 
-	public function testExtractMigrationAttributes() {
+	public function testExtractMigrationAttributes(): void {
 		$metadataManager = Server::get(MetadataManager::class);
 		$this->appManager->loadApp('testing');
 
@@ -780,7 +780,7 @@ class MigrationsTest extends \Test\TestCase {
 		$this->appManager->disableApp('testing');
 	}
 
-	public function testDeserializeMigrationMetadata() {
+	public function testDeserializeMigrationMetadata(): void {
 		$metadataManager = Server::get(MetadataManager::class);
 		$this->assertEquals(
 			[
diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php
index 929dc9aaf1b..c6afe5a053a 100644
--- a/tests/lib/DB/MigratorTest.php
+++ b/tests/lib/DB/MigratorTest.php
@@ -126,7 +126,7 @@ class MigratorTest extends \Test\TestCase {
 		return $config;
 	}
 
-	public function testUpgrade() {
+	public function testUpgrade(): void {
 		[$startSchema, $endSchema] = $this->getDuplicateKeySchemas();
 		$migrator = $this->getMigrator();
 		$migrator->migrate($startSchema);
@@ -139,7 +139,7 @@ class MigratorTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testUpgradeDifferentPrefix() {
+	public function testUpgradeDifferentPrefix(): void {
 		$oldTablePrefix = $this->config->getSystemValueString('dbtableprefix', 'oc_');
 
 		$this->config->setSystemValue('dbtableprefix', 'ownc_');
@@ -159,7 +159,7 @@ class MigratorTest extends \Test\TestCase {
 		$this->config->setSystemValue('dbtableprefix', $oldTablePrefix);
 	}
 
-	public function testInsertAfterUpgrade() {
+	public function testInsertAfterUpgrade(): void {
 		[$startSchema, $endSchema] = $this->getDuplicateKeySchemas();
 		$migrator = $this->getMigrator();
 		$migrator->migrate($startSchema);
@@ -176,7 +176,7 @@ class MigratorTest extends \Test\TestCase {
 		}
 	}
 
-	public function testAddingPrimaryKeyWithAutoIncrement() {
+	public function testAddingPrimaryKeyWithAutoIncrement(): void {
 		$startSchema = new Schema([], [], $this->getSchemaConfig());
 		$table = $startSchema->createTable($this->tableName);
 		$table->addColumn('id', 'integer');
@@ -196,7 +196,7 @@ class MigratorTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testReservedKeywords() {
+	public function testReservedKeywords(): void {
 		$startSchema = new Schema([], [], $this->getSchemaConfig());
 		$table = $startSchema->createTable($this->tableName);
 		$table->addColumn('id', 'integer', ['autoincrement' => true]);
@@ -220,7 +220,7 @@ class MigratorTest extends \Test\TestCase {
 	/**
 	 * Test for nextcloud/server#36803
 	 */
-	public function testColumnCommentsInUpdate() {
+	public function testColumnCommentsInUpdate(): void {
 		$startSchema = new Schema([], [], $this->getSchemaConfig());
 		$table = $startSchema->createTable($this->tableName);
 		$table->addColumn('id', 'integer', ['autoincrement' => true, 'comment' => 'foo']);
@@ -241,7 +241,7 @@ class MigratorTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testAddingForeignKey() {
+	public function testAddingForeignKey(): void {
 		$startSchema = new Schema([], [], $this->getSchemaConfig());
 		$table = $startSchema->createTable($this->tableName);
 		$table->addColumn('id', 'integer', ['autoincrement' => true]);
diff --git a/tests/lib/DB/OCPostgreSqlPlatformTest.php b/tests/lib/DB/OCPostgreSqlPlatformTest.php
index 200fcbf36b3..bea3adf29a4 100644
--- a/tests/lib/DB/OCPostgreSqlPlatformTest.php
+++ b/tests/lib/DB/OCPostgreSqlPlatformTest.php
@@ -23,7 +23,7 @@ use Doctrine\DBAL\Types\Types;
  * @package Test\DB
  */
 class OCPostgreSqlPlatformTest extends \Test\TestCase {
-	public function testAlterBigint() {
+	public function testAlterBigint(): void {
 		$platform = new PostgreSQLPlatform();
 		$sourceSchema = new Schema();
 		$targetSchema = new Schema();
diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
index 68dc4c1b712..ed6e328881b 100644
--- a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
+++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
@@ -52,7 +52,7 @@ class ExpressionBuilderDBTest extends TestCase {
 	 * @param string $param2
 	 * @param boolean $match
 	 */
-	public function testLike($param1, $param2, $match) {
+	public function testLike($param1, $param2, $match): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select(new Literal('1'))
@@ -89,7 +89,7 @@ class ExpressionBuilderDBTest extends TestCase {
 	 * @param string $param2
 	 * @param boolean $match
 	 */
-	public function testILike($param1, $param2, $match) {
+	public function testILike($param1, $param2, $match): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select(new Literal('1'))
@@ -141,7 +141,7 @@ class ExpressionBuilderDBTest extends TestCase {
 		self::assertEquals('myvalue', $entries[0]['configvalue']);
 	}
 
-	public function testDateTimeEquals() {
+	public function testDateTimeEquals(): void {
 		$dateTime = new \DateTime('2023-01-01');
 		$insert = $this->connection->getQueryBuilder();
 		$insert->insert('testing')
@@ -158,7 +158,7 @@ class ExpressionBuilderDBTest extends TestCase {
 		self::assertCount(1, $entries);
 	}
 
-	public function testDateTimeLess() {
+	public function testDateTimeLess(): void {
 		$dateTime = new \DateTime('2022-01-01');
 		$dateTimeCompare = new \DateTime('2022-01-02');
 		$insert = $this->connection->getQueryBuilder();
@@ -176,7 +176,7 @@ class ExpressionBuilderDBTest extends TestCase {
 		self::assertCount(1, $entries);
 	}
 
-	public function testDateTimeGreater() {
+	public function testDateTimeGreater(): void {
 		$dateTime = new \DateTime('2023-01-02');
 		$dateTimeCompare = new \DateTime('2023-01-01');
 		$insert = $this->connection->getQueryBuilder();
diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
index 4ac5cbc8292..c14c55e6d02 100644
--- a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
@@ -72,7 +72,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testComparison($comparison, $input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testComparison($comparison, $input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -99,7 +99,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testEquals($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testEquals($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -117,7 +117,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testNotEquals($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testNotEquals($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -135,7 +135,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testLowerThan($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testLowerThan($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -153,7 +153,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testLowerThanEquals($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testLowerThanEquals($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -171,7 +171,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testGreaterThan($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testGreaterThan($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -189,7 +189,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input2
 	 * @param bool $isInput2Literal
 	 */
-	public function testGreaterThanEquals($input1, $isInput1Literal, $input2, $isInput2Literal) {
+	public function testGreaterThanEquals($input1, $isInput1Literal, $input2, $isInput2Literal): void {
 		[$doctrineInput1, $ocInput1] = $this->helpWithLiteral($input1, $isInput1Literal);
 		[$doctrineInput2, $ocInput2] = $this->helpWithLiteral($input2, $isInput2Literal);
 
@@ -199,14 +199,14 @@ class ExpressionBuilderTest extends TestCase {
 		);
 	}
 
-	public function testIsNull() {
+	public function testIsNull(): void {
 		$this->assertEquals(
 			$this->doctrineExpressionBuilder->isNull('`test`'),
 			$this->expressionBuilder->isNull('test')
 		);
 	}
 
-	public function testIsNotNull() {
+	public function testIsNotNull(): void {
 		$this->assertEquals(
 			$this->doctrineExpressionBuilder->isNotNull('`test`'),
 			$this->expressionBuilder->isNotNull('test')
@@ -226,7 +226,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input
 	 * @param bool $isLiteral
 	 */
-	public function testLike($input, $isLiteral) {
+	public function testLike($input, $isLiteral): void {
 		[$doctrineInput, $ocInput] = $this->helpWithLiteral($input, $isLiteral);
 
 		$this->assertEquals(
@@ -241,7 +241,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input
 	 * @param bool $isLiteral
 	 */
-	public function testNotLike($input, $isLiteral) {
+	public function testNotLike($input, $isLiteral): void {
 		[$doctrineInput, $ocInput] = $this->helpWithLiteral($input, $isLiteral);
 
 		$this->assertEquals(
@@ -265,7 +265,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input
 	 * @param bool $isLiteral
 	 */
-	public function testIn($input, $isLiteral) {
+	public function testIn($input, $isLiteral): void {
 		[$doctrineInput, $ocInput] = $this->helpWithLiteral($input, $isLiteral);
 
 		$this->assertEquals(
@@ -280,7 +280,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input
 	 * @param bool $isLiteral
 	 */
-	public function testNotIn($input, $isLiteral) {
+	public function testNotIn($input, $isLiteral): void {
 		[$doctrineInput, $ocInput] = $this->helpWithLiteral($input, $isLiteral);
 
 		$this->assertEquals(
@@ -334,7 +334,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param mixed $input
 	 * @param string|null $type
 	 */
-	public function testLiteral($input, $type) {
+	public function testLiteral($input, $type): void {
 		/** @var \OC\DB\QueryBuilder\Literal $actual */
 		$actual = $this->expressionBuilder->literal($input, $type);
 
@@ -380,7 +380,7 @@ class ExpressionBuilderTest extends TestCase {
 	 * @param bool $compareKeyToValue
 	 * @param int $expected
 	 */
-	public function testClobComparisons($function, $value, $type, $compareKeyToValue, $expected) {
+	public function testClobComparisons($function, $value, $type, $compareKeyToValue, $expected): void {
 		$appId = $this->getUniqueID('testing');
 		$this->createConfig($appId, 1, 4);
 		$this->createConfig($appId, 2, 5);
diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
index 4f7cc4dd39f..f3007ace85c 100644
--- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
@@ -30,7 +30,7 @@ class FunctionBuilderTest extends TestCase {
 	/**
 	 * @dataProvider providerTestConcatString
 	 */
-	public function testConcatString($closure) {
+	public function testConcatString($closure): void {
 		$query = $this->connection->getQueryBuilder();
 		[$real, $arguments, $return] = $closure($query);
 		if ($real) {
@@ -232,7 +232,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEqualsCanonicalizing([1,2,3], $actual);
 	}
 
-	public function testMd5() {
+	public function testMd5(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->md5($query->createNamedParameter('foobar')));
@@ -245,7 +245,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(md5('foobar'), $column);
 	}
 
-	public function testSubstring() {
+	public function testSubstring(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2), $query->createNamedParameter(2)));
@@ -258,7 +258,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals('oo', $column);
 	}
 
-	public function testSubstringNoLength() {
+	public function testSubstringNoLength(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2)));
@@ -271,7 +271,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals('oobar', $column);
 	}
 
-	public function testLower() {
+	public function testLower(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->lower($query->createNamedParameter('FooBar')));
@@ -284,7 +284,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals('foobar', $column);
 	}
 
-	public function testAdd() {
+	public function testAdd(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->add($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
@@ -297,7 +297,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(3, $column);
 	}
 
-	public function testSubtract() {
+	public function testSubtract(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->subtract($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
@@ -310,7 +310,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(1, $column);
 	}
 
-	public function testCount() {
+	public function testCount(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->count('appid'));
@@ -335,7 +335,7 @@ class FunctionBuilderTest extends TestCase {
 	/**
 	 * @dataProvider octetLengthProvider
 	 */
-	public function testOctetLength(string $str, int $bytes) {
+	public function testOctetLength(string $str, int $bytes): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->octetLength($query->createNamedParameter($str, IQueryBuilder::PARAM_STR)));
@@ -360,7 +360,7 @@ class FunctionBuilderTest extends TestCase {
 	/**
 	 * @dataProvider charLengthProvider
 	 */
-	public function testCharLength(string $str, int $bytes) {
+	public function testCharLength(string $str, int $bytes): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->charLength($query->createNamedParameter($str, IQueryBuilder::PARAM_STR)));
@@ -393,7 +393,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->execute();
 	}
 
-	public function testMaxEmpty() {
+	public function testMaxEmpty(): void {
 		$this->clearMinMax();
 
 		$query = $this->connection->getQueryBuilder();
@@ -409,7 +409,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(null, $row);
 	}
 
-	public function testMinEmpty() {
+	public function testMinEmpty(): void {
 		$this->clearMinMax();
 
 		$query = $this->connection->getQueryBuilder();
@@ -425,7 +425,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(null, $row);
 	}
 
-	public function testMax() {
+	public function testMax(): void {
 		$this->clearMinMax();
 		$this->setUpMinMax(10);
 		$this->setUpMinMax(11);
@@ -444,7 +444,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(20, $row);
 	}
 
-	public function testMin() {
+	public function testMin(): void {
 		$this->clearMinMax();
 		$this->setUpMinMax(10);
 		$this->setUpMinMax(11);
@@ -463,7 +463,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(10, $row);
 	}
 
-	public function testGreatest() {
+	public function testGreatest(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->greatest($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
@@ -476,7 +476,7 @@ class FunctionBuilderTest extends TestCase {
 		$this->assertEquals(2, $row);
 	}
 
-	public function testLeast() {
+	public function testLeast(): void {
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select($query->func()->least($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
diff --git a/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php b/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php
index 12ba74fe89f..88a3c125044 100644
--- a/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php
@@ -115,7 +115,7 @@ class PartitionedQueryBuilderTest extends TestCase {
 		$query->executeStatement();
 	}
 
-	public function testSimpleOnlyPartitionQuery() {
+	public function testSimpleOnlyPartitionQuery(): void {
 		$builder = $this->getQueryBuilder();
 		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
 
@@ -129,7 +129,7 @@ class PartitionedQueryBuilderTest extends TestCase {
 		$this->assertEquals($results[0]['path'], 'file1');
 	}
 
-	public function testSimplePartitionedQuery() {
+	public function testSimplePartitionedQuery(): void {
 		$builder = $this->getQueryBuilder();
 		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
 
@@ -151,7 +151,7 @@ class PartitionedQueryBuilderTest extends TestCase {
 		$this->assertEquals($results[0]['path'], 'file1');
 	}
 
-	public function testMultiTablePartitionedQuery() {
+	public function testMultiTablePartitionedQuery(): void {
 		$builder = $this->getQueryBuilder();
 		$builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
 
@@ -174,7 +174,7 @@ class PartitionedQueryBuilderTest extends TestCase {
 		$this->assertEquals($results[0]['upload_time'], 1234);
 	}
 
-	public function testPartitionedQueryFromSplit() {
+	public function testPartitionedQueryFromSplit(): void {
 		$builder = $this->getQueryBuilder();
 		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
 
@@ -195,7 +195,7 @@ class PartitionedQueryBuilderTest extends TestCase {
 		$this->assertEquals($results[0]['path'], 'file1');
 	}
 
-	public function testMultiJoinPartitionedQuery() {
+	public function testMultiJoinPartitionedQuery(): void {
 		$builder = $this->getQueryBuilder();
 		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
 
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index 335666b54fd..508748f13b2 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -103,7 +103,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param int|null $firstResult
 	 * @param array $expectedSet
 	 */
-	public function testFirstResult($firstResult, $expectedSet) {
+	public function testFirstResult($firstResult, $expectedSet): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();
 
@@ -140,7 +140,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param int $maxResult
 	 * @param array $expectedSet
 	 */
-	public function testMaxResults($maxResult, $expectedSet) {
+	public function testMaxResults($maxResult, $expectedSet): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();
 
@@ -193,7 +193,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expected
 	 * @param string $expectedLiteral
 	 */
-	public function testSelect($selectArguments, $expected, $expectedLiteral = '') {
+	public function testSelect($selectArguments, $expected, $expectedLiteral = ''): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();
 
@@ -246,7 +246,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $alias
 	 * @param array $expected
 	 */
-	public function testSelectAlias($select, $alias, $expected) {
+	public function testSelectAlias($select, $alias, $expected): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();
 
@@ -272,7 +272,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->deleteTestingRows();
 	}
 
-	public function testSelectDistinct() {
+	public function testSelectDistinct(): void {
 		$this->deleteTestingRows('testFirstResult1');
 		$this->deleteTestingRows('testFirstResult2');
 		$this->createTestingRows('testFirstResult1');
@@ -300,7 +300,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->deleteTestingRows('testFirstResult2');
 	}
 
-	public function testSelectDistinctMultiple() {
+	public function testSelectDistinctMultiple(): void {
 		$this->deleteTestingRows('testFirstResult1');
 		$this->deleteTestingRows('testFirstResult2');
 		$this->createTestingRows('testFirstResult1');
@@ -370,7 +370,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expected
 	 * @param string $expectedLiteral
 	 */
-	public function testAddSelect($selectArguments, $expected, $expectedLiteral = '') {
+	public function testAddSelect($selectArguments, $expected, $expectedLiteral = ''): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();
 
@@ -423,7 +423,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testDelete($tableName, $tableAlias, $expectedQueryPart, $expectedQuery) {
+	public function testDelete($tableName, $tableAlias, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->delete($tableName, $tableAlias);
 
 		$this->assertSame(
@@ -452,7 +452,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testUpdate($tableName, $tableAlias, $expectedQueryPart, $expectedQuery) {
+	public function testUpdate($tableName, $tableAlias, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->update($tableName, $tableAlias);
 
 		$this->assertSame(
@@ -479,7 +479,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testInsert($tableName, $expectedQueryPart, $expectedQuery) {
+	public function testInsert($tableName, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->insert($tableName);
 
 		$this->assertSame(
@@ -524,7 +524,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testFrom($table1Name, $table1Alias, $table2Name, $table2Alias, $expectedQueryPart, $expectedQuery) {
+	public function testFrom($table1Name, $table1Alias, $table2Name, $table2Alias, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->from($table1Name, $table1Alias);
 		if ($table2Name !== null) {
 			$this->queryBuilder->from($table2Name, $table2Alias);
@@ -572,7 +572,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery) {
+	public function testJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->from('data1', 'd1');
 		$this->queryBuilder->join(
 			$fromAlias,
@@ -602,7 +602,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testInnerJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery) {
+	public function testInnerJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->from('data1', 'd1');
 		$this->queryBuilder->innerJoin(
 			$fromAlias,
@@ -652,7 +652,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testLeftJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery) {
+	public function testLeftJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->from('data1', 'd1');
 		$this->queryBuilder->leftJoin(
 			$fromAlias,
@@ -702,7 +702,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testRightJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery) {
+	public function testRightJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->from('data1', 'd1');
 		$this->queryBuilder->rightJoin(
 			$fromAlias,
@@ -741,7 +741,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testSet($partOne1, $partOne2, $partTwo1, $partTwo2, $expectedQueryPart, $expectedQuery) {
+	public function testSet($partOne1, $partOne2, $partTwo1, $partTwo2, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->update('data');
 		$this->queryBuilder->set($partOne1, $partOne2);
 		if ($partTwo1 !== null) {
@@ -773,7 +773,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testWhere($whereArguments, $expectedQueryPart, $expectedQuery) {
+	public function testWhere($whereArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->select('column');
 		call_user_func_array(
 			[$this->queryBuilder, 'where'],
@@ -798,7 +798,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testAndWhere($whereArguments, $expectedQueryPart, $expectedQuery) {
+	public function testAndWhere($whereArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->select('column');
 		call_user_func_array(
 			[$this->queryBuilder, 'andWhere'],
@@ -830,7 +830,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testOrWhere($whereArguments, $expectedQueryPart, $expectedQuery) {
+	public function testOrWhere($whereArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->select('column');
 		call_user_func_array(
 			[$this->queryBuilder, 'orWhere'],
@@ -862,7 +862,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testGroupBy($groupByArguments, $expectedQueryPart, $expectedQuery) {
+	public function testGroupBy($groupByArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->select('column');
 		call_user_func_array(
 			[$this->queryBuilder, 'groupBy'],
@@ -894,7 +894,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testAddGroupBy($groupByArguments, $expectedQueryPart, $expectedQuery) {
+	public function testAddGroupBy($groupByArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->select('column');
 		$this->queryBuilder->groupBy('column1');
 		call_user_func_array(
@@ -927,7 +927,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testSetValue($column, $value, $expectedQueryPart, $expectedQuery) {
+	public function testSetValue($column, $value, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->insert('data');
 		$this->queryBuilder->setValue($column, $value);
 
@@ -950,7 +950,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testValues($column, $value, $expectedQueryPart, $expectedQuery) {
+	public function testValues($column, $value, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->insert('data');
 		$this->queryBuilder->values([
 			$column => $value,
@@ -991,7 +991,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testHaving($havingArguments, $expectedQueryPart, $expectedQuery) {
+	public function testHaving($havingArguments, $expectedQueryPart, $expectedQuery): void {
 		call_user_func_array(
 			[$this->queryBuilder, 'having'],
 			$havingArguments
@@ -1032,7 +1032,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testAndHaving($havingArguments, $expectedQueryPart, $expectedQuery) {
+	public function testAndHaving($havingArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->having('condition1');
 		call_user_func_array(
 			[$this->queryBuilder, 'andHaving'],
@@ -1074,7 +1074,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testOrHaving($havingArguments, $expectedQueryPart, $expectedQuery) {
+	public function testOrHaving($havingArguments, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->having('condition1');
 		call_user_func_array(
 			[$this->queryBuilder, 'orHaving'],
@@ -1108,7 +1108,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testOrderBy($sort, $order, $expectedQueryPart, $expectedQuery) {
+	public function testOrderBy($sort, $order, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->orderBy($sort, $order);
 
 		$this->assertEquals(
@@ -1145,7 +1145,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param array $expectedQueryPart
 	 * @param string $expectedQuery
 	 */
-	public function testAddOrderBy($sort2, $order2, $order1, $expectedQueryPart, $expectedQuery) {
+	public function testAddOrderBy($sort2, $order2, $order1, $expectedQueryPart, $expectedQuery): void {
 		$this->queryBuilder->orderBy('column1', $order1);
 		$this->queryBuilder->addOrderBy($sort2, $order2);
 
@@ -1160,7 +1160,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		);
 	}
 
-	public function testGetLastInsertId() {
+	public function testGetLastInsertId(): void {
 		$qB = $this->connection->getQueryBuilder();
 
 		try {
@@ -1223,7 +1223,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param bool $automatic
 	 * @param string $expected
 	 */
-	public function testGetTableName($tableName, $automatic, $expected) {
+	public function testGetTableName($tableName, $automatic, $expected): void {
 		if ($automatic !== null) {
 			$this->queryBuilder->automaticTablePrefix($automatic);
 		}
@@ -1247,7 +1247,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	 * @param string $prefix
 	 * @param string $expected
 	 */
-	public function testGetColumnName($column, $prefix, $expected) {
+	public function testGetColumnName($column, $prefix, $expected): void {
 		$this->assertSame(
 			$expected,
 			$this->queryBuilder->getColumnName($column, $prefix)
@@ -1263,7 +1263,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		return $connection;
 	}
 
-	public function testExecuteWithoutLogger() {
+	public function testExecuteWithoutLogger(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$queryBuilder
 			->method('getSQL')
@@ -1291,7 +1291,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->assertEquals(3, $this->queryBuilder->execute());
 	}
 
-	public function testExecuteWithLoggerAndNamedArray() {
+	public function testExecuteWithLoggerAndNamedArray(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$queryBuilder
 			->expects($this->any())
@@ -1335,7 +1335,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->assertEquals(3, $this->queryBuilder->execute());
 	}
 
-	public function testExecuteWithLoggerAndUnnamedArray() {
+	public function testExecuteWithLoggerAndUnnamedArray(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$queryBuilder
 			->expects($this->any())
@@ -1373,7 +1373,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->assertEquals(3, $this->queryBuilder->execute());
 	}
 
-	public function testExecuteWithLoggerAndNoParams() {
+	public function testExecuteWithLoggerAndNoParams(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$queryBuilder
 			->expects($this->any())
@@ -1410,7 +1410,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->assertEquals(3, $this->queryBuilder->execute());
 	}
 
-	public function testExecuteWithParameterTooLarge() {
+	public function testExecuteWithParameterTooLarge(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$p = array_fill(0, 1001, 'foo');
 		$queryBuilder
@@ -1445,7 +1445,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$this->queryBuilder->execute();
 	}
 
-	public function testExecuteWithParametersTooMany() {
+	public function testExecuteWithParametersTooMany(): void {
 		$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
 		$p = array_fill(0, 999, 'foo');
 		$queryBuilder
diff --git a/tests/lib/DB/QueryBuilder/QuoteHelperTest.php b/tests/lib/DB/QueryBuilder/QuoteHelperTest.php
index 12984bac3e0..3c2e33c28ea 100644
--- a/tests/lib/DB/QueryBuilder/QuoteHelperTest.php
+++ b/tests/lib/DB/QueryBuilder/QuoteHelperTest.php
@@ -41,7 +41,7 @@ class QuoteHelperTest extends \Test\TestCase {
 	 * @param mixed $input
 	 * @param string $expected
 	 */
-	public function testQuoteColumnName($input, $expected) {
+	public function testQuoteColumnName($input, $expected): void {
 		$this->assertSame(
 			$expected,
 			$this->helper->quoteColumnName($input)
@@ -76,7 +76,7 @@ class QuoteHelperTest extends \Test\TestCase {
 	 * @param mixed $input
 	 * @param string $expected
 	 */
-	public function testQuoteColumnNames($input, $expected) {
+	public function testQuoteColumnNames($input, $expected): void {
 		$this->assertSame(
 			$expected,
 			$this->helper->quoteColumnNames($input)
diff --git a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
index 8f95c1b6263..a135b9159dd 100644
--- a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
@@ -46,7 +46,7 @@ class SharedQueryBuilderTest extends TestCase {
 		);
 	}
 
-	public function testGetShardKeySingleParam() {
+	public function testGetShardKeySingleParam(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
@@ -56,7 +56,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertEquals([10], $query->getShardKeys());
 	}
 
-	public function testGetPrimaryKeyParam() {
+	public function testGetPrimaryKeyParam(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
@@ -66,7 +66,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertEquals([], $query->getShardKeys());
 	}
 
-	public function testValidateWithShardKey() {
+	public function testValidateWithShardKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
@@ -76,7 +76,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function testValidateWithPrimaryKey() {
+	public function testValidateWithPrimaryKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
@@ -86,7 +86,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function testValidateWithNoKey() {
+	public function testValidateWithNoKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
@@ -97,7 +97,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->fail('exception expected');
 	}
 
-	public function testValidateNonSharedTable() {
+	public function testValidateNonSharedTable(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('configvalue')
 			->from('appconfig')
@@ -107,7 +107,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function testGetShardKeyMultipleSingleParam() {
+	public function testGetShardKeyMultipleSingleParam(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')