Skip to content

Commit

Permalink
Support laravel 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Bertus Steenberg committed Sep 26, 2019
2 parents 249a7de + 3480c82 commit 8985186
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -10,9 +10,9 @@
],
"require": {
"php": ">=5.5.9",
"illuminate/support": "^5.1|^5.2|^5.3",
"illuminate/support": "^5.1|^6.0",
"superbalist/flysystem-google-storage": ">=3.0 <8.0",
"illuminate/filesystem": "^5.1|^5.2|^5.3",
"illuminate/filesystem": "^5.1|^6.0",
"league/flysystem-cached-adapter": "^1.0"
},
"autoload": {
Expand Down
10 changes: 5 additions & 5 deletions src/GoogleCloudStorageServiceProvider.php
Expand Up @@ -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')
);
}

Expand All @@ -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);

Expand All @@ -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'],
Expand Down

0 comments on commit 8985186

Please sign in to comment.