Merge branch 'event-message-sent' of https://github.com/CyrilMazur/laravel-framework into CyrilMazur-event-message-sent

Author: taylorotwell

src/Illuminate/Mail/Events/MessageSent.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Mail\Events;
+
+class MessageSent
+{
+    /**
+     * The Swift message instance.
+     *
+     * @var \Swift_Message
+     */
+    public $message;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  \Swift_Message  $message
+     * @return void
+     */
+    public function __construct($message)
+    {
+        $this->message = $message;
+    }
+}

src/Illuminate/Mail/Mailer.php

@@ -206,6 +206,10 @@ public function send($view, array $data = [], $callback = null)
         }
 
         $this->sendSwiftMessage($message->getSwiftMessage());
+
+        if ($this->events) {
+            $this->events->dispatch(new Events\MessageSent($message->getSwiftMessage()));
+        }
     }
 
     /**

tests/Mail/MailMailerTest.php

@@ -132,9 +132,25 @@ public function testFailedRecipientsAreAppendedAndCanBeRetrieved()
         $this->assertEquals(['[email protected]'], $mailer->failures());
     }
 
-    protected function getMailer()
+    public function testEventsAreDispatched()
     {
-        return new \Illuminate\Mail\Mailer(m::mock('Illuminate\Contracts\View\Factory'), m::mock('Swift_Mailer'));
+        unset($_SERVER['__mailer.test']);
+        $events = m::mock('Illuminate\Contracts\Events\Dispatcher');
+        $events->shouldReceive('until')->once()->with(m::type('Illuminate\Mail\Events\MessageSending'));
+        $events->shouldReceive('dispatch')->once()->with(m::type('Illuminate\Mail\Events\MessageSent'));
+        $mailer = $this->getMailer($events);
+        $view = m::mock('StdClass');
+        $mailer->getViewFactory()->shouldReceive('make')->once()->andReturn($view);
+        $view->shouldReceive('render')->once()->andReturn('rendered.view');
+        $this->setSwiftMailer($mailer);
+        $mailer->getSwiftMailer()->shouldReceive('send')->once()->with(m::type('Swift_Message'), []);
+        $mailer->send('foo', ['data'], function ($m) {
+        });
+    }
+
+    protected function getMailer($events = null)
+    {
+        return new \Illuminate\Mail\Mailer(m::mock('Illuminate\Contracts\View\Factory'), m::mock('Swift_Mailer'), $events);
     }
 
     public function setSwiftMailer($mailer)