From 586de3b969b85f136f781a579f01ff2330238d76 Mon Sep 17 00:00:00 2001 From: Jordan Doyle Date: Mon, 17 Oct 2016 06:00:39 +0100 Subject: [PATCH] replace wordpress mailer with laravel's mailer --- src/Mail/Mailer.php | 39 +++++++++++++++++++++++++++++++++++++++ src/Mail/WordpressMailServiceProvider.php | 22 ++++++++++++++++++++++ src/Providers/KoseligServiceProvider.php | 2 ++ src/Providers/WordpressServiceProvider.php | 1 + 4 files changed, 64 insertions(+) create mode 100644 src/Mail/Mailer.php create mode 100644 src/Mail/WordpressMailServiceProvider.php diff --git a/src/Mail/Mailer.php b/src/Mail/Mailer.php new file mode 100644 index 0000000..c441057 --- /dev/null +++ b/src/Mail/Mailer.php @@ -0,0 +1,39 @@ +to($to)->subject($subject); + + if (!is_array($attachments)) { + $attachments = explode("\n", str_replace("\r\n", "\n", $attachments)); + } + + $attachments = array_filter($attachments); + + if (!empty($attachments)) { + foreach ($attachments as $attachment) { + $message->attach($attachment); + } + } + }); + } +} diff --git a/src/Mail/WordpressMailServiceProvider.php b/src/Mail/WordpressMailServiceProvider.php new file mode 100644 index 0000000..89acc32 --- /dev/null +++ b/src/Mail/WordpressMailServiceProvider.php @@ -0,0 +1,22 @@ + + */ +class WordpressMailServiceProvider extends ServiceProvider +{ + /** + * Bootstrap any application services. + * + * @return void + */ + public function register() + { + include_once 'Mailer.php'; + } +} diff --git a/src/Providers/KoseligServiceProvider.php b/src/Providers/KoseligServiceProvider.php index f625a1d..5f446f3 100644 --- a/src/Providers/KoseligServiceProvider.php +++ b/src/Providers/KoseligServiceProvider.php @@ -4,6 +4,7 @@ namespace Koselig\Providers; use Illuminate\Support\ServiceProvider; use Koselig\Auth\AuthServiceProvider; use Koselig\Hashing\HashServiceProvider; +use Koselig\Mail\WordpressMailServiceProvider; use Koselig\Routing\RoutingServiceProvider; /** @@ -21,6 +22,7 @@ class KoseligServiceProvider extends ServiceProvider public function register() { // Generic service providers + $this->app->register(WordpressMailServiceProvider::class); $this->app->register(WordpressServiceProvider::class); $this->app->register(ConfigServiceProvider::class); $this->app->register(QueryServiceProvider::class); diff --git a/src/Providers/WordpressServiceProvider.php b/src/Providers/WordpressServiceProvider.php index 6d726eb..1d22bfd 100644 --- a/src/Providers/WordpressServiceProvider.php +++ b/src/Providers/WordpressServiceProvider.php @@ -4,6 +4,7 @@ namespace Koselig\Providers; use Illuminate\Contracts\Routing\UrlGenerator; use Illuminate\Support\Facades\DB; use Illuminate\Support\ServiceProvider; +use Koselig\Mail\WordpressMailServiceProvider; use Koselig\Support\Action; use Koselig\Support\Wordpress; -- libgit2 1.7.2