Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole
2025-11-03 20:08:37 +01:00
26 changed files with 41 additions and 38 deletions

View File

@@ -38,7 +38,6 @@ use FireflyIII\Transformers\PiggyBankTransformer;
use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -144,8 +143,8 @@ class ListController extends Controller
'page' => $page,
'start' => $start,
'end' => $end,
'types' => $types,
] = $request->attributes->all();
'types' => $types,
] = $request->attributes->all();
$manager = $this->getManager();
/** @var User $admin */

View File

@@ -75,9 +75,9 @@ class ShowController extends Controller
'limit' => $limit,
'offset' => $offset,
'page' => $page,
'start' => $start,
'end' => $end,
] = $request->attributes->all();
'start' => $start,
'end' => $end,
] = $request->attributes->all();
// get list of available budgets. Count it and split it.
$collection = $this->abRepository->getAvailableBudgetsByDate($start, $end);

View File

@@ -37,7 +37,6 @@ use FireflyIII\Transformers\RuleTransformer;
use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
@@ -141,10 +140,10 @@ class ListController extends Controller
[
'limit' => $limit,
'page' => $page,
'types' => $types,
'types' => $types,
'start' => $start,
'end' => $end,
] = $request->attributes->all();
] = $request->attributes->all();
$manager = $this->getManager();

View File

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Bill;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\DateRangeRequest;
use FireflyIII\Api\V1\Requests\Generic\PaginationDateRangeRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;

View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;

View File

@@ -27,7 +27,6 @@ use FireflyIII\Api\V1\Requests\AggregateFormRequest;
use FireflyIII\Api\V1\Requests\DateRequest;
use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;
use FireflyIII\Api\V1\Requests\Generic\QueryRequest;
use FireflyIII\Api\V1\Requests\Models\Account\AccountTypesApiRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\Account;
use Override;

View File

@@ -53,7 +53,7 @@ class ObjectTypeApiRequest extends ApiRequest
public function rules(): array
{
$rule = null;
$rule = null;
if (Account::class === $this->objectType) {
$rule = new IsValidAccountTypeList();
}
@@ -66,6 +66,7 @@ class ObjectTypeApiRequest extends ApiRequest
if ('' !== $this->required) {
$rules['types'][] = $this->required;
}
return $rules;
}
@@ -78,14 +79,20 @@ class ObjectTypeApiRequest extends ApiRequest
}
$type = $this->convertString('types', 'all');
$this->attributes->set('type', $type);
switch ($this->objectType) {
default:
$this->attributes->set('types', []);
// no break
case Account::class:
$this->attributes->set('types', $this->mapAccountTypes($type));
break;
case Transaction::class:
$this->attributes->set('types', $this->mapTransactionTypes($type));
break;
}
}

View File

@@ -1,4 +1,6 @@
<?php
declare(strict_types=1);
/*
* PaginationDateRangeRequest.php
* Copyright (c) 2025 james@firefly-iii.org