From 324a79023c963929a06c599a6b8c9277859ec278 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 11 Feb 2021 23:35:46 +1100 Subject: [PATCH] Prevent mailables from being queueable" git push --- app/Helpers/Mail/GmailTransportManager.php | 3 ++- app/Jobs/Mail/BaseMailerJob.php | 12 ++++++------ app/Mail/BouncedEmail.php | 5 +++-- app/Mail/DownloadInvoices.php | 2 +- app/Mail/ExistingMigration.php | 2 +- app/Mail/Import/ImportCompleted.php | 2 +- app/Mail/Invoices/InvoiceWasPaid.php | 2 +- app/Mail/MigrationCompleted.php | 2 +- app/Mail/MigrationFailed.php | 2 +- app/Mail/Quote/QuoteWasApproved.php | 2 +- app/Mail/SupportMessageSent.php | 2 +- app/Mail/TemplateEmail.php | 2 +- app/Mail/TestMailServer.php | 2 +- 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/Helpers/Mail/GmailTransportManager.php b/app/Helpers/Mail/GmailTransportManager.php index 767f5fc6bd7d..7ef3cbeafecc 100644 --- a/app/Helpers/Mail/GmailTransportManager.php +++ b/app/Helpers/Mail/GmailTransportManager.php @@ -14,7 +14,8 @@ class GmailTransportManager extends MailManager { //$token = $this->app['config']->get('services.gmail.token', []); - $token =Config::get('services.gmail.token'); + $token = config('services.gmail.token'); + $mail = new Mail; return new GmailTransport($mail, $token); diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php index 0c8a9e770967..095839bd9bdb 100644 --- a/app/Jobs/Mail/BaseMailerJob.php +++ b/app/Jobs/Mail/BaseMailerJob.php @@ -80,15 +80,15 @@ class BaseMailerJob implements ShouldQueue * just for this request. */ - Config::set('mail.driver', 'gmail'); - Config::set('services.gmail.token', $user->oauth_user_token->access_token); - Config::set('mail.from.address', $user->email); - Config::set('mail.from.name', $user->present()->name()); + config(['mail.driver' => 'gmail']); + config(['services.gmail.token' => $user->oauth_user_token->access_token]); + config(['mail.from.address' => $user->email]); + config(['mail.from.name' => $user->present()->name()]); - (new MailServiceProvider(app()))->register(); + //(new MailServiceProvider(app()))->register(); nlog("after registering mail service provider"); - nlog(Config::set('services.gmail.token')); + nlog(config('services.gmail.token')); } public function logMailError($errors, $recipient_object) diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php index d2f112cae36c..dad747252f29 100644 --- a/app/Mail/BouncedEmail.php +++ b/app/Mail/BouncedEmail.php @@ -17,9 +17,10 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -class BouncedEmail extends Mailable implements ShouldQueue +// class BouncedEmail extends Mailable implements ShouldQueue +class BouncedEmail extends Mailable { - use Queueable, SerializesModels; + //use Queueable, SerializesModels; public $invitation; diff --git a/app/Mail/DownloadInvoices.php b/app/Mail/DownloadInvoices.php index 8ac8f0db97aa..70237def6ec0 100644 --- a/app/Mail/DownloadInvoices.php +++ b/app/Mail/DownloadInvoices.php @@ -9,7 +9,7 @@ use Illuminate\Queue\SerializesModels; class DownloadInvoices extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; public $file_path; diff --git a/app/Mail/ExistingMigration.php b/app/Mail/ExistingMigration.php index 5c997437c14e..60f7abdf95d4 100644 --- a/app/Mail/ExistingMigration.php +++ b/app/Mail/ExistingMigration.php @@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels; class ExistingMigration extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; /** * Create a new message instance. diff --git a/app/Mail/Import/ImportCompleted.php b/app/Mail/Import/ImportCompleted.php index 85178fb0647d..ecb50e51487f 100644 --- a/app/Mail/Import/ImportCompleted.php +++ b/app/Mail/Import/ImportCompleted.php @@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels; class ImportCompleted extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; /** * Create a new message instance. diff --git a/app/Mail/Invoices/InvoiceWasPaid.php b/app/Mail/Invoices/InvoiceWasPaid.php index 3dc64bf16f0f..ef61ba8b4b03 100644 --- a/app/Mail/Invoices/InvoiceWasPaid.php +++ b/app/Mail/Invoices/InvoiceWasPaid.php @@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels; class InvoiceWasPaid extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; /** * Create a new message instance. diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php index e81f72356496..bfe2c01e4aee 100644 --- a/app/Mail/MigrationCompleted.php +++ b/app/Mail/MigrationCompleted.php @@ -9,7 +9,7 @@ use Illuminate\Queue\SerializesModels; class MigrationCompleted extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; public $company; diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php index 8f9cc26826fd..562b515051b6 100644 --- a/app/Mail/MigrationFailed.php +++ b/app/Mail/MigrationFailed.php @@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels; class MigrationFailed extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; public $exception; public $content; diff --git a/app/Mail/Quote/QuoteWasApproved.php b/app/Mail/Quote/QuoteWasApproved.php index a5b9a7348776..22d6de965fce 100644 --- a/app/Mail/Quote/QuoteWasApproved.php +++ b/app/Mail/Quote/QuoteWasApproved.php @@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels; class QuoteWasApproved extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; /** * Create a new message instance. diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index 8c71d9fed9c4..2dd7d51bea12 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -11,7 +11,7 @@ use SplFileObject; class SupportMessageSent extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; public $message; diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php index cfe1fa87b10c..57a2736c1e45 100644 --- a/app/Mail/TemplateEmail.php +++ b/app/Mail/TemplateEmail.php @@ -20,7 +20,7 @@ use Illuminate\Queue\SerializesModels; class TemplateEmail extends Mailable { - use Queueable, SerializesModels; + //use Queueable, SerializesModels; private $build_email; diff --git a/app/Mail/TestMailServer.php b/app/Mail/TestMailServer.php index b029b48fb2b3..595c48ea73a0 100644 --- a/app/Mail/TestMailServer.php +++ b/app/Mail/TestMailServer.php @@ -17,7 +17,7 @@ use Illuminate\Queue\SerializesModels; class TestMailServer extends Mailable { - use Queueable, SerializesModels; + // use Queueable, SerializesModels; public $message;