From 014d6eb120e1ea405b7c0517621442321fbb446a Mon Sep 17 00:00:00 2001 From: Ivan Reznikov Date: Wed, 10 Jun 2020 12:47:23 +0300 Subject: [PATCH 1/2] Fix when path should be used from the system var --- composer.json | 2 +- src/GoogleCloudStorageServiceProvider.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index b3c60be..1072452 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.3", "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 : [], ]); } From 29afc90b9231b380191c231f8730bb85097b7694 Mon Sep 17 00:00:00 2001 From: Ivan Reznikov Date: Mon, 22 Jun 2020 12:45:24 +0300 Subject: [PATCH 2/2] update the version for use --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1072452..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": "7.2.3", + "superbalist/flysystem-google-storage": "7.2.*", "illuminate/filesystem": "^5.1|^6.0|^7.0", "league/flysystem-cached-adapter": "^1.0" },