kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Use PSR-12 code style

Browse Source
This commit is contained in:
James Cole
2022-10-30 14:24:28 +01:00
parent 2eebcb21f1
commit f53923f16c
187 changed files with 429 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Budget/AvailableBudgetRepository.php
View File

@@ -75,7 +75,6 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))
->first();
}
/**
@@ -213,7 +212,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
->where('start_date', $start->format('Y-m-d'))
->where('end_date', $end->format('Y-m-d'))->first();
if (null === $availableBudget) {
$availableBudget = new AvailableBudget;
$availableBudget = new AvailableBudget();
$availableBudget->user()->associate($this->user);
$availableBudget->transactionCurrency()->associate($currency);
$availableBudget->start_date = $start->format('Y-m-d');
@@ -312,6 +311,5 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
}
return $availableBudget;
}
}

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

@@ -34,7 +34,6 @@ use Illuminate\Support\Collection;
*/
interface AvailableBudgetRepositoryInterface
{
/**
* Delete all available budgets.
*/
@@ -160,5 +159,4 @@ interface AvailableBudgetRepositoryInterface
* @return AvailableBudget
*/
public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget;
}

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

@@ -57,8 +57,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
*/
public function budgeted(Carbon $start, Carbon $end, TransactionCurrency $currency, ?Collection $budgets = null): string
{
$query = BudgetLimit
::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
$query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
// same complex where query as below.
->where(
@@ -274,11 +273,11 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
)
// budget limit start within period
->orWhere(
static function (Builder $q3) use ($start, $end) {
$q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00'));
$q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59'));
}
);
static function (Builder $q3) use ($start, $end) {
$q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00'));
$q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59'));
}
);
}
)
->orWhere(
@@ -337,7 +336,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
Log::debug('No existing budget limit, create a new one');
// or create one and return it.
$limit = new BudgetLimit;
$limit = new BudgetLimit();
$limit->budget()->associate($budget);
$limit->start_date = $data['start_date']->format('Y-m-d');
$limit->end_date = $data['end_date']->format('Y-m-d');
@@ -443,7 +442,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
}
Log::debug('No existing budget limit, create a new one');
// or create one and return it.
$limit = new BudgetLimit;
$limit = new BudgetLimit();
$limit->budget()->associate($budget);
$limit->start_date = $start->startOfDay();
$limit->end_date = $end->startOfDay();

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

@@ -35,7 +35,6 @@ use Illuminate\Support\Collection;
*/
interface BudgetLimitRepositoryInterface
{
/**
* Tells you which amount has been budgeted (for the given budgets)
* in the selected query. Returns a positive amount as a string.
@@ -128,5 +127,4 @@ interface BudgetLimitRepositoryInterface
* @return BudgetLimit|null
*/
public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit;
}

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

@@ -128,12 +128,14 @@ class BudgetRepository implements BudgetRepositoryInterface
$days = $this->daysInOverlap($limit, $start, $end);
$amount = bcmul(bcdiv((string) $limit->amount, (string) $total), (string) $days);
$return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $amount);
Log::debug(sprintf('Amount per day: %s (%s over %d days). Total amount for %d days: %s',
bcdiv((string) $limit->amount, (string) $total),
$limit->amount,
$total,
$days,
$amount));
Log::debug(sprintf(
'Amount per day: %s (%s over %d days). Total amount for %d days: %s',
bcdiv((string) $limit->amount, (string) $total),
$limit->amount,
$total,
$days,
$amount
));
}
}
return $return;
@@ -398,7 +400,6 @@ class BudgetRepository implements BudgetRepositoryInterface
*/
public function searchBudget(string $query, int $limit): Collection
{
$search = $this->user->budgets();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s%%', $query));
@@ -440,7 +441,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$repository = app(AccountRepositoryInterface::class);
$repository->setUser($this->user);
$subset = $repository->getAccountsByType(config('firefly.valid_liabilities'));
$selection = new Collection;
$selection = new Collection();
/** @var Account $account */
foreach ($subset as $account) {
if ('credit' === $repository->getMetaValue($account, 'liability_direction')) {
@@ -550,7 +551,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$currency = app('amount')->getDefaultCurrencyByUser($this->user);
}
$autoBudget = new AutoBudget;
$autoBudget = new AutoBudget();
$autoBudget->budget()->associate($newBudget);
$autoBudget->transaction_currency_id = $currency->id;
$autoBudget->auto_budget_type = $type;
@@ -593,7 +594,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$dbNote = $budget->notes()->first();
if ('' !== $text) {
if (null === $dbNote) {
$dbNote = new Note;
$dbNote = new Note();
$dbNote->noteable()->associate($budget);
}
$dbNote->text = trim($text);
@@ -723,7 +724,7 @@ class BudgetRepository implements BudgetRepositoryInterface
if (null === $autoBudget) {
// at this point it's a blind assumption auto_budget_type is 1 or 2.
$autoBudget = new AutoBudget;
$autoBudget = new AutoBudget();
$autoBudget->auto_budget_type = $data['auto_budget_type'];
$autoBudget->budget_id = $budget->id;
$autoBudget->transaction_currency_id = $currency->id;
@@ -749,7 +750,6 @@ class BudgetRepository implements BudgetRepositoryInterface
}
if (array_key_exists('auto_budget_amount', $data)) {
$autoBudget->amount = $data['auto_budget_amount'];
}
if (array_key_exists('auto_budget_period', $data)) {
$autoBudget->period = $data['auto_budget_period'];

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

@@ -34,7 +34,6 @@ use Illuminate\Support\Collection;
*/
interface BudgetRepositoryInterface
{
/**
* @param string $query
* @param int $limit
@@ -210,5 +209,4 @@ interface BudgetRepositoryInterface
* @return Budget
*/
public function update(Budget $budget, array $data): Budget;
}

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

@@ -158,7 +158,6 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
*/
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array
{
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
@@ -185,7 +184,6 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
'currency_decimal_places' => $journal['currency_decimal_places'],
];
$array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount']));
}
return $array;

1
app/Repositories/Budget/NoBudgetRepositoryInterface.php
View File

@@ -67,5 +67,4 @@ interface NoBudgetRepositoryInterface
* @return array
*/
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array;
}

13
app/Repositories/Budget/OperationsRepository.php
View File

@@ -194,7 +194,6 @@ class OperationsRepository implements OperationsRepositoryInterface
'transaction_group_id' => $journal['transaction_group_id'],
'date' => $journal['date'],
];
}
return $array;
@@ -290,9 +289,13 @@ class OperationsRepository implements OperationsRepositoryInterface
* @deprecated
* @return array
*/
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null
): array
{
public function sumExpenses(
Carbon $start,
Carbon $end,
?Collection $accounts = null,
?Collection $budgets = null,
?TransactionCurrency $currency = null
): array {
Log::debug(sprintf('Now in %s', __METHOD__));
$start->startOfDay();
$end->endOfDay();
@@ -305,7 +308,7 @@ class OperationsRepository implements OperationsRepositoryInterface
$repository = app(AccountRepositoryInterface::class);
$repository->setUser($this->user);
$subset = $repository->getAccountsByType(config('firefly.valid_liabilities'));
$selection = new Collection;
$selection = new Collection();
/** @var Account $account */
foreach ($subset as $account) {
if ('credit' === $repository->getMetaValue($account, 'liability_direction')) {

9
app/Repositories/Budget/OperationsRepositoryInterface.php
View File

@@ -98,8 +98,11 @@ interface OperationsRepositoryInterface
*
* @return array
*/
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null
public function sumExpenses(
Carbon $start,
Carbon $end,
?Collection $accounts = null,
?Collection $budgets = null,
?TransactionCurrency $currency = null
): array;
}