Merge branch 'release/3.5' into v3.0

TeenQuotes · Feb 26, 2016 · 23f3a41 · 23f3a41
2 parents 57f47e5 + 3843234
commit 23f3a41
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 378 deletions.
diff --git a/.env.example b/.env.example
@@ -5,7 +5,6 @@ CACHE_DRIVER=file
 MAILGUN_DOMAIN=dummy
 MAILGUN_SECRET=dummy
 MAILGUN_PUBKEY=dummy
-MANDRILL_SECRET=dummy
 MAILCHIMP_SECRET=dummy
 EASYREC_APIKEY=dummy
 

diff --git a/app/TeenQuotes/Mail/Facades/MandrillClient.php b/app/TeenQuotes/Mail/Facades/MandrillClient.php
diff --git a/app/TeenQuotes/Mail/MailServiceProvider.php b/app/TeenQuotes/Mail/MailServiceProvider.php
@@ -11,8 +11,6 @@
 
 namespace TeenQuotes\Mail;
 
-use TeenQuotes\Mail\Transport\MandrillTransport;
-
 class MailServiceProvider extends \Illuminate\Mail\MailServiceProvider
 {
     public function register()
@@ -21,6 +19,7 @@ public function register()
 
         $this->registerViewComposers();
 
+        // Register a custom mailer to automatically inline CSS
         $this->app->bindShared('mailer', function ($app) use ($me) {
             $me->registerSwiftMailer();
 
@@ -53,20 +52,6 @@ public function register()
         });
     }
 
-    /**
-     * Register the Mandrill Swift Transport instance.
-     *
-     * @param array $config
-     */
-    protected function registerMandrillTransport($config)
-    {
-        $mandrill = $this->app['config']->get('services.mandrill', []);
-
-        $this->app->bindShared('swift.transport', function () use ($mandrill) {
-            return new MandrillTransport($mandrill['secret']);
-        });
-    }
-
     private function registerViewComposers()
     {
         // Welcome email

diff --git a/app/TeenQuotes/Mail/MailSwitcher.php b/app/TeenQuotes/Mail/MailSwitcher.php
@@ -48,9 +48,9 @@ public function __construct($driver)
                     Config::set('mail.from', Config::get('mail.from.smtp'));
                     break;
 
-                case 'mandrill':
-                    // Switch to Mandrill
-                    Config::set('mail.driver', 'mandrill');
+                case 'mailgun':
+                    // Switch to Mailgun
+                    Config::set('mail.driver', 'mailgun');
                     Config::set('mail.from', Config::get('mail.from'));
                     break;
             }
@@ -68,7 +68,7 @@ public function __construct($driver)
      */
     public static function getAvailableDrivers()
     {
-        return ['smtp', 'mandrill'];
+        return ['smtp', 'mailgun'];
     }
 
     /**

diff --git a/app/TeenQuotes/Mail/Mandrill.php b/app/TeenQuotes/Mail/Mandrill.php
diff --git a/app/TeenQuotes/Mail/MandrillServiceProvider.php b/app/TeenQuotes/Mail/MandrillServiceProvider.php
diff --git a/app/TeenQuotes/Mail/Transport/MandrillTransport.php b/app/TeenQuotes/Mail/Transport/MandrillTransport.php