Lint PHP code psr-12, add GH action
This commit is contained in:
@@ -6,12 +6,12 @@ use App\Mail\OpenFormMail;
|
||||
use App\Models\Forms\Form;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
class FormCreationConfirmationMail extends OpenFormMail implements ShouldQueue
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
@@ -31,8 +31,8 @@ class FormCreationConfirmationMail extends OpenFormMail implements ShouldQueue
|
||||
public function build()
|
||||
{
|
||||
return $this
|
||||
->markdown('mail.form.created',[
|
||||
'form' => $this->form,
|
||||
])->subject('Your form was created!');
|
||||
->markdown('mail.form.created', [
|
||||
'form' => $this->form,
|
||||
])->subject('Your form was created!');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,13 +8,14 @@ use App\Service\Forms\FormSubmissionFormatter;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Str;
|
||||
use Vinkla\Hashids\Facades\Hashids;
|
||||
|
||||
class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
@@ -22,7 +23,8 @@ class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(private FormSubmitted $event)
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the message.
|
||||
@@ -42,23 +44,25 @@ class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
|
||||
->replyTo($this->getReplyToEmail($form->creator->email))
|
||||
->from($this->getFromEmail(), $form->notification_sender)
|
||||
->subject($form->notification_subject)
|
||||
->markdown('mail.form.confirmation-submission-notification',[
|
||||
->markdown('mail.form.confirmation-submission-notification', [
|
||||
'fields' => $formatter->getFieldsWithValue(),
|
||||
'form' => $form,
|
||||
'noBranding' => $form->no_branding,
|
||||
'submission_id' => (isset($this->event->data['submission_id']) && $this->event->data['submission_id']) ? Hashids::encode($this->event->data['submission_id']) : null
|
||||
'submission_id' => (isset($this->event->data['submission_id']) && $this->event->data['submission_id']) ? Hashids::encode($this->event->data['submission_id']) : null,
|
||||
]);
|
||||
}
|
||||
|
||||
private function getFromEmail()
|
||||
{
|
||||
$originalFromAddress = Str::of(config('mail.from.address'))->explode('@');
|
||||
return $originalFromAddress->first(). '+' . time() . '@' . $originalFromAddress->last();
|
||||
|
||||
return $originalFromAddress->first().'+'.time().'@'.$originalFromAddress->last();
|
||||
}
|
||||
|
||||
private function getReplyToEmail($default)
|
||||
{
|
||||
$replyTo = Arr::get((array)$this->event->form->notification_settings, 'confirmation_reply_to', null);
|
||||
$replyTo = Arr::get((array) $this->event->form->notification_settings, 'confirmation_reply_to', null);
|
||||
|
||||
return $replyTo ?? $default;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
namespace App\Mail;
|
||||
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
abstract class OpenFormMail extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user