diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index e23553a25d..b07b9025ea 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -137,7 +137,9 @@ abstract class Controller extends BaseController if (null !== $value) { $bag->set($integer, (int)$value); } - if (null === $value && 'limit' === $integer && auth()->check()) { + if (null === $value && + 'limit' === $integer && // @phpstan-ignore-line + auth()->check()) { // set default for user: $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $bag->set($integer, $pageSize); diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 829b6a26d7..a8b8405d8b 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -73,9 +73,7 @@ class UpdateRequest extends FormRequest if (null !== $reps) { $return['repetitions'] = $reps; } - if (null !== $transactions) { - $return['transactions'] = $transactions; - } + $return['transactions'] = $transactions; return $return; } diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index 56fa03f2fa..9bafb00e28 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -166,7 +166,7 @@ class UpdateRequest extends FormRequest return $return; } - /** @var array $transaction */ + /** @var array|null $transaction */ foreach ($transactions as $transaction) { if (!is_array($transaction)) { throw new FireflyException('Invalid data submitted: transaction is not array.'); diff --git a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php index 0ee4229960..67feb9bdbe 100644 --- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php +++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php @@ -113,7 +113,7 @@ class CorrectOpeningBalanceCurrencies extends Command $transactions = $journal->transactions()->get(); /** @var Transaction $transaction */ foreach ($transactions as $transaction) { - /** @var Account $account */ + /** @var Account|null $account */ $account = $transaction->account()->first(); if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) { return $account; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 92439eb191..5094305b08 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -42,7 +42,7 @@ class AppServiceProvider extends ServiceProvider public function boot(): void { Schema::defaultStringLength(191); - Response::macro('api', static function (array $value) { + Response::macro('api', function (array $value) { $headers = [ 'Cache-Control' => 'no-store', ];