Merge branch 'develop' into 5.8-dev

# Conflicts:
#	config/firefly.php
This commit is contained in:
James Cole
2022-09-11 08:59:34 +02:00
16 changed files with 181 additions and 147 deletions

View File

@@ -49,6 +49,7 @@ use Laravel\Passport\Events\AccessTokenCreated;
use Log;
use Mail;
use Session;
use TypeError;
/**
* Class EventServiceProvider.
@@ -190,7 +191,7 @@ class EventServiceProvider extends ServiceProvider
try {
Log::debug('Trying to send message...');
Mail::to($email)->send(new OAuthTokenCreatedMail($oauthClient));
} catch (Exception $e) { // @phpstan-ignore-line
} catch (TypeError|Exception $e) { // @phpstan-ignore-line
Log::debug('Send message failed! :(');
Log::error($e->getMessage());
Log::error($e->getTraceAsString());