From 650ba5699520e6b172e04be6855b55f4f0d6a194 Mon Sep 17 00:00:00 2001 From: Thomas Mason Date: Wed, 14 Aug 2019 14:32:07 +0100 Subject: [PATCH 1/2] Update FilesystemManager.php Caused unexpected behaviour when using AWS IAM assigned to instances --- src/Illuminate/Filesystem/FilesystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 07310a59fc67..303e9fd4582f 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -219,7 +219,7 @@ protected function formatS3Config(array $config) { $config += ['version' => 'latest']; - if ($config['key'] && $config['secret']) { + if (!empty($config['key']) && !empty($config['secret']) ) { $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']); } From 500418f06ce365d6a53218aa60ad50d006585ccd Mon Sep 17 00:00:00 2001 From: Thomas Mason Date: Wed, 14 Aug 2019 14:38:15 +0100 Subject: [PATCH 2/2] Update FilesystemManager.php --- src/Illuminate/Filesystem/FilesystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 303e9fd4582f..51647019ea49 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -219,7 +219,7 @@ protected function formatS3Config(array $config) { $config += ['version' => 'latest']; - if (!empty($config['key']) && !empty($config['secret']) ) { + if (! empty($config['key']) && ! empty($config['secret'])) { $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']); }