fix name of email "from" not recognized

(close #187)
This commit is contained in:
Pig Fang 2020-06-21 18:57:48 +08:00
parent a7b9d19b9b
commit 5a42f3c44d
4 changed files with 2 additions and 27 deletions

View File

@ -13,26 +13,16 @@ class EmailVerification extends Mailable
public $url; public $url;
/**
* Create a new message instance.
*
* @return void
*/
public function __construct($url) public function __construct($url)
{ {
$this->url = $url; $this->url = $url;
} }
/**
* Build the message.
*
* @return $this
*/
public function build() public function build()
{ {
$site_name = option_localized('site_name'); $site_name = option_localized('site_name');
return $this->from(config('mail.from')) return $this
->subject(trans('user.verification.mail.title', ['sitename' => $site_name])) ->subject(trans('user.verification.mail.title', ['sitename' => $site_name]))
->view('mails.email-verification'); ->view('mails.email-verification');
} }

View File

@ -11,31 +11,18 @@ class ForgotPassword extends Mailable
use Queueable; use Queueable;
use SerializesModels; use SerializesModels;
/**
* @var string
*/
public $url = ''; public $url = '';
/**
* Create a new message instance.
*
* @return void
*/
public function __construct(string $url) public function __construct(string $url)
{ {
$this->url = $url; $this->url = $url;
} }
/**
* Build the message.
*
* @return $this
*/
public function build() public function build()
{ {
$site_name = option_localized('site_name'); $site_name = option_localized('site_name');
return $this->from(config('mail.from')) return $this
->subject(trans('auth.forgot.mail.title', ['sitename' => $site_name])) ->subject(trans('auth.forgot.mail.title', ['sitename' => $site_name]))
->view('mails.password-reset'); ->view('mails.password-reset');
} }

View File

@ -624,7 +624,6 @@ class AuthControllerTest extends TestCase
$site_name = option_localized('site_name'); $site_name = option_localized('site_name');
$mailable = new ForgotPassword('url'); $mailable = new ForgotPassword('url');
$mailable->build(); $mailable->build();
$this->assertTrue($mailable->hasFrom(config('mail.from.address')));
$this->assertEquals(trans('auth.forgot.mail.title', ['sitename' => $site_name]), $mailable->subject); $this->assertEquals(trans('auth.forgot.mail.title', ['sitename' => $site_name]), $mailable->subject);
$this->assertEquals('mails.password-reset', $mailable->view); $this->assertEquals('mails.password-reset', $mailable->view);
} }

View File

@ -212,7 +212,6 @@ class UserControllerTest extends TestCase
$site_name = option_localized('site_name'); $site_name = option_localized('site_name');
$mailable = new EmailVerification('url'); $mailable = new EmailVerification('url');
$mailable->build(); $mailable->build();
$this->assertTrue($mailable->hasFrom(config('mail.from.address')));
$this->assertEquals(trans('user.verification.mail.title', ['sitename' => $site_name]), $mailable->subject); $this->assertEquals(trans('user.verification.mail.title', ['sitename' => $site_name]), $mailable->subject);
$this->assertEquals('mails.email-verification', $mailable->view); $this->assertEquals('mails.email-verification', $mailable->view);
} }