Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[9.x] Restore S3 client extra options #41097

Merged
merged 3 commits into from
Feb 18, 2022
Merged

[9.x] Restore S3 client extra options #41097

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b7a3be
[9.x] Restore S3 client extra options
ankurk91 Feb 18, 2022
cad8653
Update FilesystemManager.php
taylorotwell Feb 18, 2022
e7ab09e
Update FilesystemManager.php
taylorotwell Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Filesystem/FilesystemManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function createS3Driver(array $config)

$client = new S3Client($s3Config);

$adapter = new S3Adapter($client, $s3Config['bucket'], $root, $visibility, null, [], $streamReads);
$adapter = new S3Adapter($client, $s3Config['bucket'], $root, $visibility, null, $config['options'] ?? [], $streamReads);

return new AwsS3V3Adapter(
$this->createFlysystem($adapter, $config), $adapter, $s3Config, $client
Expand Down