Merge branch 'develop'

Author: ssfinney

.gitignore

@@ -3,3 +3,4 @@
 phpunit.xml
 /build
 composer.lock
+.idea/

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.5.0",
         "illuminate/support": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
-        "swiftmailer/swiftmailer": "~5.1"
+        "swiftmailer/swiftmailer": "~5.1|~6.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.1",

src/MailTracking.php

@@ -48,8 +48,10 @@ trait MailTracking
      */
     public function setUpMailTracking()
     {
-        Mail::getSwiftMailer()
-            ->registerPlugin(new MailRecorder($this));
+        $this->afterApplicationCreated(function () {
+            Mail::getSwiftMailer()
+                ->registerPlugin(new MailRecorder($this));
+        });
     }
 
     /**

tests/Stubs/MailTrackingStub.php

@@ -14,6 +14,18 @@ class MailTrackingStub extends PHPUnit_Framework_TestCase
 {
     use MailTracking;
 
+    /**
+     * Stubs Laravel's afterApplicationCreated() method so that tests can run normally
+     *
+     * @param  callable  $callback
+     *
+     * @return void
+     */
+    public function afterApplicationCreated(callable $callback)
+    {
+        call_user_func($callback);
+    }
+
     /**
      * Public method in the stub to expose the protected email collection
      *