gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Cole
2025-11-03 20:08:37 +01:00
parent d66f03d538 fe926ae23e
commit 47f938c71b
26 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Api/V1/Controllers/Models/Account/ListController.php
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 */

6
app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
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);

5
app/Api/V1/Controllers/Models/Bill/ListController.php
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();

1
app/Api/V1/Controllers/Models/Bill/ShowController.php
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;

1
app/Api/V1/Requests/AggregateFormRequest.php
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;

1
app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
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;

9
app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php
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;
}
}

2
app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php
View File

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

1
app/Factory/CategoryFactory.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Models\Category;
use FireflyIII\User;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
/**
* Class CategoryFactory
*/

1
app/Factory/PiggyBankFactory.php
View File

@@ -38,6 +38,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
use function Safe\json_encode;
/**
* Class PiggyBankFactory
*/

1
app/Handlers/Events/AdminEventHandler.php
View File

@@ -38,7 +38,6 @@ use FireflyIII\Notifications\Test\OwnerTestNotificationSlack;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Notification;
/**
* Class AdminEventHandler.
*/

1
app/Handlers/Events/UserEventHandler.php
View File

@@ -58,7 +58,6 @@ use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Notification;
/**
* Class UserEventHandler.
*

1
app/Handlers/Observer/AccountObserver.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
/**
* Class AccountObserver
*/

1
app/Handlers/Observer/BillObserver.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Support\Facades\Log;
/**
* Class BillObserver
*/

1
app/Handlers/Observer/PiggyBankObserver.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Support\Facades\Log;
/**
* Class PiggyBankObserver
*/

1
app/Handlers/Observer/WebhookMessageObserver.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Observer;
use FireflyIII\Models\WebhookMessage;
use Illuminate\Support\Facades\Log;
/**
* Class WebhookMessageObserver
*/

1
app/Handlers/Observer/WebhookObserver.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Observer;
use FireflyIII\Models\Webhook;
use Illuminate\Support\Facades\Log;
/**
* Class WebhookObserver
*/

1
app/Helpers/Collector/Extensions/AttachmentCollection.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionJournal;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Support\Facades\Log;
/**
* Trait AttachmentCollection
*/

2
app/Helpers/Webhook/Sha3SignatureGenerator.php
View File

@@ -28,9 +28,9 @@ use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\WebhookMessage;
use JsonException;
use Illuminate\Support\Facades\Log;
use function Safe\json_encode;
use Illuminate\Support\Facades\Log;
/**
* Class Sha3SignatureGenerator

2
app/Models/BudgetLimit.php
View File

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
*
* @property TransactionCurrency $transactionCurrency
* @property Carbon $start_date
* @property Carbon|null $end_date
* @property null|Carbon $end_date
*/
#[ObservedBy([BudgetLimitObserver::class])]
class BudgetLimit extends Model

8
app/Rules/IsAllowedGroupAction.php
View File

@@ -72,7 +72,6 @@ class IsAllowedGroupAction implements ValidationRule
$this->validateUserGroup((int)$value, $fail);
}
private function validateUserGroup(int $userGroupId, Closure $fail): void
{
try {
@@ -80,7 +79,8 @@ class IsAllowedGroupAction implements ValidationRule
} catch (FireflyException $e) {
Log::error($e->getTraceAsString());
}
die('here we are');
exit('here we are');
Log::debug(sprintf('validateUserGroup: %s', static::class));
if (!auth()->check()) {
Log::debug('validateUserGroup: user is not logged in, return NULL.');
@@ -90,7 +90,7 @@ class IsAllowedGroupAction implements ValidationRule
}
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
if (0 !== $userGroupId) {
Log::debug(sprintf('validateUserGroup: user group submitted, search for memberships in group #%d.', $userGroupId));
}
@@ -110,7 +110,7 @@ class IsAllowedGroupAction implements ValidationRule
}
// need to get the group from the membership:
$userGroup = $this->repository->getById($userGroupId);
$userGroup = $this->repository->getById($userGroupId);
if (null === $userGroup) {
Log::debug(sprintf('validateUserGroup: group #%d does not exist.', $userGroupId));
$fail('validation.belongs_user_or_user_group')->translate();

2
app/Rules/TransactionType/IsValidTransactionTypeList.php
View File

@@ -45,7 +45,7 @@ class IsValidTransactionTypeList implements ValidationRule
if (!is_array($values)) {
$fail('validation.invalid_transaction_type_list')->translate();
}
$keys = array_keys($this->transactionTypes);
$keys = array_keys($this->transactionTypes);
foreach ($values as $entry) {
$entry = (string)$entry;
if (!in_array($entry, $keys, true)) {

2
app/Support/Http/Api/TransactionFilter.php
View File

@@ -70,7 +70,7 @@ trait TransactionFilter
$return = [];
$parts = explode(',', $type);
foreach ($parts as $part) {
if(array_key_exists($part, $this->transactionTypes)) {
if (array_key_exists($part, $this->transactionTypes)) {
$return = array_merge($return, $this->transactionTypes[$part]);
}
}

1
app/Support/Http/Api/ValidatesUserGroupTrait.php
View File

@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace FireflyIII\Support\Http\Api;
use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\UserGroup;
use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
use FireflyIII\User;