TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/CompanyRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
@ -24,11 +25,11 @@ class CompanyRequest extends FormRequest
{
return [
'name' => [
'required'
'required',
],
'country_id' => [
'required'
]
'required',
],
];
}
}

15
app/Http/Requests/CompanySettingRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
@ -24,23 +25,23 @@ class CompanySettingRequest extends FormRequest
{
return [
'currency' => [
'required'
'required',
],
'time_zone' => [
'required'
'required',
],
'language' => [
'required'
'required',
],
'fiscal_year' => [
'required'
'required',
],
'moment_date_format' => [
'required'
'required',
],
'carbon_date_format' => [
'required'
]
'required',
],
];
}
}

12
app/Http/Requests/CustomerRequest.php
View File

@ -26,19 +26,19 @@ class CustomerRequest extends FormRequest
{
$rules = [
'name' => [
'required'
'required',
],
'addresses.*.address_street_1' => [
'max:255'
'max:255',
],
'addresses.*.address_street_2' => [
'max:255'
'max:255',
],
'email' => [
'email',
'nullable',
'unique:users,email',
]
],
];
if ($this->isMethod('PUT') && $this->email != null) {
@ -46,8 +46,8 @@ class CustomerRequest extends FormRequest
'email' => [
'email',
'nullable',
Rule::unique('users')->ignore($this->route('customer')->id)
]
Rule::unique('users')->ignore($this->route('customer')->id),
],
];
};

20
app/Http/Requests/DatabaseEnvironmentRequest.php
View File

@ -28,51 +28,53 @@ class DatabaseEnvironmentRequest extends FormRequest
return [
'app_url' => [
'required',
'url'
'url',
],
'app_domain' => [
'required',
],
'database_connection' => [
'required',
'string'
'string',
],
'database_name' => [
'required',
'string'
'string',
],
];
break;
default:
return [
'app_url' => [
'required',
'url'
'url',
],
'app_domain' => [
'required',
],
'database_connection' => [
'required',
'string'
'string',
],
'database_hostname' => [
'required',
'string'
'string',
],
'database_port' => [
'required',
'numeric'
'numeric',
],
'database_name' => [
'required',
'string'
'string',
],
'database_username' => [
'required',
'string'
'string',
],
];
break;
}

8
app/Http/Requests/DeleteCustomersRequest.php
View File

@ -2,8 +2,8 @@
namespace Crater\Http\Requests;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class DeleteCustomersRequest extends FormRequest
{
@ -26,12 +26,12 @@ class DeleteCustomersRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('users', 'id')
]
Rule::exists('users', 'id'),
],
];
}
}

6
app/Http/Requests/DeleteEstimatesRequest.php
View File

@ -26,12 +26,12 @@ class DeleteEstimatesRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('estimates', 'id')
]
Rule::exists('estimates', 'id'),
],
];
}
}

6
app/Http/Requests/DeleteExpensesRequest.php
View File

@ -26,12 +26,12 @@ class DeleteExpensesRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('expenses', 'id')
]
Rule::exists('expenses', 'id'),
],
];
}
}

8
app/Http/Requests/DeleteInvoiceRequest.php
View File

@ -4,8 +4,8 @@ namespace Crater\Http\Requests;
use Crater\Models\Invoice;
use Crater\Rules\RelationNotExist;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class DeleteInvoiceRequest extends FormRequest
{
@ -28,13 +28,13 @@ class DeleteInvoiceRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('invoices', 'id'),
new RelationNotExist(Invoice::class, 'payments')
]
new RelationNotExist(Invoice::class, 'payments'),
],
];
}
}

6
app/Http/Requests/DeleteItemsRequest.php
View File

@ -28,15 +28,15 @@ class DeleteItemsRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('items', 'id'),
new RelationNotExist(Item::class, 'invoiceItems'),
new RelationNotExist(Item::class, 'estimateItems'),
new RelationNotExist(Item::class, 'taxes')
]
new RelationNotExist(Item::class, 'taxes'),
],
];
}
}

6
app/Http/Requests/DeletePaymentsRequest.php
View File

@ -26,12 +26,12 @@ class DeletePaymentsRequest extends FormRequest
{
return [
'ids' => [
'required'
'required',
],
'ids.*' => [
'required',
Rule::exists('payments', 'id')
]
Rule::exists('payments', 'id'),
],
];
}
}

37
app/Http/Requests/DiskEnvironmentRequest.php
View File

@ -29,79 +29,82 @@ class DiskEnvironmentRequest extends FormRequest
$rules = [
'credentials.key' => [
'required',
'string'
'string',
],
'credentials.secret' => [
'required',
'string'
'string',
],
'credentials.region' => [
'required',
'string'
'string',
],
'credentials.bucket' => [
'required',
'string'
'string',
],
'credentials.root' => [
'required',
'string'
'string',
],
];
break;
case 'doSpaces':
$rules = [
'credentials.key' => [
'required',
'string'
'string',
],
'credentials.secret' => [
'required',
'string'
'string',
],
'credentials.region' => [
'required',
'string'
'string',
],
'credentials.bucket' => [
'required',
'string'
'string',
],
'credentials.endpoint' => [
'required',
'string'
'string',
],
'credentials.root' => [
'required',
'string'
'string',
],
];
break;
case 'dropbox':
$rules = [
'credentials.token' => [
'required',
'string'
'string',
],
'credentials.key' => [
'required',
'string'
'string',
],
'credentials.secret' => [
'required',
'string'
'string',
],
'credentials.app' => [
'required',
'string'
'string',
],
'credentials.root' => [
'required',
'string'
'string',
],
];
break;
}
@ -111,7 +114,7 @@ class DiskEnvironmentRequest extends FormRequest
],
'driver' => [
'required',
]
],
];
return array_merge($rules, $defaultRules);

37
app/Http/Requests/EstimatesRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Crater\Models\Estimate;
@ -26,62 +27,62 @@ class EstimatesRequest extends FormRequest
{
$rules = [
'estimate_date' => [
'required'
'required',
],
'expiry_date' => [
'required'
'required',
],
'user_id' => [
'required'
'required',
],
'estimate_number' => [
'required',
new UniqueNumber(Estimate::class)
new UniqueNumber(Estimate::class),
],
'discount' => [
'required'
'required',
],
'discount_val' => [
'required'
'required',
],
'sub_total' => [
'required'
'required',
],
'total' => [
'required'
'required',
],
'tax' => [
'required'
'required',
],
'estimate_template_id' => [
'required'
'required',
],
'items' => [
'required',
'array'
'array',
],
'items.*.description' => [
'max:255'
'max:255',
],
'items.*' => [
'required',
'max:255'
'max:255',
],
'items.*.name' => [
'required'
'required',
],
'items.*.quantity' => [
'required'
'required',
],
'items.*.price' => [
'required'
]
'required',
],
];
if ($this->isMethod('PUT')) {
$rules['estimate_number'] = [
'required',
new UniqueNumber(Estimate::class, $this->route('estimate')->id)
new UniqueNumber(Estimate::class, $this->route('estimate')->id),
];
}

7
app/Http/Requests/ExpenseCategoryRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
@ -24,11 +25,11 @@ class ExpenseCategoryRequest extends FormRequest
{
return [
'name' => [
'required'
'required',
],
'description' => [
'nullable'
]
'nullable',
],
];
}
}

12
app/Http/Requests/ExpenseRequest.php
View File

@ -25,20 +25,20 @@ class ExpenseRequest extends FormRequest
{
return [
'expense_date' => [
'required'
'required',
],
'expense_category_id' => [
'required'
'required',
],
'amount' => [
'required'
'required',
],
'user_id' => [
'nullable'
'nullable',
],
'notes' => [
'nullable'
]
'nullable',
],
];
}
}

6
app/Http/Requests/GetSettingsRequest.php
View File

@ -25,12 +25,12 @@ class GetSettingsRequest extends FormRequest
{
return [
'settings' => [
'required'
'required',
],
'settings.*' => [
'required',
'string'
]
'string',
],
];
}
}

37
app/Http/Requests/InvoicesRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Crater\Models\Invoice;
@ -26,62 +27,62 @@ class InvoicesRequest extends FormRequest
{
$rules = [
'invoice_date' => [
'required'
'required',
],
'due_date' => [
'required'
'required',
],
'user_id' => [
'required'
'required',
],
'invoice_number' => [
'required',
new UniqueNumber(Invoice::class)
new UniqueNumber(Invoice::class),
],
'discount' => [
'required'
'required',
],
'discount_val' => [
'required'
'required',
],
'sub_total' => [
'required'
'required',
],
'total' => [
'required'
'required',
],
'tax' => [
'required'
'required',
],
'invoice_template_id' => [
'required'
'required',
],
'items' => [
'required',
'array'
'array',
],
'items.*' => [
'required',
'max:255'
'max:255',
],
'items.*.description' => [
'max:255'
'max:255',
],
'items.*.name' => [
'required'
'required',
],
'items.*.quantity' => [
'required'
'required',
],
'items.*.price' => [
'required'
]
'required',
],
];
if ($this->isMethod('PUT')) {
$rules['invoice_number'] = [
'required',
new UniqueNumber(Invoice::class, $this->route('invoice')->id)
new UniqueNumber(Invoice::class, $this->route('invoice')->id),
];
}

11
app/Http/Requests/ItemsRequest.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
@ -24,17 +25,17 @@ class ItemsRequest extends FormRequest
{
return [
'name' => [
'required'
'required',
],
'price' => [
'required'
'required',
],
'unit_id' => [
'nullable'
'nullable',
],
'description' => [
'nullable'
]
'nullable',
],
];
}
}

57
app/Http/Requests/MailEnvironmentRequest.php
View File

@ -28,119 +28,124 @@ class MailEnvironmentRequest extends FormRequest
return [
'mail_driver' => [
'required',
'string'
'string',
],
'mail_host' => [
'required',
'string'
'string',
],
'mail_port' => [
'required'
'required',
],
'mail_encryption' => [
'required',
'string'
'string',
],
'from_name' => [
'required',
'string'
'string',
],
'from_mail' => [
'required',
'string'
'string',
],
];
break;
case 'mailgun':
return [
'mail_driver' => [
'required',
'string'
'string',
],
'mail_mailgun_domain' => [
'required',
'string'
'string',
],
'mail_mailgun_secret' => [
'required',
'string'
'string',
],
'mail_mailgun_endpoint' => [
'required',
'string'
'string',
],
'from_name' => [
'required',
'string'
'string',
],
'from_mail' => [
'required',
'string'
'string',
],
];
break;
case 'ses':
return [
'mail_driver' => [
'required',
'string'
'string',
],
'mail_host' => [
'required',
'string'
'string',
],
'mail_port' => [
'required'
'required',
],
'mail_ses_key' => [
'required',
'string'
'string',
],
'mail_ses_secret' => [
'required',
'string'
'string',
],
'mail_encryption' => [
'required',
'string'
'string',
],
'from_name' => [
'required',
'string'
'string',
],
'from_mail' => [
'required',
'string'
'string',
],
];
break;
case 'mail':
return [
'from_name' => [
'required',
'string'
'string',
],
'from_mail' => [
'required',
'string'
]
'string',
],
];
break;
case 'sendmail':
return [
'from_name' => [
'required',
'string'
'string',
],
'from_mail' => [
'required',
'string'
]
'string',
],
];
break;
}
}

2
app/Http/Requests/NotesRequest.php
View File

@ -26,7 +26,7 @@ class NotesRequest extends FormRequest
return [
'type' => ['required'],
'name' => ['required'],
'notes' => ['required']
'notes' => ['required'],
];
}
}

6
app/Http/Requests/PaymentMethodRequest.php
View File

@ -27,14 +27,14 @@ class PaymentMethodRequest extends FormRequest
$data = [
'name' => [
'required',
'unique:payment_methods,name'
]
'unique:payment_methods,name',
],
];
if ($this->getMethod() == 'PUT') {
$data['name'] = [
'required',
Rule::unique('payment_methods')->ignore($this->route('payment_method'), 'id')
Rule::unique('payment_methods')->ignore($this->route('payment_method'), 'id'),
];
}

10
app/Http/Requests/PaymentRequest.php
View File

@ -27,17 +27,17 @@ class PaymentRequest extends FormRequest
{
$rules = [
'payment_date' => [
'required'
'required',
],
'user_id' => [
'required'
'required',
],
'amount' => [
'required'
'required',
],
'payment_number' => [
'required',
new UniqueNumber(Payment::class)
new UniqueNumber(Payment::class),
],
'invoice_id' => [
'nullable',
@ -53,7 +53,7 @@ class PaymentRequest extends FormRequest
if ($this->isMethod('PUT')) {
$rules['payment_number'] = [
'required',
new UniqueNumber(Payment::class, $this->route('payment')->id)
new UniqueNumber(Payment::class, $this->route('payment')->id),
];
}

11
app/Http/Requests/ProfileRequest.php
View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Auth;
use Illuminate\Validation\Rule;
class ProfileRequest extends FormRequest
{
@ -26,17 +27,17 @@ class ProfileRequest extends FormRequest
{
return [
'name' => [
'required'
'required',
],
'password' => [
'nullable',
'min:8'
'min:8',
],
'email' => [
'required',
'email',
Rule::unique('users')->ignore(Auth::id(), 'id')
]
Rule::unique('users')->ignore(Auth::id(), 'id'),
],
];
}
}

1
app/Http/Requests/Request.php
View File

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;

10
app/Http/Requests/SendEstimatesRequest.php
View File

@ -25,17 +25,17 @@ class SendEstimatesRequest extends FormRequest
{
return [
'subject' => [
'required'
'required',
],
'body' => [
'required'
'required',
],
'from' => [
'required'
'required',
],
'to' => [
'required'
]
'required',
],
];
}
}

10
app/Http/Requests/SendInvoiceRequest.php
View File

@ -25,17 +25,17 @@ class SendInvoiceRequest extends FormRequest
{
return [
'body' => [
'required'
'required',
],
'subject' => [
'required'
'required',
],
'from' => [
'required'
'required',
],
'to' => [
'required'
]
'required',
],
];
}
}

10
app/Http/Requests/SendPaymentRequest.php
View File

@ -25,17 +25,17 @@ class SendPaymentRequest extends FormRequest
{
return [
'subject' => [
'required'
'required',
],
'body' => [
'required'
'required',
],
'from' => [
'required'
'required',
],
'to' => [
'required'
]
'required',
],
];
}
}

4
app/Http/Requests/SettingKeyRequest.php
View File

@ -25,8 +25,8 @@ class SettingKeyRequest extends FormRequest
{
return [
'key' => [
'required'
]
'required',
],
];
}
}

6
app/Http/Requests/SettingRequest.php
View File

@ -25,11 +25,11 @@ class SettingRequest extends FormRequest
{
return [
'key' => [
'required'
'required',
],
'value' => [
'required'
]
'required',
],
];
}
}

12
app/Http/Requests/TaxTypeRequest.php
View File

@ -25,20 +25,20 @@ class TaxTypeRequest extends FormRequest
{
return [
'name' => [
'required'
'required',
],
'percent' => [
'required'
'required',
],
'description' => [
'nullable'
'nullable',
],
'compound_tax' => [
'nullable'
'nullable',
],
'collective_tax' => [
'nullable'
]
'nullable',
],
];
}
}

6
app/Http/Requests/UnitRequest.php
View File

@ -27,14 +27,14 @@ class UnitRequest extends FormRequest
$data = [
'name' => [
'required',
'unique:units,name'
]
'unique:units,name',
],
];
if ($this->getMethod() == 'PUT') {
$data['name'] = [
'required',
Rule::unique('units')->ignore($this->route('unit'), 'id')
Rule::unique('units')->ignore($this->route('unit'), 'id'),
];
}

6
app/Http/Requests/UpdateSettingsRequest.php
View File

@ -25,11 +25,11 @@ class UpdateSettingsRequest extends FormRequest
{
return [
'settings' => [
'required'
'required',
],
'settings.*' => [
'required'
]
'required',
],
];
}
}

14
app/Http/Requests/UserRequest.php
View File

@ -26,31 +26,31 @@ class UserRequest extends FormRequest
{
$rules = [
'name' => [
'required'
'required',
],
'email' => [
'required',
'email',
Rule::unique('users')
Rule::unique('users'),
],
'phone' => [
'nullable'
'nullable',
],
'password' => [
'required',
'min:8'
]
'min:8',
],
];
if ($this->getMethod() == 'PUT') {
$rules['email'] = [
'required',
'email',
Rule::unique('users')->ignore($this->user)
Rule::unique('users')->ignore($this->user),
];
$rules['password'] = [
'nullable',
'min:8'
'min:8',
];
}