Code cleanup

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -118,7 +118,7 @@ class AccountController extends Controller
         // custom order.
         usort(
             $return,
-            function ($a, $b) {
+            static function ($a, $b) {
                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
                 $posA  = array_search($a['type'], $order, true);
                 $posB  = array_search($b['type'], $order, true);

app/Api/V1/Controllers/Controller.php

@@ -88,8 +88,8 @@ abstract class Controller extends BaseController
         if ($page < 1) {
             $page = 1;
         }
-        if ($page > pow(2, 16)) {
+        if ($page > 2** 16) {
-            $page = pow(2, 16);
+            $page = 2** 16;
         }
         $bag->set('page', $page);
 

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -255,7 +255,7 @@ class ListController extends Controller
         $unfiltered     = $recurringRepos->getAll();
 
         // filter selection
-        $collection = $unfiltered->filter( // @phpstan-ignore-line
+        $collection = $unfiltered->filter( /** @phpstan-ignore-line */
             static function (Recurrence $recurrence) use ($currency) {  // @phpstan-ignore-line
                 /** @var RecurrenceTransaction $transaction */
                 foreach ($recurrence->recurrenceTransactions as $transaction) {
@@ -305,7 +305,7 @@ class ListController extends Controller
         $ruleRepos  = app(RuleRepositoryInterface::class);
         $unfiltered = $ruleRepos->getAll();
 
-        $collection = $unfiltered->filter( // @phpstan-ignore-line
+        $collection = $unfiltered->filter( /** @phpstan-ignore-line */
             static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
                 /** @var RuleTrigger $trigger */
                 foreach ($rule->ruleTriggers as $trigger) {

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

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

app/Api/V1/Requests/Data/DateRequest.php

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

app/Api/V1/Requests/Data/DestroyRequest.php

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

app/Api/V1/Requests/Data/SameDateRequest.php

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

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -42,8 +42,8 @@ use Illuminate\Support\Collection;
  */
 class GenericRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     private Collection $accounts;
     private Collection $bills;

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['trigger']  = $triggers[$return['trigger']] ?? (int) ($return['trigger']);
-        $return['response'] = $responses[$return['response']] ?? intval($return['response']);
+        $return['response'] = $responses[$return['response']] ?? (int) ($return['response']);
-        $return['delivery'] = $deliveries[$return['delivery']] ?? intval($return['delivery']);
+        $return['delivery'] = $deliveries[$return['delivery']] ?? (int) ($return['delivery']);
 
         return $return;
     }

app/Api/V1/Requests/System/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/System/UserStoreRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UserStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Logged in + owner

app/Api/V1/Requests/System/UserUpdateRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class UserUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Logged in + owner

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -123,7 +123,7 @@ class AccountController extends Controller
 
         usort(
             $allItems,
-            function (array $a, array $b): int {
+            static function (array $a, array $b): int {
                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
                 $pos_a = array_search($a['type'], $order, true);
                 $pos_b = array_search($b['type'], $order, true);

app/Api/V2/Controllers/Chart/CategoryController.php

@@ -135,7 +135,7 @@ class CategoryController extends Controller
         $return = array_values($return);
 
         // order by native amount
-        usort($return, function (array $a, array $b) {
+        usort($return, static function (array $a, array $b) {
             return (float)$a['native_amount'] < (float)$b['native_amount'] ? 1 : -1;
         });
         return response()->json($this->clean($return));

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AutocompleteRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
  */
 class BalanceChartRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
     use ValidatesUserGroupTrait;
 
     /**
@@ -64,7 +64,7 @@ class BalanceChartRequest extends FormRequest
             'start'      => 'required|date|after:1900-01-01|before:2099-12-31',
             'end'        => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
             'accounts.*' => 'required|exists:accounts,id',
-            'period'     => sprintf('required|in:%s', join(',', config('firefly.valid_view_ranges'))),
+            'period'     => sprintf('required|in:%s', implode(',', config('firefly.valid_view_ranges'))),
         ];
     }
 
@@ -76,7 +76,7 @@ class BalanceChartRequest extends FormRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            static function (Validator $validator) {
                 // validate transaction query data.
                 $data = $validator->getData();
                 if (!array_key_exists('accounts', $data)) {

app/Api/V2/Request/Generic/DateRequest.php

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

app/Api/V2/Request/Generic/SingleDateRequest.php

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

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -50,13 +50,13 @@ use Illuminate\Validation\Validator;
  */
 class StoreRequest extends FormRequest
 {
-    use ChecksLogin;
-    use ConvertsDataTypes;
-
-    use TransactionValidation;
-    use GroupValidation;
-    use CurrencyValidation;
     use AppendsLocationData;
+    use ChecksLogin;
+
+    use ConvertsDataTypes;
+    use CurrencyValidation;
+    use GroupValidation;
+    use TransactionValidation;
 
     protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 

app/Api/V2/Request/UserGroup/UpdateMembershipRequest.php

@@ -64,7 +64,7 @@ class UpdateMembershipRequest extends FormRequest
         return [
             'id'      => 'exists:users,id|required_without:email',
             'email'   => 'exists:users,email|required_without:id',
-            'roles.*' => 'required|in:' . join(',', $validRoles),
+            'roles.*' => 'required|in:' . implode(',', $validRoles),
         ];
     }
 }

app/Console/Commands/Correction/EnableCurrencies.php

@@ -80,7 +80,7 @@ class EnableCurrencies extends Command
         $found    = array_values(
             array_filter(
                 $found,
-                function (int $currencyId) {
+                static function (int $currencyId) {
                     return $currencyId !== 0;
                 }
             )

app/Console/Commands/Correction/FixAccountTypes.php

@@ -81,11 +81,11 @@ class FixAccountTypes extends Command
                                    ->leftJoin('account_types as destination_account_type', 'destination_account.account_type_id', '=', 'destination_account_type.id');
 
         // list all valid combinations, those are allowed. So we select those which are broken.
-        $query->where(function (Builder $q) use ($expected) {
+        $query->where(static function (Builder $q) use ($expected) {
             foreach ($expected as $transactionType => $info) {
                 foreach ($info as $source => $destinations) {
                     foreach ($destinations as $destination) {
-                        $q->whereNot(function (Builder $q1) use ($transactionType, $source, $destination) {
+                        $q->whereNot(static function (Builder $q1) use ($transactionType, $source, $destination) {
                             $q1->where('transaction_types.type', $transactionType);
                             $q1->where('source_account_type.type', $source);
                             $q1->where('destination_account_type.type', $destination);

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -56,7 +56,7 @@ class FixUnevenAmount extends Command
         foreach ($journals as $entry) {
             $sum = (string)$entry->the_sum;
             if (!is_numeric($sum) ||
-                0 === strlen($sum) || // @phpstan-ignore-line
+                '' === $sum || // @phpstan-ignore-line
                 str_contains($sum, 'e') ||
                 str_contains($sum, ',')) {
                 $message = sprintf(

app/Console/Commands/System/ForceDecimalSize.php

@@ -136,7 +136,7 @@ class ForceDecimalSize extends Command
     {
         // if sqlite, add function?
         if ('sqlite' === (string)config('database.default')) {
-            DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', function ($pattern, $value) {
+            DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', static function ($pattern, $value) {
                 mb_regex_encoding('UTF-8');
                 $pattern = trim($pattern, '"');
 
@@ -259,7 +259,7 @@ class ForceDecimalSize extends Command
                     continue;
                 }
                 // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
+                $pow     = 10** (int)$currency->decimal_places;
                 $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));
                 Account::find($account->id)->update([$field => $correct]);
@@ -310,7 +310,7 @@ class ForceDecimalSize extends Command
                     continue;
                 }
                 // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
+                $pow     = 10** (int)$currency->decimal_places;
                 $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(sprintf('%s #%d has %s with value "%s", this has been corrected to "%s".', $table, $item->id, $field, $value, $correct));
                 $class::find($item->id)->update([$field => $correct]);
@@ -362,7 +362,7 @@ class ForceDecimalSize extends Command
                     continue;
                 }
                 // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
+                $pow     = 10** (int)$currency->decimal_places;
                 $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(
                     sprintf('Piggy bank event #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
@@ -416,7 +416,7 @@ class ForceDecimalSize extends Command
                     continue;
                 }
                 // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
+                $pow     = 10** (int)$currency->decimal_places;
                 $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(
                     sprintf('Piggy bank repetition #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
@@ -469,7 +469,7 @@ class ForceDecimalSize extends Command
                     continue;
                 }
                 // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
+                $pow     = 10** (int)$currency->decimal_places;
                 $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
                 $this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));
                 PiggyBank::find($item->id)->update([$field => $correct]);
@@ -506,7 +506,7 @@ class ForceDecimalSize extends Command
                 continue;
             }
             // fix $field by rounding it down correctly.
-            $pow     = (float)pow(10, (int)$currency->decimal_places);
+            $pow     = (float)10** (int)$currency->decimal_places;
             $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);
             $this->friendlyWarning(sprintf('Transaction #%d has amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));
             Transaction::find($item->id)->update(['amount' => $correct]);
@@ -533,7 +533,7 @@ class ForceDecimalSize extends Command
                 continue;
             }
             // fix $field by rounding it down correctly.
-            $pow     = (float)pow(10, (int)$currency->decimal_places);
+            $pow     = (float)10** (int)$currency->decimal_places;
             $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);
             $this->friendlyWarning(
                 sprintf('Transaction #%d has foreign amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct)

app/Events/DestroyedTransactionLink.php

@@ -33,7 +33,7 @@ class DestroyedTransactionLink extends Event
 {
     use SerializesModels;
 
-    private TransactionJournalLink $link; // @phpstan-ignore-line
+    private TransactionJournalLink $link; /** @phpstan-ignore-line */
 
     /**
      * DestroyedTransactionLink constructor.

app/Exceptions/Handler.php

@@ -231,14 +231,12 @@ class Handler extends ExceptionHandler
      */
     private function shouldntReportLocal(Throwable $e): bool
     {
-        return !is_null(
+        return null !== Arr::first(
-            Arr::first(
                 $this->dontReport,
-                function ($type) use ($e) {
+                static function ($type) use ($e) {
                     return $e instanceof $type;
                 }
-            )
+            );
-        );
     }
 
     /**

app/Exceptions/IntervalException.php

@@ -59,14 +59,14 @@ final class IntervalException extends Exception
         array       $intervals,
         int         $code = 0,
         ?Throwable  $previous = null
-    ): IntervalException {
+    ): self {
         $message = sprintf(
             'The periodicity %s is unknown. Choose one of available periodicity: %s',
             $periodicity->name,
-            join(', ', $intervals)
+            implode(', ', $intervals)
         );
 
-        $exception                     = new IntervalException($message, $code, $previous);
+        $exception                     = new self($message, $code, $previous);
         $exception->periodicity        = $periodicity;
         $exception->availableIntervals = $intervals;
         return $exception;

app/Factory/RecurrenceFactory.php

@@ -37,8 +37,8 @@ use JsonException;
  */
 class RecurrenceFactory
 {
-    use TransactionTypeTrait;
     use RecurringTransactionTrait;
+    use TransactionTypeTrait;
 
     private MessageBag $errors;
     private User       $user;

app/Generator/Report/ReportGeneratorInterface.php

@@ -45,7 +45,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setAccounts(Collection $accounts): ReportGeneratorInterface;
+    public function setAccounts(Collection $accounts): self;
 
     /**
      * Set the involved budgets.
@@ -54,7 +54,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setBudgets(Collection $budgets): ReportGeneratorInterface;
+    public function setBudgets(Collection $budgets): self;
 
     /**
      * Set the involved categories.
@@ -63,7 +63,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setCategories(Collection $categories): ReportGeneratorInterface;
+    public function setCategories(Collection $categories): self;
 
     /**
      * Set the end date.
@@ -72,7 +72,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setEndDate(Carbon $date): ReportGeneratorInterface;
+    public function setEndDate(Carbon $date): self;
 
     /**
      * Set the expense accounts.
@@ -81,7 +81,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setExpense(Collection $expense): ReportGeneratorInterface;
+    public function setExpense(Collection $expense): self;
 
     /**
      * Set the start date.
@@ -90,7 +90,7 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setStartDate(Carbon $date): ReportGeneratorInterface;
+    public function setStartDate(Carbon $date): self;
 
     /**
      * Set the tags.
@@ -99,5 +99,5 @@ interface ReportGeneratorInterface
      *
      * @return ReportGeneratorInterface
      */
-    public function setTags(Collection $tags): ReportGeneratorInterface;
+    public function setTags(Collection $tags): self;
 }

app/Handlers/Events/APIEventHandler.php

@@ -50,7 +50,7 @@ class APIEventHandler
         if (null !== $user) {
             try {
                 Notification::send($user, new NewAccessToken());
-            } catch (Exception $e) { // @phpstan-ignore-line
+            } catch (Exception $e) { /** @phpstan-ignore-line */
                 $message = $e->getMessage();
                 if (str_contains($message, 'Bcc')) {
                     app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');

app/Handlers/Events/AdminEventHandler.php

@@ -58,7 +58,7 @@ class AdminEventHandler
             if ($repository->hasRole($user, 'owner')) {
                 try {
                     Notification::send($user, new UserInvitation($event->invitee));
-                } catch (Exception $e) { // @phpstan-ignore-line
+                } catch (Exception $e) { /** @phpstan-ignore-line */
                     $message = $e->getMessage();
                     if (str_contains($message, 'Bcc')) {
                         app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
@@ -96,7 +96,7 @@ class AdminEventHandler
             if ($repository->hasRole($user, 'owner')) {
                 try {
                     Notification::send($user, new VersionCheckResult($event->message));
-                } catch (Exception $e) { // @phpstan-ignore-line
+                } catch (Exception $e) { /** @phpstan-ignore-line */
                     $message = $e->getMessage();
                     if (str_contains($message, 'Bcc')) {
                         app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
@@ -130,7 +130,7 @@ class AdminEventHandler
         }
         try {
             Notification::send($event->user, new TestNotification($event->user->email));
-        } catch (Exception $e) { // @phpstan-ignore-line
+        } catch (Exception $e) { /** @phpstan-ignore-line */
             $message = $e->getMessage();
             if (str_contains($message, 'Bcc')) {
                 app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');

app/Handlers/Events/AutomationHandler.php

@@ -75,7 +75,7 @@ class AutomationHandler
         }
         try {
             Notification::send($user, new TransactionCreation($groups));
-        } catch (Exception $e) { // @phpstan-ignore-line
+        } catch (Exception $e) { /** @phpstan-ignore-line */
             $message = $e->getMessage();
             if (str_contains($message, 'Bcc')) {
                 app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');

app/Handlers/Events/BillEventHandler.php

@@ -51,7 +51,7 @@ class BillEventHandler
             app('log')->debug('Bill reminder is true!');
             try {
                 Notification::send($bill->user, new BillReminder($bill, $event->field, $event->diff));
-            } catch (Exception $e) { // @phpstan-ignore-line
+            } catch (Exception $e) { /** @phpstan-ignore-line */
                 $message = $e->getMessage();
                 if (str_contains($message, 'Bcc')) {
                     app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');

app/Handlers/Events/UserEventHandler.php

@@ -203,7 +203,7 @@ class UserEventHandler
             if (false === $entry['notified']) {
                 try {
                     Notification::send($user, new UserLogin($ipAddress));
-                } catch (Exception $e) { // @phpstan-ignore-line
+                } catch (Exception $e) { /** @phpstan-ignore-line */
                     $message = $e->getMessage();
                     if (str_contains($message, 'Bcc')) {
                         app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
@@ -237,7 +237,7 @@ class UserEventHandler
                 if ($repository->hasRole($user, 'owner')) {
                     try {
                         Notification::send($user, new AdminRegistrationNotification($event->user));
-                    } catch (Exception $e) { // @phpstan-ignore-line
+                    } catch (Exception $e) { /** @phpstan-ignore-line */
                         $message = $e->getMessage();
                         if (str_contains($message, 'Bcc')) {
                             app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
@@ -314,7 +314,7 @@ class UserEventHandler
     {
         try {
             Notification::send($event->user, new UserNewPassword(route('password.reset', [$event->token])));
-        } catch (Exception $e) { // @phpstan-ignore-line
+        } catch (Exception $e) { /** @phpstan-ignore-line */
             $message = $e->getMessage();
             if (str_contains($message, 'Bcc')) {
                 app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
@@ -362,7 +362,7 @@ class UserEventHandler
         if ($sendMail) {
             try {
                 Notification::send($event->user, new UserRegistrationNotification());
-            } catch (Exception $e) { // @phpstan-ignore-line
+            } catch (Exception $e) { /** @phpstan-ignore-line */
                 $message = $e->getMessage();
                 if (str_contains($message, 'Bcc')) {
                     app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');

app/Handlers/Events/WebhookEventHandler.php

@@ -41,7 +41,7 @@ class WebhookEventHandler
         $messages = WebhookMessage::where('webhook_messages.sent', false)
                                   ->get(['webhook_messages.*'])
                                   ->filter(
-                                      function (WebhookMessage $message) {
+                                      static function (WebhookMessage $message) {
                                           return $message->webhookAttempts()->count() <= 2;
                                       }
                                   )->splice(0, 5);

app/Handlers/Observer/TransactionJournalObserver.php

@@ -40,7 +40,7 @@ class TransactionJournalObserver
         app('log')->debug('Observe "deleting" of a transaction journal.');
 
         // to make sure the listener doesn't get back to use and loop
-        TransactionJournal::withoutEvents(function () use ($transactionJournal) {
+        TransactionJournal::withoutEvents(static function () use ($transactionJournal) {
             foreach ($transactionJournal->transactions()->get() as $transaction) {
                 $transaction->delete();
             }

app/Helpers/Attachments/AttachmentHelper.php

@@ -95,7 +95,7 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function getAttachmentLocation(Attachment $attachment): string
     {
-        return sprintf('%sat-%d.data', DIRECTORY_SEPARATOR, (int)$attachment->id);
+        return sprintf('%sat-%d.data', \DIRECTORY_SEPARATOR, (int)$attachment->id);
     }
 
     /**

app/Helpers/Collector/Extensions/AmountCollection.php

@@ -74,7 +74,7 @@ trait AmountCollection
     public function amountLess(string $amount): GroupCollectorInterface
     {
         $this->query->where(
-            function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
+            static function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
                 $q->where('destination.amount', '<=', app('steam')->positive($amount));
             }
         );
@@ -92,7 +92,7 @@ trait AmountCollection
     public function amountMore(string $amount): GroupCollectorInterface
     {
         $this->query->where(
-            function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
+            static function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
                 $q->where('destination.amount', '>=', app('steam')->positive($amount));
             }
         );
@@ -148,7 +148,7 @@ trait AmountCollection
     public function foreignAmountLess(string $amount): GroupCollectorInterface
     {
         $this->query->where(
-            function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
+            static function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
                 $q->whereNotNull('destination.foreign_amount');
                 $q->where('destination.foreign_amount', '<=', app('steam')->positive($amount));
             }
@@ -167,7 +167,7 @@ trait AmountCollection
     public function foreignAmountMore(string $amount): GroupCollectorInterface
     {
         $this->query->where(
-            function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
+            static function (EloquentBuilder $q) use ($amount) { // @phpstan-ignore-line
                 $q->whereNotNull('destination.foreign_amount');
                 $q->where('destination.foreign_amount', '>=', app('steam')->positive($amount));
             }

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -44,7 +44,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -123,7 +123,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -153,7 +153,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -183,7 +183,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -213,7 +213,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -243,7 +243,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -270,7 +270,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -297,7 +297,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($name): bool {
+        $filter              = static function (int $index, array $object) use ($name): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -327,7 +327,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -354,7 +354,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -381,7 +381,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -408,7 +408,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -435,7 +435,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -462,7 +462,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -489,7 +489,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -516,7 +516,7 @@ trait AttachmentCollection
     {
         $this->hasAttachments();
         $this->withAttachmentInformation();
-        $filter              = function (int $index, array $object) use ($value): bool {
+        $filter              = static function (int $index, array $object) use ($value): bool {
             /** @var array $transaction */
             foreach ($object['transactions'] as $transaction) {
                 /** @var array $attachment */
@@ -544,10 +544,10 @@ trait AttachmentCollection
         app('log')->debug('Add filter on no attachments.');
         $this->joinAttachmentTables();
 
-        $this->query->where(function (Builder $q1) { // @phpstan-ignore-line
+        $this->query->where(static function (Builder $q1) { // @phpstan-ignore-line
             $q1
                 ->whereNull('attachments.attachable_id')
-                ->orWhere(function (Builder $q2) {
+                ->orWhere(static function (Builder $q2) {
                     $q2
                         ->whereNotNull('attachments.attachable_id')
                         ->whereNotNull('attachments.deleted_at');

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -915,7 +915,7 @@ trait MetaCollection
 
         // this method adds a "postFilter" to the collector.
         $list                = $tags->pluck('tag')->toArray();
-        $filter              = function (int $index, array $object) use ($list): bool {
+        $filter              = static function (int $index, array $object) use ($list): bool {
             foreach ($object['transactions'] as $transaction) {
                 foreach ($transaction['tags'] as $tag) {
                     if (in_array($tag['name'], $list, true)) {
@@ -1050,13 +1050,13 @@ trait MetaCollection
     {
         $this->joinMetaDataTables();
         // TODO not sure if this will work properly.
-        $this->query->where(function (Builder $q1) { // @phpstan-ignore-line
+        $this->query->where(static function (Builder $q1) { // @phpstan-ignore-line
-            $q1->where(function (Builder $q2) {
+            $q1->where(static function (Builder $q2) {
                 $q2->where('journal_meta.name', '=', 'external_id');
                 $q2->whereNull('journal_meta.data');
-            })->orWhere(function (Builder $q3) {
+            })->orWhere(static function (Builder $q3) {
                 $q3->where('journal_meta.name', '!=', 'external_id');
-            })->orWhere(function (Builder $q4) {
+            })->orWhere(static function (Builder $q4) {
                 $q4->whereNull('journal_meta.name');
             });
         });
@@ -1071,13 +1071,13 @@ trait MetaCollection
     {
         $this->joinMetaDataTables();
         // TODO not sure if this will work properly.
-        $this->query->where(function (Builder $q1) { // @phpstan-ignore-line
+        $this->query->where(static function (Builder $q1) { // @phpstan-ignore-line
-            $q1->where(function (Builder $q2) {
+            $q1->where(static function (Builder $q2) {
                 $q2->where('journal_meta.name', '=', 'external_url');
                 $q2->whereNull('journal_meta.data');
-            })->orWhere(function (Builder $q3) {
+            })->orWhere(static function (Builder $q3) {
                 $q3->where('journal_meta.name', '!=', 'external_url');
-            })->orWhere(function (Builder $q4) {
+            })->orWhere(static function (Builder $q4) {
                 $q4->whereNull('journal_meta.name');
             });
         });
@@ -1091,7 +1091,7 @@ trait MetaCollection
     public function withoutNotes(): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(function (Builder $q) { // @phpstan-ignore-line
+        $this->query->where(static function (Builder $q) { // @phpstan-ignore-line
             $q->whereNull('notes.text');
             $q->orWhere('notes.text', '');
         });

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -93,7 +93,7 @@ trait TimeCollection
         $start->startOfDay();
         $this->withMetaDate($field);
 
-        $filter              = function (int $index, array $object) use ($field, $start, $end): bool {
+        $filter              = static function (int $index, array $object) use ($field, $start, $end): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon) {
                     return $transaction[$field]->lt($start) || $transaction[$field]->gt($end);
@@ -166,7 +166,7 @@ trait TimeCollection
     public function metaDayAfter(string $day, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $day): bool {
+        $filter              = static function (int $index, array $object) use ($field, $day): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -190,7 +190,7 @@ trait TimeCollection
     public function metaDayBefore(string $day, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $day): bool {
+        $filter              = static function (int $index, array $object) use ($field, $day): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -214,7 +214,7 @@ trait TimeCollection
     public function metaDayIs(string $day, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $day): bool {
+        $filter              = static function (int $index, array $object) use ($field, $day): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -237,7 +237,7 @@ trait TimeCollection
     public function metaDayIsNot(string $day, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $day): bool {
+        $filter              = static function (int $index, array $object) use ($field, $day): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -260,7 +260,7 @@ trait TimeCollection
     public function metaMonthAfter(string $month, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $month): bool {
+        $filter              = static function (int $index, array $object) use ($field, $month): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -284,7 +284,7 @@ trait TimeCollection
     public function metaMonthBefore(string $month, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $month): bool {
+        $filter              = static function (int $index, array $object) use ($field, $month): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -308,7 +308,7 @@ trait TimeCollection
     public function metaMonthIs(string $month, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $month): bool {
+        $filter              = static function (int $index, array $object) use ($field, $month): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -331,7 +331,7 @@ trait TimeCollection
     public function metaMonthIsNot(string $month, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $month): bool {
+        $filter              = static function (int $index, array $object) use ($field, $month): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -354,7 +354,7 @@ trait TimeCollection
     public function metaYearAfter(string $year, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $year): bool {
+        $filter              = static function (int $index, array $object) use ($field, $year): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -378,7 +378,7 @@ trait TimeCollection
     public function metaYearBefore(string $year, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $year): bool {
+        $filter              = static function (int $index, array $object) use ($field, $year): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -402,7 +402,7 @@ trait TimeCollection
     public function metaYearIs(string $year, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $year): bool {
+        $filter              = static function (int $index, array $object) use ($field, $year): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -426,7 +426,7 @@ trait TimeCollection
     public function metaYearIsNot(string $year, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $year): bool {
+        $filter              = static function (int $index, array $object) use ($field, $year): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -702,7 +702,7 @@ trait TimeCollection
     {
         $this->withMetaDate($field);
         $date->startOfDay();
-        $filter              = function (int $index, array $object) use ($field, $date): bool {
+        $filter              = static function (int $index, array $object) use ($field, $date): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -726,7 +726,7 @@ trait TimeCollection
     public function setMetaBefore(Carbon $date, string $field): GroupCollectorInterface
     {
         $this->withMetaDate($field);
-        $filter              = function (int $index, array $object) use ($field, $date): bool {
+        $filter              = static function (int $index, array $object) use ($field, $date): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {
@@ -758,7 +758,7 @@ trait TimeCollection
         $start->startOfDay();
         $this->withMetaDate($field);
 
-        $filter              = function (int $index, array $object) use ($field, $start, $end): bool {
+        $filter              = static function (int $index, array $object) use ($field, $start, $end): bool {
             foreach ($object['transactions'] as $transaction) {
                 if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                 ) {

app/Helpers/Collector/GroupCollector.php

@@ -52,12 +52,12 @@ use Illuminate\Support\Collection;
  */
 class GroupCollector implements GroupCollectorInterface
 {
-    use CollectorProperties;
     use AccountCollection;
     use AmountCollection;
-    use TimeCollection;
-    use MetaCollection;
     use AttachmentCollection;
+    use CollectorProperties;
+    use MetaCollection;
+    use TimeCollection;
 
     /**
      * Group collector constructor.
@@ -1077,7 +1077,7 @@ class GroupCollector implements GroupCollectorInterface
             // join source transaction.
             ->leftJoin(
                 'transactions as source',
-                function (JoinClause $join) {
+                static function (JoinClause $join) {
                     $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')
                          ->where('source.amount', '<', 0);
                 }
@@ -1085,7 +1085,7 @@ class GroupCollector implements GroupCollectorInterface
             // join destination transaction
             ->leftJoin(
                 'transactions as destination',
-                function (JoinClause $join) {
+                static function (JoinClause $join) {
                     $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')
                          ->where('destination.amount', '>', 0);
                 }
@@ -1135,7 +1135,7 @@ class GroupCollector implements GroupCollectorInterface
             // join source transaction.
             ->leftJoin(
                 'transactions as source',
-                function (JoinClause $join) {
+                static function (JoinClause $join) {
                     $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')
                          ->where('source.amount', '<', 0);
                 }
@@ -1143,7 +1143,7 @@ class GroupCollector implements GroupCollectorInterface
             // join destination transaction
             ->leftJoin(
                 'transactions as destination',
-                function (JoinClause $join) {
+                static function (JoinClause $join) {
                     $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')
                          ->where('destination.amount', '>', 0);
                 }

app/Http/Controllers/Auth/RegisterController.php

@@ -51,8 +51,8 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class RegisterController extends Controller
 {
-    use RegistersUsers;
     use CreateStuff;
+    use RegistersUsers;
 
     /**
      * Where to redirect users after registration.

app/Http/Controllers/Budget/ShowController.php

@@ -46,8 +46,8 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class ShowController extends Controller
 {
-    use PeriodOverview;
     use AugumentData;
+    use PeriodOverview;
 
     protected JournalRepositoryInterface $journalRepos;
     private BudgetRepositoryInterface    $repository;

app/Http/Controllers/Chart/AccountController.php

@@ -50,9 +50,9 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class AccountController extends Controller
 {
-    use DateCalculation;
     use AugumentData;
     use ChartGeneration;
+    use DateCalculation;
 
     protected GeneratorInterface        $generator;
     private AccountRepositoryInterface  $accountRepository;

app/Http/Controllers/Chart/BudgetController.php

@@ -49,8 +49,8 @@ use Illuminate\Support\Collection;
  */
 class BudgetController extends Controller
 {
-    use DateCalculation;
     use AugumentData;
+    use DateCalculation;
 
     protected GeneratorInterface            $generator;
     protected OperationsRepositoryInterface $opsRepository;

app/Http/Controllers/Chart/CategoryController.php

@@ -47,9 +47,9 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class CategoryController extends Controller
 {
-    use DateCalculation;
     use AugumentData;
     use ChartGeneration;
+    use DateCalculation;
 
     /** @var GeneratorInterface Chart generation methods. */
     protected $generator;

app/Http/Controllers/Chart/PiggyBankController.php

@@ -96,7 +96,7 @@ class PiggyBankController extends Controller
         $chartData = [];
         while ($oldest <= $today) {
             $filtered          = $set->filter(
-                function (PiggyBankEvent $event) use ($oldest) {
+                static function (PiggyBankEvent $event) use ($oldest) {
                     return $event->date->lte($oldest);
                 }
             );
@@ -106,7 +106,7 @@ class PiggyBankController extends Controller
             $oldest            = app('navigation')->addPeriod($oldest, $step, 0);
         }
         $finalFiltered          = $set->filter(
-            function (PiggyBankEvent $event) use ($today) {
+            static function (PiggyBankEvent $event) use ($today) {
                 return $event->date->lte($today);
             }
         );

app/Http/Controllers/Controller.php

@@ -39,9 +39,9 @@ abstract class Controller extends BaseController
 {
     use AuthorizesRequests;
     use DispatchesJobs;
-    use ValidatesRequests;
     use RequestInformation;
     use UserNavigation;
+    use ValidatesRequests;
 
     protected string $dateTimeFormat;
     protected string $monthAndDayFormat;

app/Http/Controllers/DebugController.php

@@ -129,7 +129,7 @@ class DebugController extends Controller
         // get latest log file:
         $logger = Log::driver();
         // PHPstan doesn't recognize the method because of its polymorphic nature.
-        $handlers   = $logger->getHandlers(); // @phpstan-ignore-line
+        $handlers   = $logger->getHandlers(); /** @phpstan-ignore-line */
         $logContent = '';
         foreach ($handlers as $handler) {
             if ($handler instanceof RotatingFileHandler) {
@@ -174,7 +174,7 @@ class DebugController extends Controller
             'db_version'      => app('fireflyconfig')->get('db_version', 1)->data,
             'php_version'     => PHP_VERSION,
             'php_os'          => PHP_OS,
-            'interface'       => PHP_SAPI,
+            'interface'       => \PHP_SAPI,
             'bcscale'         => bcscale(),
             'display_errors'  => ini_get('display_errors'),
             'error_reporting' => $this->errorReporting((int)ini_get('error_reporting')),
@@ -246,7 +246,7 @@ class DebugController extends Controller
             'default_locale'     => (string)config('firefly.default_locale'),
             'remote_header'      => $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A',
             'remote_mail_header' => $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A',
-            'stateful_domains'   => join(', ', config('sanctum.stateful')),
+            'stateful_domains'   => implode(', ', config('sanctum.stateful')),
 
             // the dates for the cron job are based on the recurring cron job's times.
             // any of the cron jobs will do, they always run at the same time.
@@ -339,7 +339,7 @@ class DebugController extends Controller
         if ($user->bills()->count() > 0) {
             $flags[] = '<span title="Has subscriptions">:email:</span>';
         }
-        return join(' ', $flags);
+        return implode(' ', $flags);
     }
 
     /**

app/Http/Controllers/Json/BoxController.php

@@ -118,7 +118,7 @@ class BoxController extends Controller
             $leftToSpendAmount = bcadd($totalAvailableSum, $spentAmount);
             app('log')->debug(sprintf('So left to spend is %s', $leftToSpendAmount));
             if (1 === bccomp($leftToSpendAmount, '0')) {
-                app('log')->debug(sprintf('Left to spend is positive!'));
+                app('log')->debug('Left to spend is positive!');
                 $boxTitle         = (string)trans('firefly.left_to_spend');
                 $days             = $today->diffInDays($end) + 1;
                 $display          = 1; // not overspent
@@ -255,7 +255,7 @@ class BoxController extends Controller
 
         // filter list on preference of being included.
         $filtered = $allAccounts->filter(
-            function (Account $account) use ($accountRepository) {
+            static function (Account $account) use ($accountRepository) {
                 $includeNetWorth = $accountRepository->getMetaValue($account, 'include_net_worth');
                 $result          = null === $includeNetWorth ? true : '1' === $includeNetWorth;
                 if (false === $result) {

app/Http/Controllers/PreferencesController.php

@@ -53,7 +53,7 @@ class PreferencesController extends Controller
         parent::__construct();
 
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('title', (string)trans('firefly.preferences'));
                 app('view')->share('mainTitleIcon', 'fa-gear');
 

app/Http/Controllers/Rule/CreateController.php

@@ -45,8 +45,8 @@ use Illuminate\View\View;
  */
 class CreateController extends Controller
 {
-    use RuleManagement;
     use ModelInformation;
+    use RuleManagement;
 
     private RuleRepositoryInterface $ruleRepos;
 

app/Http/Controllers/Rule/EditController.php

@@ -44,8 +44,8 @@ use Throwable;
  */
 class EditController extends Controller
 {
-    use RuleManagement;
     use RenderPartialViews;
+    use RuleManagement;
 
     private RuleRepositoryInterface $ruleRepos;
 

app/Http/Controllers/Rule/SelectController.php

@@ -57,7 +57,7 @@ class SelectController extends Controller
         parent::__construct();
 
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('title', (string)trans('firefly.rules'));
                 app('view')->share('mainTitleIcon', 'fa-random');
 

app/Http/Controllers/TransactionCurrency/IndexController.php

@@ -84,7 +84,7 @@ class IndexController extends Controller
 
         // order so default is on top:
         $collection = $collection->sortBy(
-            function (TransactionCurrency $currency) {
+            static function (TransactionCurrency $currency) {
                 $default = true === $currency->userDefault ? 0 : 1;
                 $enabled = true === $currency->userEnabled ? 0 : 1;
                 return sprintf('%s-%s-%s', $default, $enabled, $currency->code);

app/Http/Controllers/Webhooks/CreateController.php

@@ -42,7 +42,7 @@ class CreateController extends Controller
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-bolt');
                 app('view')->share('subTitleIcon', 'fa-plus');
                 app('view')->share('title', (string)trans('firefly.webhooks'));

app/Http/Controllers/Webhooks/DeleteController.php

@@ -45,7 +45,7 @@ class DeleteController extends Controller
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-bolt');
                 app('view')->share('subTitleIcon', 'fa-trash');
                 app('view')->share('title', (string)trans('firefly.webhooks'));

app/Http/Controllers/Webhooks/EditController.php

@@ -45,7 +45,7 @@ class EditController extends Controller
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-bolt');
                 app('view')->share('subTitleIcon', 'fa-pencil');
                 app('view')->share('title', (string)trans('firefly.webhooks'));

app/Http/Controllers/Webhooks/IndexController.php

@@ -43,7 +43,7 @@ class IndexController extends Controller
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-bolt');
                 app('view')->share('title', (string)trans('firefly.webhooks'));
 

app/Http/Controllers/Webhooks/ShowController.php

@@ -45,7 +45,7 @@ class ShowController extends Controller
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            static function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-bolt');
                 app('view')->share('subTitleIcon', 'fa-bolt');
                 app('view')->share('title', (string)trans('firefly.webhooks'));

app/Http/Requests/AccountFormRequest.php

@@ -37,9 +37,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AccountFormRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use AppendsLocationData;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 

app/Http/Requests/AttachmentFormRequest.php

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AttachmentFormRequest extends FormRequest
 {
-    use ConvertsDataTypes;
     use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Returns the data required by the controller.