kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-03-18

Browse Source
This commit is contained in:
github-actions
2024-03-18 20:25:30 +01:00
parent db0dbcfcf1
commit 9aa90650b4
108 changed files with 528 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Budget/BudgetLimitRepository.php
View File

@@ -122,7 +122,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
$budgetLimit->delete();
}
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection
{
return $this->getAllBudgetLimits($start, $end)->filter(
static function (BudgetLimit $budgetLimit) use ($currency) {
@@ -131,7 +131,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
);
}
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection
public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection
{
// both are NULL:
if (null === $start && null === $end) {
@@ -198,7 +198,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
;
}
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection
public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection
{
if (null === $end && null === $start) {
return $budget->budgetlimits()->with(['transactionCurrency'])->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']);

6
app/Repositories/Budget/BudgetLimitRepositoryInterface.php
View File

@@ -57,11 +57,11 @@ interface BudgetLimitRepositoryInterface
/**
* TODO this method is not multi currency aware.
*/
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection;
public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection;
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection;
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection;
public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function setUser(null|Authenticatable|User $user): void;

2
app/Repositories/Budget/BudgetRepository.php
View File

@@ -438,7 +438,7 @@ class BudgetRepository implements BudgetRepositoryInterface
*
* @param null|int $budgetId |null
*/
public function find(int $budgetId = null): ?Budget
public function find(?int $budgetId = null): ?Budget
{
return $this->user->budgets()->find($budgetId);
}

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -61,7 +61,7 @@ interface BudgetRepositoryInterface
public function destroyAutoBudget(Budget $budget): void;
public function find(int $budgetId = null): ?Budget;
public function find(?int $budgetId = null): ?Budget;
public function findBudget(?int $budgetId, ?string $budgetName): ?Budget;

6
app/Repositories/LinkType/LinkTypeRepository.php
View File

@@ -44,7 +44,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return $linkType->transactionJournalLinks()->count();
}
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool
public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool
{
if (null !== $moveTo) {
TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]);
@@ -113,7 +113,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
/**
* Returns all the journal links (of a specific type).
*/
public function getJournalLinks(LinkType $linkType = null): Collection
public function getJournalLinks(?LinkType $linkType = null): Collection
{
$query = TransactionJournalLink::with(['source', 'destination'])
->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id')
@@ -225,7 +225,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return LinkType::find($linkTypeId);
}
public function findByName(string $name = null): ?LinkType
public function findByName(?string $name = null): ?LinkType
{
if (null === $name) {
return null;

6
app/Repositories/LinkType/LinkTypeRepositoryInterface.php
View File

@@ -37,7 +37,7 @@ interface LinkTypeRepositoryInterface
{
public function countJournals(LinkType $linkType): int;
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool;
public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool;
public function destroyLink(TransactionJournalLink $link): bool;
@@ -46,7 +46,7 @@ interface LinkTypeRepositoryInterface
/**
* Find link type by name.
*/
public function findByName(string $name = null): ?LinkType;
public function findByName(?string $name = null): ?LinkType;
/**
* Check if link exists between journals.
@@ -65,7 +65,7 @@ interface LinkTypeRepositoryInterface
*/
public function getJournalIds(LinkType $linkType): array;
public function getJournalLinks(LinkType $linkType = null): Collection;
public function getJournalLinks(?LinkType $linkType = null): Collection;
/**
* Return list of existing connections.

2
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -202,7 +202,7 @@ class RecurringRepository implements RecurringRepositoryInterface
/**
* Returns the journals created for this recurrence, possibly limited by time.
*/
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int
public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int
{
$query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.user_id', $recurrence->user_id)

2
app/Repositories/Recurring/RecurringRepositoryInterface.php
View File

@@ -83,7 +83,7 @@ interface RecurringRepositoryInterface
/**
* Returns the count of journals created for this recurrence, possibly limited by time.
*/
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int;
public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int;
/**
* Get journal ID's for journals created by this recurring transaction.