Fix issue #57: array merge with null (#59)

* Fix issue #57: array merge with null * Space after !
Superbalist · Apr 18, 2019 · 4c112eb · 4c112eb
1 parent 81da22a
commit 4c112eb
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php
@@ -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)
         ]);
     }