From 387d2814cb7f4f7a973a0d14bad6a9f48fae9c88 Mon Sep 17 00:00:00 2001 From: Rizal Alfiannor Date: Thu, 25 Apr 2019 15:38:12 +0700 Subject: [PATCH 1/2] Bug Fix #60 Fix logic if keyFile is null --- src/GoogleCloudStorageServiceProvider.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php index 22cdf3c..76f3ac6 100644 --- a/src/GoogleCloudStorageServiceProvider.php +++ b/src/GoogleCloudStorageServiceProvider.php @@ -85,19 +85,15 @@ public function boot() private function createClient($config) { $keyFile = array_get($config, 'key_file'); - if (is_string($keyFile)) { + if (is_array($keyFile)) { return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFilePath' => $keyFile, + 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) ]); } - - if (! is_array($keyFile)) { - $keyFile = []; - } return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) + 'keyFilePath' => $keyFile, ]); } From 3c01e90b18108c392b8db0eaeaef49bd82e2b6c2 Mon Sep 17 00:00:00 2001 From: Rizal Alfiannor Date: Thu, 25 Apr 2019 15:45:56 +0700 Subject: [PATCH 2/2] Clean array --- src/GoogleCloudStorageServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php index 76f3ac6..8130df7 100644 --- a/src/GoogleCloudStorageServiceProvider.php +++ b/src/GoogleCloudStorageServiceProvider.php @@ -93,7 +93,7 @@ private function createClient($config) } return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFilePath' => $keyFile, + 'keyFilePath' => $keyFile ]); }