diff --git a/composer.json b/composer.json index b3c60be..d563201 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "php": ">=5.5.9", "illuminate/support": "^5.1|^6.0|^7.0", - "superbalist/flysystem-google-storage": ">=3.0 <8.0", + "superbalist/flysystem-google-storage": "7.2.*", "illuminate/filesystem": "^5.1|^6.0|^7.0", "league/flysystem-cached-adapter": "^1.0" }, diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php index c45aee0..4f266c6 100644 --- a/src/GoogleCloudStorageServiceProvider.php +++ b/src/GoogleCloudStorageServiceProvider.php @@ -92,12 +92,9 @@ private function createClient($config) ]); } - if (! is_array($keyFile)) { - $keyFile = []; - } return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) + 'keyFile' => is_array($keyFile) ? $keyFile : [], ]); }