From b626660b0e28a354efba3ca754959aeec89237f3 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 4 May 2022 09:56:56 -0100 Subject: [PATCH] recursive setOptions() Signed-off-by: Maxence Lange --- lib/Db/CoreQueryBuilder.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php index 0f94eb68d..85b6af6e1 100644 --- a/lib/Db/CoreQueryBuilder.php +++ b/lib/Db/CoreQueryBuilder.php @@ -1571,14 +1571,18 @@ private function generateRemoteInstanceSelectAlias(string $alias, array $default /** * @param array $path * @param array $options + * + * @return CoreQueryBuilder */ - public function setOptions(array $path, array $options): void { + public function setOptions(array $path, array $options): self { $options = [self::OPTIONS => $options]; foreach (array_reverse($path) as $item) { $options = [$item => $options]; } - $this->options = $options; + $this->options = array_merge_recursive($this->options, $options); + + return $this; }