From 5b7a3be4fb88017f516fbfe46942bba65d00d955 Mon Sep 17 00:00:00 2001 From: Ankur Kumar Date: Fri, 18 Feb 2022 17:44:50 +0530 Subject: [PATCH 1/3] [9.x] Restore S3 client extra options --- src/Illuminate/Filesystem/FilesystemManager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 9fb8a45dc0aa..736cd72fca0a 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -233,6 +233,7 @@ public function createS3Driver(array $config) $s3Config = $this->formatS3Config($config); $root = (string) ($s3Config['root'] ?? ''); + $options = $config['options'] ?? []; $visibility = new AwsS3PortableVisibilityConverter( $config['visibility'] ?? Visibility::PUBLIC @@ -242,7 +243,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, $options, $streamReads); return new AwsS3V3Adapter( $this->createFlysystem($adapter, $config), $adapter, $s3Config, $client From cad8653a5a04c336afa9b5890b31e438089ae48c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 18 Feb 2022 09:01:00 -0600 Subject: [PATCH 2/3] Update FilesystemManager.php --- src/Illuminate/Filesystem/FilesystemManager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 736cd72fca0a..d38d995a2fb2 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -233,6 +233,7 @@ public function createS3Driver(array $config) $s3Config = $this->formatS3Config($config); $root = (string) ($s3Config['root'] ?? ''); + $options = $config['options'] ?? []; $visibility = new AwsS3PortableVisibilityConverter( From e7ab09eb2995ca0c260b87d04f28206de4fff02a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 18 Feb 2022 09:01:32 -0600 Subject: [PATCH 3/3] Update FilesystemManager.php --- src/Illuminate/Filesystem/FilesystemManager.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index d38d995a2fb2..7cf963bd580f 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -234,8 +234,6 @@ public function createS3Driver(array $config) $root = (string) ($s3Config['root'] ?? ''); - $options = $config['options'] ?? []; - $visibility = new AwsS3PortableVisibilityConverter( $config['visibility'] ?? Visibility::PUBLIC ); @@ -244,7 +242,7 @@ public function createS3Driver(array $config) $client = new S3Client($s3Config); - $adapter = new S3Adapter($client, $s3Config['bucket'], $root, $visibility, null, $options, $streamReads); + $adapter = new S3Adapter($client, $s3Config['bucket'], $root, $visibility, null, $config['options'] ?? [], $streamReads); return new AwsS3V3Adapter( $this->createFlysystem($adapter, $config), $adapter, $s3Config, $client