Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-30 17:03:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6065 from turbo124/v5-develop

Browse Source 
Fixes for MailServiceProvider
This commit is contained in:
David Bomba 2021-06-17 18:54:02 +10:00 committed by GitHub
commit aafb79179a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Providers/MailServiceProvider.php
View File

@ -28,16 +28,17 @@ class MailServiceProvider extends MailProvider
public function boot() public function boot()
{ {
$this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
} }
protected function registerIlluminateMailer() protected function registerIlluminateMailer()
{ {
$this->app->singleton('mail.manager', function($app) { $this->app->singleton('mail.manager', function($app) {
$manager = new GmailTransportManager($app); return new GmailTransportManager($app);
// $manager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $manager;
}); });
$this->app->bind('mailer', function ($app) { $this->app->bind('mailer', function ($app) {
@ -53,29 +54,6 @@ class MailServiceProvider extends MailProvider
}); });
$this->app->extend('mail.manager', function(GmailTransportManager $manager) {
$manager->extend('cocopostmark', function() {
return new PostmarkTransport(
$this->guzzle(config('postmark.guzzle', [])),
config('postmark.secret')
);
// $manager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
});
return $manager;
});
app('mail.manager')->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
// $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// return $mailManager;
// });
} }
protected function guzzle(array $config): HttpClient protected function guzzle(array $config): HttpClient