kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-06-11

Browse Source
This commit is contained in:
JC5
2025-06-11 13:44:56 +02:00
parent 49000da123
commit 7728a35e04
19 changed files with 2906 additions and 2921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Chart/AccountController.php
View File

@@ -141,8 +141,6 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview
*
* @param DateRequest $request
* @return JsonResponse
* @throws ValidationException
*/
public function overview(DateRequest $request): JsonResponse

2
app/Api/V1/Controllers/Chart/BudgetController.php
View File

@@ -237,7 +237,7 @@ class BudgetController extends Controller
/** @var array $entry */
// only spent the entry where the entry's currency matches the budget limit's currency
// so $filtered will only have 1 or 0 entries
$filtered = array_filter($spent, function ($entry) use ($limitCurrencyId) {
$filtered = array_filter($spent, function ($entry) use ($limitCurrencyId) {
return $entry['currency_id'] === $limitCurrencyId;
});
$result = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);

4
app/Api/V1/Controllers/Data/Export/ExportController.php
View File

@@ -29,8 +29,8 @@ use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Export\ExportDataGenerator;
use Illuminate\Http\Response as LaravelResponse;
use Safe\Exceptions\DatetimeException;
use function Safe\date;
/**
@@ -72,8 +72,6 @@ class ExportController extends Controller
}
/**
* @param string $key
* @return LaravelResponse
* @throws FireflyException
* @throws DatetimeException
*/

2
app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
View File

@@ -65,8 +65,6 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param TransactionCurrency $currency
* @return JsonResponse
* @throws FireflyException
* @throws ValidationException
*/

4
app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
View File

@@ -250,7 +250,7 @@ class ListController extends Controller
$collection = $unfiltered->filter(
static function (Recurrence $recurrence) use ($currency) { // @phpstan-ignore-line
/** @var RecurrenceTransaction $transaction */
if (array_any($recurrence->recurrenceTransactions, fn($transaction) => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id)) {
if (array_any($recurrence->recurrenceTransactions, fn ($transaction) => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id)) {
return $recurrence;
}
@@ -295,7 +295,7 @@ class ListController extends Controller
$collection = $unfiltered->filter(
static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
/** @var RuleTrigger $trigger */
if (array_any($rule->ruleTriggers, fn($trigger) => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value)) {
if (array_any($rule->ruleTriggers, fn ($trigger) => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value)) {
return $rule;
}

3
app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
View File

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
use Illuminate\Support\Facades\Validator;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\TransactionFilter;
@@ -72,8 +71,6 @@ class StoreController extends Controller
*
* Store new object.
*
* @param StoreRequest $request
* @return JsonResponse
* @throws ValidationException
*/
public function store(StoreRequest $request): JsonResponse

3
app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
View File

@@ -73,9 +73,6 @@ class UpdateController extends Controller
*
* Update object.
*
* @param UpdateRequest $request
* @param LinkType $linkType
* @return JsonResponse
* @throws FireflyException
* @throws ValidationException
*/

4
app/Api/V1/Controllers/System/ConfigurationController.php
View File

@@ -95,6 +95,7 @@ class ConfigurationController extends Controller
/**
* Get all config values.
*
* @throws FireflyException
*/
private function getDynamicConfiguration(): array
@@ -156,9 +157,6 @@ class ConfigurationController extends Controller
*
* Update the configuration.
*
* @param UpdateRequest $request
* @param string $name
* @return JsonResponse
* @throws FireflyException
* @throws ValidationException
*/

1
app/Api/V1/Requests/Models/UserGroup/UpdateRequest.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\UserGroup;
use FireflyIII\Models\UserGroup;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;

1
app/Api/V2/Controllers/Controller.php
View File

@@ -39,7 +39,6 @@ use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\ParameterBag;

16
app/Api/V2/Controllers/Model/Transaction/UpdateController.php
View File

@@ -65,28 +65,28 @@ class UpdateController extends Controller
public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
{
app('log')->debug('Now in update routine for transaction group [v2]!');
$data = $request->getAll();
$transactionGroup = $this->groupRepository->update($transactionGroup, $data);
$applyRules = $data['apply_rules'] ?? true;
$fireWebhooks = $data['fire_webhooks'] ?? true;
$data = $request->getAll();
$transactionGroup = $this->groupRepository->update($transactionGroup, $data);
$applyRules = $data['apply_rules'] ?? true;
$fireWebhooks = $data['fire_webhooks'] ?? true;
event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, true));
app('preferences')->mark();
/** @var User $admin */
$admin = auth()->user();
$admin = auth()->user();
// use new group collector:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector = app(GroupCollectorInterface::class);
$collector->setUser($admin)->setTransactionGroup($transactionGroup);
$selectedGroup = $collector->getGroups()->first();
$selectedGroup = $collector->getGroups()->first();
if (null === $selectedGroup) {
throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
}
$transformer = new TransactionGroupTransformer();
$transformer = new TransactionGroupTransformer();
$transformer->setParameters($this->parameters);
return response()->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))->header('Content-Type', self::CONTENT_TYPE);

2
app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php
View File

@@ -57,7 +57,7 @@ class IndexController extends Controller
public function index(IndexRequest $request): JsonResponse
{
$settings = $request->getAll();
$currencies = new Collection();
$currencies = new Collection();
if (true === $settings['enabled']) {
$currencies = $this->repository->get();
}