changed event class name

README.md

@@ -706,4 +706,4 @@ Mail::to($request->user())->send(new OrderShipped($order));
 <a name="events"></a>
 ## 事件
 
-在发送邮件消息的时候，组件会触发两个事件。`MessageSending` 事件在发送消息前触发，`MessageSent` 事件在消息发送完成后触发。记住，这些事件都是在邮件被**发送**时触发，而不是在队列化的时候。
+在发送邮件消息的时候，组件会触发两个事件。`MailMessageSending` 事件在发送消息前触发，`MailMessageSent` 事件在消息发送完成后触发。记住，这些事件都是在邮件被**发送**时触发，而不是在队列化的时候。

src/Events/MessageSending.php → src/Events/MailMessageSending.php

@@ -12,7 +12,7 @@
 
 use Swift_Message;
 
-class MessageSending
+class MailMessageSending
 {
  /**
  * The Swift message instance.

src/Events/MessageSent.php → src/Events/MailMessageSent.php

@@ -13,7 +13,7 @@
 use Swift_Attachment;
 use Swift_Message;
 
-class MessageSent
+class MailMessageSent
 {
  /**
  * The Swift message instance.

src/Mailer.php

@@ -15,8 +15,8 @@
 use HyperfExt\Mail\Concerns\PendingMailable;
 use HyperfExt\Mail\Contracts\MailableInterface;
 use HyperfExt\Mail\Contracts\MailerInterface;
-use HyperfExt\Mail\Events\MessageSending;
-use HyperfExt\Mail\Events\MessageSent;
+use HyperfExt\Mail\Events\MailMessageSending;
+use HyperfExt\Mail\Events\MailMessageSent;
 use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Swift_Mailer;
@@ -178,11 +178,11 @@ public function sendNow(MailableInterface $mailable): ?array
  // its recipients. We will then fire the sent event for the sent message.
  $swiftMessage = $message->getSwiftMessage();
 
- $this->eventDispatcher->dispatch(new MessageSending($swiftMessage, $data));
+ $this->eventDispatcher->dispatch(new MailMessageSending($swiftMessage, $data));
 
  $this->sendSwiftMessage($swiftMessage, $failedRecipients);
 
- $this->eventDispatcher->dispatch(new MessageSent($swiftMessage, $data));
+ $this->eventDispatcher->dispatch(new MailMessageSent($swiftMessage, $data));
 
  return $failedRecipients;
  }

tests/MailMailerTest.php

@@ -12,8 +12,8 @@
 
 use Hyperf\Utils\ApplicationContext;
 use HyperfExt\Mail\Contracts\MailableInterface;
-use HyperfExt\Mail\Events\MessageSending;
-use HyperfExt\Mail\Events\MessageSent;
+use HyperfExt\Mail\Events\MailMessageSending;
+use HyperfExt\Mail\Events\MailMessageSent;
 use HyperfExt\Mail\Mailer;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -39,8 +39,8 @@ public function testGlobalFromIsRespectedOnAllMessages()
  $mailable = m::mock(MailableInterface::class);
  $mailable->shouldReceive('handler')->once()->andReturn(null);
  $events = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSending::class));
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSent::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSending::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSent::class));
  $mailer = $this->getMailer();
  $this->setSwiftMailer($mailer);
  $mailer->setAlwaysFrom('eric@zhu.email', 'Taylor Otwell');
@@ -56,8 +56,8 @@ public function testGlobalReturnPathIsRespectedOnAllMessages()
  $mailable = m::mock(MailableInterface::class);
  $mailable->shouldReceive('handler')->once()->andReturn(null);
  $events = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSending::class));
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSent::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSending::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSent::class));
  $mailer = $this->getMailer();
  $this->setSwiftMailer($mailer);
  $mailer->setAlwaysReturnPath('eric@zhu.email');
@@ -73,8 +73,8 @@ public function testFailedRecipientsAreAppendedAndCanBeRetrieved()
  $mailable = m::mock(MailableInterface::class);
  $mailable->shouldReceive('handler')->once()->andReturn(null);
  $events = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSending::class));
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSent::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSending::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSent::class));
  $mailer = $this->getMailer();
  $mailer->getSwiftMailer()->shouldReceive('getTransport')->andReturn($transport = m::mock(Swift_Transport::class));
  $transport->shouldReceive('stop');
@@ -93,8 +93,8 @@ public function testEventsAreDispatched()
  $mailable = m::mock(MailableInterface::class);
  $mailable->shouldReceive('handler')->once()->andReturn(null);
  $events = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSending::class));
- $events->shouldReceive('dispatch')->once()->with(m::type(MessageSent::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSending::class));
+ $events->shouldReceive('dispatch')->once()->with(m::type(MailMessageSent::class));
  $mailer = $this->getMailer($events);
  $this->setSwiftMailer($mailer);
  $mailer->getSwiftMailer()->shouldReceive('send')->once()->with(m::type(Swift_Message::class), []);