Use PSR-12 code style

This commit is contained in:
James Cole
2022-10-30 14:23:00 +01:00
parent b27fe59ab4
commit 1667b88dcd
154 changed files with 277 additions and 322 deletions

View File

@@ -34,14 +34,14 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CreateRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getData(): array
{
$triggers = Webhook::getTriggersForValidation();
$responses = Webhook::getResponsesForValidation();
$deliveries = Webhook::getDeliveriesForValidation();
@@ -77,13 +77,11 @@ class CreateRequest extends FormRequest
return [
'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'trigger' => sprintf('required|in:%s', $triggers),
'response' => sprintf('required|in:%s', $responses),
'delivery' => sprintf('required|in:%s', $deliveries),
'url' => ['required', 'url', 'uniqueWebhook'],
];
}
}

View File

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@@ -80,7 +81,6 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
$triggers = implode(',', array_keys(Webhook::getTriggersForValidation()));
$responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
$deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
@@ -88,7 +88,7 @@ class UpdateRequest extends FormRequest
return [
'title' => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'trigger' => sprintf('in:%s', $triggers),
'response' => sprintf('in:%s', $responses),
'delivery' => sprintf('in:%s', $deliveries),