Reformat various code.

This commit is contained in:
James Cole
2022-03-29 14:59:58 +02:00
parent 29bed2547c
commit d1a09ff33b
115 changed files with 2700 additions and 2699 deletions

View File

@@ -53,6 +53,6 @@ class AccessTokenCreatedMail extends Mailable
{
return $this
->markdown('emails.token-created')
->subject((string)trans('email.access_token_created_subject'));
->subject((string) trans('email.access_token_created_subject'));
}
}

View File

@@ -46,7 +46,7 @@ class AdminTestMail extends Mailable
*/
public function __construct(string $email)
{
$this->email = $email;
$this->email = $email;
}
/**
@@ -58,6 +58,6 @@ class AdminTestMail extends Mailable
{
return $this
->markdown('emails.admin-test')
->subject((string)trans('email.admin_test_subject'));
->subject((string) trans('email.admin_test_subject'));
}
}

View File

@@ -34,8 +34,8 @@ class BillWarningMail extends Mailable
use Queueable, SerializesModels;
public Bill $bill;
public string $field;
public int $diff;
public string $field;
/**
* ConfirmEmailChangeMail constructor.
@@ -46,9 +46,9 @@ class BillWarningMail extends Mailable
*/
public function __construct(Bill $bill, string $field, int $diff)
{
$this->bill = $bill;
$this->field = $field;
$this->diff = $diff;
$this->bill = $bill;
$this->field = $field;
$this->diff = $diff;
}
/**

View File

@@ -51,9 +51,9 @@ class ConfirmEmailChangeMail extends Mailable
*/
public function __construct(string $newEmail, string $oldEmail, string $url)
{
$this->newEmail = $newEmail;
$this->oldEmail = $oldEmail;
$this->url = $url;
$this->newEmail = $newEmail;
$this->oldEmail = $oldEmail;
$this->url = $url;
}
/**
@@ -66,7 +66,7 @@ class ConfirmEmailChangeMail extends Mailable
return $this
//->view('emails.confirm-email-change-html')
//->text('emails.confirm-email-change-text')
->markdown('emails.confirm-email-change')
->markdown('emails.confirm-email-change')
->subject((string) trans('email.email_change_subject'));
}
}

View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Mail;
use Exception;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
@@ -56,11 +57,11 @@ class NewIPAddressWarningMail extends Mailable
*/
public function build(): self
{
$this->time = now(config('app.timezone'))->isoFormat((string)trans('config.date_time_js'));
$this->time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js'));
$this->host = '';
try {
$hostName = gethostbyaddr($this->ipAddress);
} catch(\Exception $e) {
} catch (Exception $e) {
$hostName = $this->ipAddress;
}
if ($hostName !== $this->ipAddress) {
@@ -69,6 +70,6 @@ class NewIPAddressWarningMail extends Mailable
return $this
->markdown('emails.new-ip')
->subject((string)trans('email.login_from_new_ip'));
->subject((string) trans('email.login_from_new_ip'));
}
}

View File

@@ -47,7 +47,7 @@ class RegisteredUser extends Mailable
*/
public function __construct(string $address)
{
$this->address = $address;
$this->address = $address;
}
/**
@@ -59,6 +59,6 @@ class RegisteredUser extends Mailable
{
return $this
->markdown('emails.registered')
->subject((string)trans('email.registered_subject'));
->subject((string) trans('email.registered_subject'));
}
}

View File

@@ -46,7 +46,7 @@ class RequestedNewPassword extends Mailable
*/
public function __construct(string $url)
{
$this->url = $url;
$this->url = $url;
}
/**
@@ -58,6 +58,6 @@ class RequestedNewPassword extends Mailable
{
return $this
->markdown('emails.password')
->subject((string)trans('email.reset_pw_subject'));
->subject((string) trans('email.reset_pw_subject'));
}
}

View File

@@ -48,9 +48,9 @@ class UndoEmailChangeMail extends Mailable
*/
public function __construct(string $newEmail, string $oldEmail, string $url)
{
$this->newEmail = $newEmail;
$this->oldEmail = $oldEmail;
$this->url = $url;
$this->newEmail = $newEmail;
$this->oldEmail = $oldEmail;
$this->url = $url;
}
/**
@@ -62,6 +62,6 @@ class UndoEmailChangeMail extends Mailable
{
return $this
->markdown('emails.undo-email-change')
->subject((string)trans('email.email_change_subject'));
->subject((string) trans('email.email_change_subject'));
}
}