kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix API error

Browse Source
This commit is contained in:
James Cole
2023-11-05 14:31:05 +01:00
parent c0cc896102
commit 998fed7782
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Controllers/Controller.php
View File

@@ -137,7 +137,9 @@ abstract class Controller extends BaseController
if (null !== $value) { if (null !== $value) {
$bag->set($integer, (int)$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: // set default for user:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$bag->set($integer, $pageSize); $bag->set($integer, $pageSize);

2
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@@ -73,9 +73,7 @@ class UpdateRequest extends FormRequest
if (null !== $reps) { if (null !== $reps) {
$return['repetitions'] = $reps; $return['repetitions'] = $reps;
} }
if (null !== $transactions) {
$return['transactions'] = $transactions; $return['transactions'] = $transactions;
}
return $return; return $return;
} }

2
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@@ -166,7 +166,7 @@ class UpdateRequest extends FormRequest
return $return; return $return;
} }
/** @var array $transaction */ /** @var array|null $transaction */
foreach ($transactions as $transaction) { foreach ($transactions as $transaction) {
if (!is_array($transaction)) { if (!is_array($transaction)) {
throw new FireflyException('Invalid data submitted: transaction is not array.'); throw new FireflyException('Invalid data submitted: transaction is not array.');

2
app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
View File

@@ -113,7 +113,7 @@ class CorrectOpeningBalanceCurrencies extends Command
$transactions = $journal->transactions()->get(); $transactions = $journal->transactions()->get();
/** @var Transaction $transaction */ /** @var Transaction $transaction */
foreach ($transactions as $transaction) { foreach ($transactions as $transaction) {
/** @var Account $account */ /** @var Account|null $account */
$account = $transaction->account()->first(); $account = $transaction->account()->first();
if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) { if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) {
return $account; return $account;

2
app/Providers/AppServiceProvider.php
View File

@@ -42,7 +42,7 @@ class AppServiceProvider extends ServiceProvider
public function boot(): void public function boot(): void
{ {
Schema::defaultStringLength(191); Schema::defaultStringLength(191);
Response::macro('api', static function (array $value) { Response::macro('api', function (array $value) {
$headers = [ $headers = [
'Cache-Control' => 'no-store', 'Cache-Control' => 'no-store',
]; ];