From da59fd4389bedd6b643f277b5e411872137569b3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Mon, 9 Sep 2024 16:59:59 +0200
Subject: fix: misc code fixes around db sharding

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php        | 4 ++--
 lib/private/DB/QueryBuilder/QueryBuilder.php                | 6 +++---
 lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/private/DB')

diff --git a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
index c40cadfbdb5..f928132a123 100644
--- a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
@@ -289,12 +289,12 @@ abstract class ExtendedQueryBuilder implements IQueryBuilder {
 		return $this->builder->executeStatement($connection);
 	}
 
-	public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+	public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
 		$this->builder->hintShardKey($column, $value, $overwrite);
 		return $this;
 	}
 
-	public function runAcrossAllShards() {
+	public function runAcrossAllShards(): self {
 		$this->builder->runAcrossAllShards();
 		return $this;
 	}
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 5c7e273c9ec..e975d4907ef 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -560,7 +560,7 @@ class QueryBuilder implements IQueryBuilder {
 		return $this;
 	}
 
-	private function addOutputColumns(array $columns) {
+	private function addOutputColumns(array $columns): void {
 		foreach ($columns as $column) {
 			if (is_array($column)) {
 				$this->addOutputColumns($column);
@@ -1370,11 +1370,11 @@ class QueryBuilder implements IQueryBuilder {
 		return $this->connection->escapeLikeParameter($parameter);
 	}
 
-	public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+	public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
 		return $this;
 	}
 
-	public function runAcrossAllShards() {
+	public function runAcrossAllShards(): self {
 		// noop
 		return $this;
 	}
diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
index e7bc70ce440..e5b66470de0 100644
--- a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
@@ -296,7 +296,7 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder {
 		];
 	}
 
-	public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+	public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
 		if ($overwrite) {
 			$this->primaryKeys = [];
 			$this->shardKeys = [];
@@ -310,7 +310,7 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder {
 		return $this;
 	}
 
-	public function runAcrossAllShards() {
+	public function runAcrossAllShards(): self {
 		$this->allShards = true;
 		return $this;
 	}
-- 
cgit v1.2.3