kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:42:26 +01:00
parent dbf3e76ecc
commit 6cfdc58cb1
415 changed files with 7462 additions and 6874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Mail/AccessTokenCreatedMail.php
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'));
}
}

3
app/Mail/AdminTestMail.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* AdminTestMail.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -56,6 +57,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'));
}
}

10
app/Mail/BillWarningMail.php
View File

@@ -41,9 +41,9 @@ class BillWarningMail extends Mailable
/**
* ConfirmEmailChangeMail constructor.
*
* @param Bill $bill
* @param string $field
* @param int $diff
* @param Bill $bill
* @param string $field
* @param int $diff
*/
public function __construct(Bill $bill, string $field, int $diff)
{
@@ -59,9 +59,9 @@ class BillWarningMail extends Mailable
*/
public function build(): self
{
$subject = (string) trans(sprintf('email.bill_warning_subject_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
$subject = (string)trans(sprintf('email.bill_warning_subject_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
if (0 === $this->diff) {
$subject = (string) trans(sprintf('email.bill_warning_subject_now_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
$subject = (string)trans(sprintf('email.bill_warning_subject_now_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
}
return $this

9
app/Mail/ConfirmEmailChangeMail.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* ConfirmEmailChangeMail.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -45,9 +46,9 @@ class ConfirmEmailChangeMail extends Mailable
/**
* ConfirmEmailChangeMail constructor.
*
* @param string $newEmail
* @param string $oldEmail
* @param string $url
* @param string $newEmail
* @param string $oldEmail
* @param string $url
*/
public function __construct(string $newEmail, string $oldEmail, string $url)
{
@@ -67,6 +68,6 @@ class ConfirmEmailChangeMail extends Mailable
//->view('emails.confirm-email-change-html')
//->text('emails.confirm-email-change-text')
->markdown('emails.confirm-email-change')
->subject((string) trans('email.email_change_subject'));
->subject((string)trans('email.email_change_subject'));
}
}

14
app/Mail/InvitationMail.php
View File

@@ -33,22 +33,22 @@ class InvitationMail extends Mailable
use Queueable;
use SerializesModels;
public string $invitee;
public string $admin;
public string $url;
public string $host;
public string $invitee;
public string $url;
/**
* OAuthTokenCreatedMail constructor.
*
* @param string $ipAddress
* @param string $ipAddress
*/
public function __construct(string $invitee, string $admin, string $url)
{
$this->invitee = $invitee;
$this->admin = $admin;
$this->url = $url;
$this->host = parse_url($url, PHP_URL_HOST);
$this->admin = $admin;
$this->url = $url;
$this->host = parse_url($url, PHP_URL_HOST);
}
/**
@@ -60,6 +60,6 @@ class InvitationMail extends Mailable
{
return $this
->markdown('emails.invitation')
->subject((string) trans('email.invite_user_subject'));
->subject((string)trans('email.invite_user_subject'));
}
}

6
app/Mail/NewIPAddressWarningMail.php
View File

@@ -44,7 +44,7 @@ class NewIPAddressWarningMail extends Mailable
/**
* OAuthTokenCreatedMail constructor.
*
* @param string $ipAddress
* @param string $ipAddress
*/
public function __construct(string $ipAddress)
{
@@ -58,7 +58,7 @@ 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);
@@ -71,6 +71,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'));
}
}

4
app/Mail/OAuthTokenCreatedMail.php
View File

@@ -43,7 +43,7 @@ class OAuthTokenCreatedMail extends Mailable
/**
* OAuthTokenCreatedMail constructor.
*
* @param Client $client
* @param Client $client
*/
public function __construct(Client $client)
{
@@ -59,6 +59,6 @@ class OAuthTokenCreatedMail extends Mailable
{
return $this
->markdown('emails.oauth-client-created')
->subject((string) trans('email.oauth_created_subject'));
->subject((string)trans('email.oauth_created_subject'));
}
}

4
app/Mail/RegisteredUser.php
View File

@@ -44,7 +44,7 @@ class RegisteredUser extends Mailable
/**
* Create a new message instance.
*
* @param string $address
* @param string $address
*/
public function __construct(string $address)
{
@@ -60,6 +60,6 @@ class RegisteredUser extends Mailable
{
return $this
->markdown('emails.registered')
->subject((string) trans('email.registered_subject'));
->subject((string)trans('email.registered_subject'));
}
}

5
app/Mail/ReportNewJournalsMail.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* ReportNewJournalsMail.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -47,7 +48,7 @@ class ReportNewJournalsMail extends Mailable
/**
* ConfirmEmailChangeMail constructor.
*
* @param Collection $groups
* @param Collection $groups
*/
public function __construct(Collection $groups)
{
@@ -65,7 +66,7 @@ class ReportNewJournalsMail extends Mailable
return $this
->markdown('emails.report-new-journals')
->subject((string) trans_choice('email.new_journals_subject', $this->groups->count()));
->subject((string)trans_choice('email.new_journals_subject', $this->groups->count()));
}
private function transform(): void

4
app/Mail/RequestedNewPassword.php
View File

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

9
app/Mail/UndoEmailChangeMail.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* UndoEmailChangeMail.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -43,9 +44,9 @@ class UndoEmailChangeMail extends Mailable
/**
* UndoEmailChangeMail constructor.
*
* @param string $newEmail
* @param string $oldEmail
* @param string $url
* @param string $newEmail
* @param string $oldEmail
* @param string $url
*/
public function __construct(string $newEmail, string $oldEmail, string $url)
{
@@ -63,6 +64,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'));
}
}