Implement PHP CS Fixer and a coding standard to follow (#471)

* Create PHP CS Fixer config and add to CI workflow

* Run php cs fixer on project

* Add newline at end of file

* Update to use PHP CS Fixer v3

* Run v3 config on project

* Run seperate config in CI
This commit is contained in:
Mwikala Kangwa
2021-05-21 12:57:51 +01:00
committed by GitHub
parent 633cad9b89
commit 9e98a96d61
316 changed files with 4715 additions and 3195 deletions

View File

@ -3,13 +3,13 @@
namespace Crater\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class EstimateViewedMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $data;
@ -32,6 +32,7 @@ class EstimateViewedMail extends Mailable
{
$email = $this->data['user']['email'];
$name = $this->data['user']['name'];
return $this->from($email, $name)
->markdown('emails.viewed.estimate', ['data', $this->data]);
}

View File

@ -3,13 +3,13 @@
namespace Crater\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class InvoiceViewedMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $data;
@ -32,6 +32,7 @@ class InvoiceViewedMail extends Mailable
{
$email = $this->data['user']['email'];
$name = $this->data['user']['name'];
return $this->from($email, $name)
->markdown('emails.viewed.invoice', ['data', $this->data]);
}

View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Mail;
use Crater\Models\EmailLog;
@ -6,11 +7,11 @@ use Crater\Models\Estimate;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class SendEstimateMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $data = [];
@ -37,19 +38,20 @@ class SendEstimateMail extends Mailable
'subject' => $this->data['subject'],
'body' => $this->data['body'],
'mailable_type' => Estimate::class,
'mailable_id' => $this->data['estimate']['id']
'mailable_id' => $this->data['estimate']['id'],
]);
$mailContent = $this->from($this->data['from'], config('mail.from.name'))
->subject($this->data['subject'])
->markdown('emails.send.estimate', ['data', $this->data]);
if ($this->data['attach']['data'])
if ($this->data['attach']['data']) {
$mailContent->attachData(
$this->data['attach']['data']->output(),
$this->data['estimate']['estimate_number'] . '.pdf'
$this->data['attach']['data']->output(),
$this->data['estimate']['estimate_number'].'.pdf'
);
}
return $mailContent;
}
}

View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Mail;
use Config;
@ -7,11 +8,11 @@ use Crater\Models\Invoice;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class SendInvoiceMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $data = [];
@ -38,19 +39,20 @@ class SendInvoiceMail extends Mailable
'subject' => $this->data['subject'],
'body' => $this->data['body'],
'mailable_type' => Invoice::class,
'mailable_id' => $this->data['invoice']['id']
'mailable_id' => $this->data['invoice']['id'],
]);
$mailContent = $this->from($this->data['from'], config('mail.from.name'))
->subject($this->data['subject'])
->markdown('emails.send.invoice', ['data', $this->data]);
if ($this->data['attach']['data'])
if ($this->data['attach']['data']) {
$mailContent->attachData(
$this->data['attach']['data']->output(),
$this->data['invoice']['invoice_number'] . '.pdf'
$this->data['attach']['data']->output(),
$this->data['invoice']['invoice_number'].'.pdf'
);
}
return $mailContent;
}
}

View File

@ -5,13 +5,13 @@ namespace Crater\Mail;
use Crater\Models\EmailLog;
use Crater\Models\Payment;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class SendPaymentMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $data = [];
@ -38,19 +38,20 @@ class SendPaymentMail extends Mailable
'subject' => $this->data['subject'],
'body' => $this->data['body'],
'mailable_type' => Payment::class,
'mailable_id' => $this->data['payment']['id']
'mailable_id' => $this->data['payment']['id'],
]);
$mailContent = $this->from($this->data['from'], config('mail.from.name'))
->subject($this->data['subject'])
->markdown('emails.send.payment', ['data', $this->data]);
if ($this->data['attach']['data'])
if ($this->data['attach']['data']) {
$mailContent->attachData(
$this->data['attach']['data']->output(),
$this->data['payment']['payment_number'] . '.pdf'
$this->data['attach']['data']->output(),
$this->data['payment']['payment_number'].'.pdf'
);
}
return $mailContent;
}
}

View File

@ -1,15 +1,18 @@
<?php
namespace Crater\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class TestMail extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
public $subject;
public $message;
/**
@ -32,7 +35,7 @@ class TestMail extends Mailable
public function build()
{
return $this->subject($this->subject)->markdown('emails.test')->with([
'my_message' => $this->message
'my_message' => $this->message,
]);
}
}