changed HasMailAddress and ShouldQueue interface

README.md

@@ -503,7 +503,7 @@ public function build()
 
 ## 发送邮件
 
-若要发送邮件，使用 `Mail` 辅助类的 `to` 方法。`to` 方法接受邮件地址、邮件地址数组以及实现 `HasMailAddressInterface` 接口的实例或实例集合。如果传递一个邮件地址数组，那么它必须是包含字符串地址的一位数组或是包含具有 `email` 和 `name` 键的数组的二维数组，mailer 在设置收件人时会自动设置。一旦指定了收件人，就可以将 `Mailable` 类实例传递给 `send` 方法：
+若要发送邮件，使用 `Mail` 辅助类的 `to` 方法。`to` 方法接受邮件地址、邮件地址数组以及实现 `HyperfExt/Contract/HasMailAddress` 接口的实例或实例集合。如果传递一个邮件地址数组，那么它必须是包含字符串地址的一位数组或是包含具有 `email` 和 `name` 键的数组的二维数组，mailer 在设置收件人时会自动设置。一旦指定了收件人，就可以将 `Mailable` 类实例传递给 `send` 方法：
 
 ```php
 <?php
@@ -598,13 +598,13 @@ Mail::to($request->user())
 
 #### 默认使用队列
 
-如果你希望你的邮件类始终使用队列，您可以给邮件类 `HyperfExt\Mail\Contracts\ShouldQueueInterface` 接口，现在即使你调用了 `send` 方法，邮件依旧使用队列的方式发送。另外，如果需要将邮件推送到指定队列，可以设置在邮件类中设置 `queue` 属性。
+如果你希望你的邮件类始终使用队列，您可以给邮件类 `HyperfExt\Contract\ShouldQueue` 接口，现在即使你调用了 `send` 方法，邮件依旧使用队列的方式发送。另外，如果需要将邮件推送到指定队列，可以设置在邮件类中设置 `queue` 属性。
 
 ```php
-use HyperfExt\Mail\Contracts\ShouldQueueInterface;
+use HyperfExt\Contract\ShouldQueue;
 use HyperfExt\Mail\Mailable;
 
-class OrderShipped extends Mailable implements ShouldQueueInterface
+class OrderShipped extends Mailable implements ShouldQueue
 {
     /**
      * 列队名称。
@@ -656,7 +656,7 @@ Mail::to($request->user())->locale('es')->send(
 
 ### 用户的个性化翻译
 
-有时，应用程序会为每个用户存储不同的区域设置。通过在一个或多个模型上实现 `getPreferredLocale(): string` 方法，可以指示组件在发送邮件时使用此存储的区域设置:
+有时，应用程序会为每个用户存储不同的区域设置。通过在一个或多个模型上实现 `HyperfExt/Contract/HasLocalePreference` 接口，可以指示组件在发送邮件时使用此存储的区域设置:
 
 ```php
 class User extends Model

composer.json

@@ -32,6 +32,7 @@
         "php": ">=7.2",
         "ext-json": "*",
         "ext-swoole": ">=4.5",
+        "hyperf-ext/contract": "^2.0",
         "hyperf/async-queue": "^2.0",
         "hyperf/command": "^2.0",
         "hyperf/config": "^2.0",
@@ -40,7 +41,6 @@
         "hyperf/event": "^2.0",
         "hyperf/filesystem": "^2.0",
         "hyperf/framework": "^2.0",
-        "hyperf/guzzle": "^2.0",
         "hyperf/translation": "^2.0",
         "hyperf/view": "^2.0",
         "swiftmailer/swiftmailer": "^6.0"

src/Commands/stubs/mail.stub

@@ -10,10 +10,10 @@ declare(strict_types=1);
  */
 namespace %NAMESPACE%;
 
-use HyperfExt\Mail\Contracts\ShouldQueueInterface;
+use HyperfExt\Contract\ShouldQueue;
 use HyperfExt\Mail\Mailable;
 
-class %CLASS% extends Mailable implements ShouldQueueInterface
+class %CLASS% extends Mailable implements ShouldQueue
 {
     /**
      * Create a new message instance.

src/Contracts/MailableInterface.php

@@ -15,7 +15,7 @@ interface MailableInterface
     /**
      * Set the sender of the message.
      *
-     * @param \HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param \HyperfExt\Contract\HasMailAddress|string $address
      *
      * @return $this
      */
@@ -24,7 +24,7 @@ public function from($address, ?string $name = null);
     /**
      * Set the "reply to" address of the message.
      *
-     * @param \HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param \HyperfExt\Contract\HasMailAddress|string $address
      *
      * @return $this
      */
@@ -33,7 +33,7 @@ public function replyTo($address, ?string $name = null);
     /**
      * Add the recipient of the message.
      *
-     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Contract\HasMailAddress|string $address
      *
      * @return $this
      */
@@ -42,14 +42,14 @@ public function cc($address, ?string $name = null);
     /**
      * Determine if the given recipient is set on the mailable.
      *
-     * @param \HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param \HyperfExt\Contract\HasMailAddress|string $address
      */
     public function hasCc($address, ?string $name = null): bool;
 
     /**
      * Add the recipients of the message.
      *
-     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Contract\HasMailAddress|string $address
      *
      * @return $this
      */
@@ -58,14 +58,14 @@ public function bcc($address, ?string $name = null);
     /**
      * Determine if the given recipient is set on the mailable.
      *
-     * @param \HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param \HyperfExt\Contract\HasMailAddress|string $address
      */
     public function hasBcc($address, ?string $name = null): bool;
 
     /**
      * Add the recipients of the message.
      *
-     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param array|\Hyperf\Utils\Collection|\HyperfExt\Contract\HasMailAddress|string $address
      *
      * @return $this
      */
@@ -74,7 +74,7 @@ public function to($address, ?string $name = null);
     /**
      * Determine if the given recipient is set on the mailable.
      *
-     * @param \HyperfExt\Mail\Contracts\HasMailAddressInterface|string $address
+     * @param \HyperfExt\Contract\HasMailAddress|string $address
      */
     public function hasTo($address, ?string $name = null): bool;
 

src/MailManager.php

@@ -14,11 +14,11 @@
 use Hyperf\Logger\LoggerFactory;
 use Hyperf\Utils\Arr;
 use Hyperf\Utils\Str;
+use HyperfExt\Contract\ShouldQueue;
 use HyperfExt\Mail\Concerns\PendingMailable;
 use HyperfExt\Mail\Contracts\MailableInterface;
 use HyperfExt\Mail\Contracts\MailerInterface;
 use HyperfExt\Mail\Contracts\MailManagerInterface;
-use HyperfExt\Mail\Contracts\ShouldQueueInterface;
 use InvalidArgumentException;
 use Psr\Container\ContainerInterface;
 use Swift_DependencyContainer;
@@ -100,7 +100,7 @@ public function get(string $name): MailerInterface
      */
     public function send(MailableInterface $mailable)
     {
-        return $mailable instanceof ShouldQueueInterface
+        return $mailable instanceof ShouldQueue
             ? $mailable->queue()
             : $mailable->send($this);
     }

src/Mailable.php

@@ -22,7 +22,7 @@
 use Hyperf\Utils\Str;
 use Hyperf\Utils\Traits\ForwardsCalls;
 use Hyperf\View\RenderInterface;
-use HyperfExt\Mail\Contracts\HasMailAddressInterface;
+use HyperfExt\Contract\HasMailAddress;
 use HyperfExt\Mail\Contracts\MailableInterface;
 use HyperfExt\Mail\Contracts\MailerInterface;
 use HyperfExt\Mail\Contracts\MailManagerInterface;
@@ -489,7 +489,7 @@ protected function arrayizeAddress($address, ?string $name = null): array
                         'address' => $item['address'],
                         'name' => $item['name'] ?? null,
                     ];
-                } elseif (is_string($item) or $item instanceof HasMailAddressInterface) {
+                } elseif (is_string($item) or $item instanceof HasMailAddress) {
                     $addresses[] = $this->normalizeRecipient($item);
                 }
             }
@@ -502,11 +502,11 @@ protected function arrayizeAddress($address, ?string $name = null): array
     /**
      * Convert the given recipient into an object.
      *
-     * @param HasMailAddressInterface|string $address
+     * @param HasMailAddress|string $address
      */
     protected function normalizeRecipient($address, ?string $name = null): array
     {
-        if ($address instanceof HasMailAddressInterface) {
+        if ($address instanceof HasMailAddress) {
             $name = $address->getMailAddressDisplayName();
             $address = $address->getMailAddress();
         }

src/Mailer.php

@@ -11,10 +11,10 @@
 namespace HyperfExt\Mail;
 
 use Hyperf\Utils\Traits\Macroable;
+use HyperfExt\Contract\ShouldQueue;
 use HyperfExt\Mail\Concerns\PendingMailable;
 use HyperfExt\Mail\Contracts\MailableInterface;
 use HyperfExt\Mail\Contracts\MailerInterface;
-use HyperfExt\Mail\Contracts\ShouldQueueInterface;
 use HyperfExt\Mail\Events\MessageSending;
 use HyperfExt\Mail\Events\MessageSent;
 use Psr\Container\ContainerInterface;
@@ -189,7 +189,7 @@ public function sendNow(MailableInterface $mailable): ?array
 
     public function send(MailableInterface $mailable)
     {
-        return $mailable instanceof ShouldQueueInterface
+        return $mailable instanceof ShouldQueue
             ? $mailable->mailer($this->name)->queue()
             : $mailable->mailer($this->name)->send($this);
     }

src/PendingMail.php

@@ -11,6 +11,7 @@
 namespace HyperfExt\Mail;
 
 use Hyperf\Utils\ApplicationContext;
+use HyperfExt\Contract\HasLocalePreference;
 use HyperfExt\Mail\Contracts\MailableInterface;
 use HyperfExt\Mail\Contracts\MailManagerInterface;
 
@@ -85,7 +86,7 @@ public function to($users)
 
         if (! $this->locale &&
             is_object($users) &&
-            method_exists($users, 'getPreferredLocale') &&
+            $users instanceof HasLocalePreference &&
             is_string($locale = $users->getPreferredLocale())
         ) {
             $this->locale($locale);