Merge pull request #1065 from nextcloud/backport/1037/stable23

[stable23] recursive setOptions()
nextcloud · Jun 13, 2022 · 5601996 · 5601996
2 parents c7a34f4 + b626660
commit 5601996
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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;
 	}