Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Fix issue #57: array merge with null #59

Merged
merged 2 commits into from
Apr 18, 2019
Merged

Fix issue #57: array merge with null #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
242b4c7
Fix issue #57: array merge with null
Apr 18, 2019
9d09843
Space after !
Apr 18, 2019
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
12 changes: 7 additions & 5 deletions src/GoogleCloudStorageServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,20 @@ public function boot()
*/
private function createClient($config)
{
if (is_string(array_get($config, 'key_file'))) {
$keyFile = array_get($config, 'key_file');
if (is_string($keyFile)) {
return new StorageClient([
'projectId' => $config['project_id'],
'keyFilePath' => array_get($config, 'key_file'),
'keyFilePath' => $keyFile,
]);
}

if (! is_array($keyFile)) {
$keyFile = [];
}
return new StorageClient([
'projectId' => $config['project_id'],
'keyFile' => array_merge([
"project_id" => $config['project_id']
], array_get($config, 'key_file', []))
'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile)
]);
}

Expand Down