IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix another php7 bug.

Browse Source
This commit is contained in:
James Cole 2016-02-05 19:54:25 +01:00
parent cd871e5aad
commit a4e699f781
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Helpers/Collection/BudgetLine.php
View File

@ -31,7 +31,7 @@ class BudgetLine
/**
* @return BudgetModel
*/
public function getBudget()
public function getBudget(): BudgetModel
{
return $this->budget;
}
@ -47,7 +47,7 @@ class BudgetLine
/**
* @return string
*/
public function getBudgeted()
public function getBudgeted(): string
{
return $this->budgeted;
}
@ -63,7 +63,7 @@ class BudgetLine
/**
* @return string
*/
public function getLeft()
public function getLeft(): string
{
return $this->left;
}
@ -79,7 +79,7 @@ class BudgetLine
/**
* @return string
*/
public function getOverspent()
public function getOverspent(): string
{
return $this->overspent;
}
@ -95,7 +95,7 @@ class BudgetLine
/**
* @return LimitRepetition
*/
public function getRepetition()
public function getRepetition(): LimitRepetition
{
return $this->repetition;
}
@ -111,7 +111,7 @@ class BudgetLine
/**
* @return string
*/
public function getSpent()
public function getSpent(): string
{
return $this->spent;
}

4
app/Helpers/Report/BudgetReportHelper.php
View File

@ -32,7 +32,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
*
* @return BudgetCollection
*/
public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts)
public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): BudgetCollection
{
$object = new BudgetCollection;
/** @var \FireflyIII\Repositories\Budget\BudgetRepositoryInterface $repository */
@ -77,7 +77,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
// 200 en -200 is 0, vergeleken met 0 === 0
// 200 en -300 is -100, vergeleken met 0 === -1
$left = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : 0;
$left = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : '0';
$spent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0';
$overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount);