Merge branch '10.x' of https://github.com/robchett/framework into aws-creds

Author: taylorotwell

src/Illuminate/Bus/BusServiceProvider.php

@@ -69,10 +69,10 @@ protected function registerBatchServices()
             ];
 
             if (! empty($config['key']) && ! empty($config['secret'])) {
-                $dynamoConfig['credentials'] = Arr::only(
-                    $config,
-                    ['key', 'secret', 'token']
-                );
+                $dynamoConfig['credentials'] = Arr::only($config, ['key', 'secret']);
+                if (! empty($config['token'])) {
+                    $dynamoConfig['credentials']['token'] = $config['token'];
+                }
             }
 
             return new DynamoBatchRepository(

src/Illuminate/Cache/CacheManager.php

@@ -283,10 +283,9 @@ protected function newDynamodbClient(array $config)
             $dynamoConfig['credentials'] = Arr::only(
                 $config, ['key', 'secret']
             );
-        }
-
-        if (! empty($config['token'])) {
-            $dynamoConfig['credentials']['token'] = $config['token'];
+            if (! empty($config['token'])) {
+                $dynamoConfig['credentials']['token'] = $config['token'];
+            }
         }
 
         return new DynamoDbClient($dynamoConfig);

src/Illuminate/Filesystem/FilesystemManager.php

@@ -272,10 +272,9 @@ protected function formatS3Config(array $config)
 
         if (! empty($config['key']) && ! empty($config['secret'])) {
             $config['credentials'] = Arr::only($config, ['key', 'secret']);
-        }
-
-        if (! empty($config['token'])) {
-            $config['credentials']['token'] = $config['token'];
+            if (! empty($config['token'])) {
+                $config['credentials']['token'] = $config['token'];
+            }
         }
 
         return Arr::except($config, ['token']);

src/Illuminate/Mail/MailManager.php

@@ -301,7 +301,10 @@ protected function createSesV2Transport(array $config)
     protected function addSesCredentials(array $config)
     {
         if (! empty($config['key']) && ! empty($config['secret'])) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            if (! empty($config['token'])) {
+                $config['credentials']['token'] = $config['token'];
+            }
         }
 
         return Arr::except($config, ['token']);

src/Illuminate/Queue/Connectors/SqsConnector.php

@@ -19,7 +19,10 @@ public function connect(array $config)
         $config = $this->getDefaultConfiguration($config);
 
         if (! empty($config['key']) && ! empty($config['secret'])) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            if (! empty($config['token'])) {
+                $config['credentials']['token'] = $config['token'];
+            }
         }
 
         return new SqsQueue(

src/Illuminate/Queue/QueueServiceProvider.php

@@ -314,9 +314,10 @@ protected function dynamoFailedJobProvider($config)
         ];
 
         if (! empty($config['key']) && ! empty($config['secret'])) {
-            $dynamoConfig['credentials'] = Arr::only(
-                $config, ['key', 'secret', 'token']
-            );
+            $dynamoConfig['credentials'] = Arr::only($config, ['key', 'secret']);
+            if (! empty($config['token'])) {
+                $dynamoConfig['credentials']['token'] = $config['token'];
+            }
         }
 
         return new DynamoDbFailedJobProvider(