Code cleanup

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -40,9 +40,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use AppendsLocationData;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array
@@ -124,7 +124,7 @@ class StoreRequest extends FormRequest
             'liability_start_date' => 'required_with:liability_amount|date',
             'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
             'interest'             => 'between:0,100|numeric',
-            'interest_period'      => sprintf('nullable|in:%s', join(',', config('firefly.interest_periods'))),
+            'interest_period'      => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),
             'notes'                => 'min:0|max:65536',
         ];
 

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -41,9 +41,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use AppendsLocationData;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/Attachment/StoreRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Attachment/UpdateRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class Request extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.
@@ -84,7 +84,7 @@ class Request extends FormRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            static function (Validator $validator) {
                 // validate start before end only if both are there.
                 $data = $validator->getData();
                 if (array_key_exists('start', $data) && array_key_exists('end', $data)) {

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -37,8 +37,8 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -38,8 +38,8 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -37,9 +37,9 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
-    use ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -38,9 +38,9 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
-    use ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.
@@ -84,7 +84,7 @@ class UpdateRequest extends FormRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            static function (Validator $validator) {
                 // validate start before end only if both are there.
                 $data = $validator->getData();
                 if (array_key_exists('start', $data) && array_key_exists('end', $data)) {

app/Api/V1/Requests/Models/Category/StoreRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Category/UpdateRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php

@@ -37,8 +37,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -39,12 +39,12 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
-    use RecurrenceValidation;
-    use TransactionValidation;
     use CurrencyValidation;
     use GetRecurrenceData;
-    use ChecksLogin;
+    use RecurrenceValidation;
+    use TransactionValidation;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -40,12 +40,12 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
-    use RecurrenceValidation;
-    use TransactionValidation;
     use CurrencyValidation;
     use GetRecurrenceData;
-    use ChecksLogin;
+    use RecurrenceValidation;
+    use TransactionValidation;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -35,9 +35,9 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
     use GetRuleConfiguration;
-    use ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TestRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TriggerRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -36,9 +36,9 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
+    use ChecksLogin;
     use ConvertsDataTypes;
     use GetRuleConfiguration;
-    use ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TestRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TriggerRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * @return array

app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -36,9 +36,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    use ChecksLogin;
     use AppendsLocationData;
+    use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -38,9 +38,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    use ChecksLogin;
     use AppendsLocationData;
+    use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -42,12 +42,12 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
-    use TransactionValidation;
-    use GroupValidation;
-    use CurrencyValidation;
-    use ConvertsDataTypes;
-    use ChecksLogin;
     use AppendsLocationData;
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    use CurrencyValidation;
+    use GroupValidation;
+    use TransactionValidation;
 
     /**
      * Get all data. Is pretty complex because of all the ??-statements.

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -41,10 +41,10 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
-    use TransactionValidation;
-    use GroupValidation;
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
+    use GroupValidation;
+    use TransactionValidation;
 
     private array $arrayFields;
     private array $booleanFields;

app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class StoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Rule;
  */
 class UpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -57,9 +57,9 @@ class CreateRequest extends FormRequest
 
         // this is the way.
         $return             = $this->getAllData($fields);
-        $return['trigger']  = $triggers[$return['trigger']] ?? intval($return['trigger']);
-        $return['response'] = $responses[$return['response']] ?? intval($return['response']);
-        $return['delivery'] = $deliveries[$return['delivery']] ?? intval($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;
     }