feat(ObjectStore): Allow overriding arguments per bucket

provokateurin · provokateurin · commit 2ab29a69e0b8 · 2025-12-01T16:06:05.000+01:00
Signed-off-by: provokateurin &lt;kate@provokateurin.de&gt;
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -39,6 +39,10 @@ protected function parseParams($params) {
 			throw new \Exception('Bucket has to be configured.');
 		}
 
+		if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {
+			$params = array_merge($params, $params['perBucket'][$params['bucket']]);
+		}
+
 		$this->id = 'amazon::' . $params['bucket'];
 
 		$this->test = isset($params['test']);

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ protected function parseParams($params) {`
`39`	`39`	`throw new \Exception('Bucket has to be configured.');`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {`
	`43`	`+ $params = array_merge($params, $params['perBucket'][$params['bucket']]);`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`$this->id = 'amazon::' . $params['bucket'];`
`43`	`47`
`44`	`48`	`$this->test = isset($params['test']);`