1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

bump laravel version to 5.8, include new GCS storage library

This commit is contained in:
David Bomba 2019-04-28 15:11:08 +10:00
parent fb4fc93279
commit 63f8700db1
6 changed files with 16 additions and 7 deletions

View File

@ -40,8 +40,8 @@ class QueryLogging
$time = $timeEnd - $timeStart;
Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
if($count > 20)
Log::info($queries);
// if($count > 20)
// Log::info($queries);
}
}

View File

@ -26,7 +26,7 @@ class UserObserver
*/
public function updated(User $user)
{
event(new UserWasUpdated($user));
}
/**

View File

@ -24,13 +24,15 @@
"fideloper/proxy": "^4.0",
"hashids/hashids": "^3.0",
"laracasts/presenter": "^0.2.1",
"laravel/framework": "5.7.*",
"laravel/framework": "5.8.*",
"laravel/socialite": "^3.1",
"laravel/tinker": "^1.0",
"league/fractal": "^0.17.0",
"nwidart/laravel-modules": "^4.0",
"predis/predis": "^1.1",
"sentry/sentry-laravel": "^1.0",
"simshaun/recurr": "^4.0",
"superbalist/laravel-google-cloud-storage": "^2.2",
"webpatser/laravel-countries": "dev-master#75992ad",
"wildbit/postmark-php": "^2.6"
},

View File

@ -63,7 +63,15 @@ return [
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
],
'gcs' => [
'driver' => 'gcs',
'project_id' => env('GOOGLE_CLOUD_PROJECT_ID', 'your-project-id'),
'key_file' => env('GOOGLE_CLOUD_KEY_FILE', null), // optional: /path/to/service-account.json
'bucket' => env('GOOGLE_CLOUD_STORAGE_BUCKET', 'your-bucket'),
'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', null), // optional: /default/path/to/apply/in/bucket
'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), // see: Public URLs below
'visibility' => 'public', // optional: public|private
],
],
];

View File

@ -241,7 +241,6 @@ class ClientTest extends TestCase
$this->assertNotNull($client);
Log::error(print_r($client,1));
/* Make sure we have a valid settings object*/
$this->assertEquals($client->getSettings()->timezone_id, 15);

View File

@ -122,7 +122,7 @@ class LoginTest extends TestCase
$response = $this->actingAs($user)->post('/logout',[
'_token' => csrf_token()
]);
$response->assertStatus(200);
$response->assertStatus(302);
// $this->assertGuest();
}