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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Api/V1/Requests/Models/Webhook/CreateRequest.php
View File

@@ -37,9 +37,6 @@ class CreateRequest extends FormRequest
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getData(): array
{
$triggers = Webhook::getTriggersForValidation();
@@ -57,17 +54,15 @@ class CreateRequest extends FormRequest
// this is the way.
$return = $this->getAllData($fields);
$return['trigger'] = $triggers[$return['trigger']] ?? (int)($return['trigger']);
$return['response'] = $responses[$return['response']] ?? (int)($return['response']);
$return['delivery'] = $deliveries[$return['delivery']] ?? (int)($return['delivery']);
$return['trigger'] = $triggers[$return['trigger']] ?? (int)$return['trigger'];
$return['response'] = $responses[$return['response']] ?? (int)$return['response'];
$return['delivery'] = $deliveries[$return['delivery']] ?? (int)$return['delivery'];
return $return;
}
/**
* Rules for this request.
*
* @return array
*/
public function rules(): array
{
@@ -75,6 +70,7 @@ class CreateRequest extends FormRequest
$responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
$deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
$validProtocols = config('firefly.valid_url_protocols');
return [
'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
'active' => [new IsBoolean()],

6
app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
View File

@@ -37,9 +37,6 @@ class UpdateRequest extends FormRequest
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getData(): array
{
$triggers = Webhook::getTriggersForValidation();
@@ -76,8 +73,6 @@ class UpdateRequest extends FormRequest
/**
* Rules for this request.
*
* @return array
*/
public function rules(): array
{
@@ -85,6 +80,7 @@ class UpdateRequest extends FormRequest
$responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
$deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
$validProtocols = config('firefly.valid_url_protocols');
/** @var Webhook $webhook */
$webhook = $this->route()->parameter('webhook');