From 4c112eb82dcc7b7173fa3c8737e10b1043ba6f6d Mon Sep 17 00:00:00 2001
From: Nic Appleby <nicja@users.noreply.github.com>
Date: Thu, 18 Apr 2019 16:20:59 +0200
Subject: [PATCH] Fix issue #57: array merge with null (#59)

* Fix issue #57: array merge with null

* Space after !
---
 src/GoogleCloudStorageServiceProvider.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php
index b79d400..22cdf3c 100644
--- 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)
         ]);
     }