From a4e699f7813376b7742a3e2fdf2181c75398d0ea Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 5 Feb 2016 19:54:25 +0100 Subject: [PATCH] Fix another php7 bug. --- app/Helpers/Collection/BudgetLine.php | 12 ++++++------ app/Helpers/Report/BudgetReportHelper.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Helpers/Collection/BudgetLine.php b/app/Helpers/Collection/BudgetLine.php index d755a6cf02..d4a0cfc2c0 100644 --- a/app/Helpers/Collection/BudgetLine.php +++ b/app/Helpers/Collection/BudgetLine.php @@ -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; } diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php index cea6d69ff9..57cd56d0c3 100644 --- a/app/Helpers/Report/BudgetReportHelper.php +++ b/app/Helpers/Report/BudgetReportHelper.php @@ -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);