kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Function no longer returns nulls.

Browse Source
This commit is contained in:
James Cole
2020-08-02 12:14:56 +02:00
parent e7e21348eb
commit d0a01d73c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ class BudgetController extends Controller
$return = []; $return = [];
/** @var array|null $arr */ /** @var array|null $arr */
foreach ($expenses as $arr) { foreach ($expenses as $arr) {
if (null !== $arr) { if ([] !== $arr) {
$return[] = $arr; $return[] = $arr;
} }
} }
@@ -263,9 +263,9 @@ class BudgetController extends Controller
/** /**
* @param BudgetLimit $limit * @param BudgetLimit $limit
* *
* @return array|null * @return array
*/ */
private function getExpensesForLimit(BudgetLimit $limit): ?array private function getExpensesForLimit(BudgetLimit $limit): array
{ {
$budget = $limit->budget; $budget = $limit->budget;
$spent = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $limit->transactionCurrency); $spent = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $limit->transactionCurrency);
@@ -273,7 +273,7 @@ class BudgetController extends Controller
// when limited to a currency, the count is always one. Or it's empty. // when limited to a currency, the count is always one. Or it's empty.
$set = array_shift($spent); $set = array_shift($spent);
if (null === $set) { if (null === $set) {
return null; return [];
} }
$return = [ $return = [
'label' => sprintf('%s (%s)', $budget->name, $set['currency_name']), 'label' => sprintf('%s (%s)', $budget->name, $set['currency_name']),