From 8435c563db71f00c0a2f513da50e08f4543fcffa Mon Sep 17 00:00:00 2001 From: Yish Date: Wed, 4 Sep 2019 11:41:30 +0800 Subject: [PATCH 1/3] Support 6.x --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index efb7d31..2ba5c6b 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "^5.1|^5.2|^5.3", + "illuminate/support": "^5.0|^6.0", "superbalist/flysystem-google-storage": ">=3.0 <8.0", - "illuminate/filesystem": "^5.1|^5.2|^5.3", + "illuminate/filesystem": "^5.0|^6.0", "league/flysystem-cached-adapter": "^1.0" }, "autoload": { From 69641de4bf6bdccc3a040b683f922ee23086fbdf Mon Sep 17 00:00:00 2001 From: Yish Date: Wed, 4 Sep 2019 11:47:16 +0800 Subject: [PATCH 2/3] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2ba5c6b..bdd6f9e 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "^5.0|^6.0", + "illuminate/support": "^5.1|^6.0", "superbalist/flysystem-google-storage": ">=3.0 <8.0", - "illuminate/filesystem": "^5.0|^6.0", + "illuminate/filesystem": "^5.1|^6.0", "league/flysystem-cached-adapter": "^1.0" }, "autoload": { From 3480c826d99d24a4f2cb35d17b344ed92acd3a85 Mon Sep 17 00:00:00 2001 From: Yish Date: Fri, 6 Sep 2019 11:11:20 +0800 Subject: [PATCH 3/3] laravel 5.8 or later doesn't support helper methods. --- src/GoogleCloudStorageServiceProvider.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php index 22cdf3c..c45aee0 100644 --- a/src/GoogleCloudStorageServiceProvider.php +++ b/src/GoogleCloudStorageServiceProvider.php @@ -51,8 +51,8 @@ protected function createCacheStore($config) return new Cache( $this->app['cache']->store($config['store']), - array_get($config, 'prefix', 'flysystem'), - array_get($config, 'expire') + Arr::get($config, 'prefix', 'flysystem'), + Arr::get($config, 'expire') ); } @@ -67,8 +67,8 @@ public function boot() $storageClient = $this->createClient($config); $bucket = $storageClient->bucket($config['bucket']); - $pathPrefix = array_get($config, 'path_prefix'); - $storageApiUri = array_get($config, 'storage_api_uri'); + $pathPrefix = Arr::get($config, 'path_prefix'); + $storageApiUri = Arr::get($config, 'storage_api_uri'); $adapter = new GoogleStorageAdapter($storageClient, $bucket, $pathPrefix, $storageApiUri); @@ -84,7 +84,7 @@ public function boot() */ private function createClient($config) { - $keyFile = array_get($config, 'key_file'); + $keyFile = Arr::get($config, 'key_file'); if (is_string($keyFile)) { return new StorageClient([ 'projectId' => $config['project_id'],