diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index 1b54a8c946f..e39ba0b78c6 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -531,8 +531,8 @@ class QueryBuilderTest extends \Test\TestCase {
 	public static function dataJoin(): array {
 		return [
 			[
-				'd1', 'data2', null, null,
-				['`d1`' => [['joinType' => 'inner', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
+				'd1', 'data2', '', null,
+				['`d1`' => [['joinType' => 'inner', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '', 'joinCondition' => null]]],
 				'`*PREFIX*data1` `d1` INNER JOIN `*PREFIX*data2` '
 			],
 			[
@@ -611,8 +611,8 @@ class QueryBuilderTest extends \Test\TestCase {
 	public static function dataLeftJoin(): array {
 		return [
 			[
-				'd1', 'data2', null, null,
-				['`d1`' => [['joinType' => 'left', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
+				'd1', 'data2', '', null,
+				['`d1`' => [['joinType' => 'left', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '', 'joinCondition' => null]]],
 				'`*PREFIX*data1` `d1` LEFT JOIN `*PREFIX*data2` '
 			],
 			[
@@ -661,8 +661,8 @@ class QueryBuilderTest extends \Test\TestCase {
 	public static function dataRightJoin(): array {
 		return [
 			[
-				'd1', 'data2', null, null,
-				['`d1`' => [['joinType' => 'right', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => null, 'joinCondition' => null]]],
+				'd1', 'data2', '', null,
+				['`d1`' => [['joinType' => 'right', 'joinTable' => '`*PREFIX*data2`', 'joinAlias' => '', 'joinCondition' => null]]],
 				'`*PREFIX*data1` `d1` RIGHT JOIN `*PREFIX*data2` '
 			],
 			[
@@ -678,17 +678,15 @@ class QueryBuilderTest extends \Test\TestCase {
 		];
 	}
 
-	/**
-	 *
-	 * @param string $fromAlias
-	 * @param string $tableName
-	 * @param string $tableAlias
-	 * @param string $condition
-	 * @param array $expectedQueryPart
-	 * @param string $expectedQuery
-	 */
 	#[DataProvider('dataRightJoin')]
-	public function testRightJoin($fromAlias, $tableName, $tableAlias, $condition, $expectedQueryPart, $expectedQuery): void {
+	public function testRightJoin(
+		string $fromAlias,
+		string $tableName,
+		string $tableAlias,
+		?string $condition,
+		array $expectedQueryPart,
+		string $expectedQuery,
+	): void {
 		$this->queryBuilder->from('data1', 'd1');
 		$this->queryBuilder->rightJoin(
 			$fromAlias,