diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index b554d1dac037..8150252a5a2c 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -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); } } diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index 7d7e1351e37c..30526198bc20 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -26,7 +26,7 @@ class UserObserver */ public function updated(User $user) { - event(new UserWasUpdated($user)); + } /** diff --git a/composer.json b/composer.json index ef712e352818..9357ac562631 100644 --- a/composer.json +++ b/composer.json @@ -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" }, diff --git a/config/filesystems.php b/config/filesystems.php index 77fa5ded1dec..88bcf3da5fb7 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -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 + ], ], ]; diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php index 6177f58bb4b9..a36a57b70bd4 100644 --- a/tests/Feature/ClientTest.php +++ b/tests/Feature/ClientTest.php @@ -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); diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php index 2cd8ea90707f..442727ce8144 100644 --- a/tests/Feature/LoginTest.php +++ b/tests/Feature/LoginTest.php @@ -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(); }