Skip to content

Commit 9a90aec

Browse files
committed
Config fix
1 parent a35141d commit 9a90aec

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

s3_storage/src/S3Config.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ public function saveOptions(array $data): array
199199
}
200200

201201
try {
202-
$s3Config->setUseLegacyPathStyle(!empty($data['legacy']));
202+
$s3Config->setUseLegacyPathStyle((bool)$data['legacy'] ?? false);
203203
} catch (\Exception $exception) {
204204
$feedback['legacy'] = $exception->getMessage();
205205
}
206206
try {
207-
$s3Config->setUseDualstackUrl(!empty($data['dualstack_url']));
207+
$s3Config->setUseDualstackUrl((bool)$data['dualstack_url'] ?? false);
208208
} catch (\Exception $exception) {
209209
$feedback['dualstack_url'] = $exception->getMessage();
210210
}
@@ -233,8 +233,16 @@ public function saveOptions(array $data): array
233233
$this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString());
234234
$this->config->set('s3', 'bucket', ($this->bucket = $bucket));
235235

236-
$this->config->set('s3', 'legacy', $s3Config->getUseLegacyPathStyle());
237-
$this->config->set('s3', 'dual_stack', $s3Config->getUseLegacyPathStyle());
236+
if ($s3Config->getUseLegacyPathStyle()) {
237+
$this->config->set('s3', 'legacy', '1');
238+
} else {
239+
$this->config->delete('s3', 'legacy');
240+
}
241+
if ($s3Config->getDualstackUrl()) {
242+
$this->config->set('s3', 'dual_stack', '1');
243+
} else {
244+
$this->config->delete('s3', 'dual_stack');
245+
}
238246
$this->config->set('s3','signature_method', $s3Config->getSignatureMethod());
239247

240248
if (!empty($data['endpoint'])) {

0 commit comments

Comments
 (0)