kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 20:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Changed a lot of parameters.

Browse Source
This commit is contained in:
James Cole
2016-02-05 09:25:15 +01:00
parent 554640c345
commit 78bcd3e1bb
64 changed files with 539 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Helpers/Collection/Account.php
View File

@@ -15,11 +15,11 @@ class Account
/** @var Collection */
protected $accounts;
/** @var float */
/** @var string */
protected $difference;
/** @var float */
/** @var string */
protected $end;
/** @var float */
/** @var string */
protected $start;
/**
@@ -31,15 +31,15 @@ class Account
}
/**
* @param \Illuminate\Support\Collection $accounts
* @param Collection $accounts
*/
public function setAccounts($accounts)
public function setAccounts(Collection $accounts)
{
$this->accounts = $accounts;
}
/**
* @return float
* @return string
*/
public function getDifference()
{
@@ -47,15 +47,15 @@ class Account
}
/**
* @param float $difference
* @param string $difference
*/
public function setDifference($difference)
public function setDifference(string $difference)
{
$this->difference = $difference;
}
/**
* @return float
* @return string
*/
public function getEnd()
{
@@ -63,15 +63,15 @@ class Account
}
/**
* @param float $end
* @param string $end
*/
public function setEnd($end)
public function setEnd(string $end)
{
$this->end = $end;
}
/**
* @return float
* @return string
*/
public function getStart()
{
@@ -79,9 +79,9 @@ class Account
}
/**
* @param float $start
* @param string $start
*/
public function setStart($start)
public function setStart(string $start)
{
$this->start = $start;
}

2
app/Helpers/Collection/Balance.php
View File

@@ -47,7 +47,7 @@ class Balance
/**
* @param BalanceHeader $balanceHeader
*/
public function setBalanceHeader($balanceHeader)
public function setBalanceHeader(BalanceHeader $balanceHeader)
{
$this->balanceHeader = $balanceHeader;
}

22
app/Helpers/Collection/BalanceEntry.php
View File

@@ -17,10 +17,10 @@ class BalanceEntry
/** @var AccountModel */
protected $account;
/** @var float */
protected $left = 0.0;
/** @var float */
protected $spent = 0.0;
/** @var string */
protected $left = '0';
/** @var string */
protected $spent = '0';
/**
* @return AccountModel
@@ -33,13 +33,13 @@ class BalanceEntry
/**
* @param AccountModel $account
*/
public function setAccount($account)
public function setAccount(AccountModel $account)
{
$this->account = $account;
}
/**
* @return float
* @return string
*/
public function getLeft()
{
@@ -47,15 +47,15 @@ class BalanceEntry
}
/**
* @param float $left
* @param string $left
*/
public function setLeft($left)
public function setLeft(string $left)
{
$this->left = $left;
}
/**
* @return float
* @return string
*/
public function getSpent()
{
@@ -63,9 +63,9 @@ class BalanceEntry
}
/**
* @param float $spent
* @param string $spent
*/
public function setSpent($spent)
public function setSpent(string $spent)
{
$this->spent = $spent;
}

14
app/Helpers/Collection/BalanceLine.php
View File

@@ -25,6 +25,7 @@ class BalanceLine
/** @var BudgetModel */
protected $budget;
/** @var int */
protected $role = self::ROLE_DEFAULTROLE;
/**
@@ -54,7 +55,7 @@ class BalanceLine
/**
* @param Collection $balanceEntries
*/
public function setBalanceEntries($balanceEntries)
public function setBalanceEntries(Collection $balanceEntries)
{
$this->balanceEntries = $balanceEntries;
}
@@ -70,7 +71,7 @@ class BalanceLine
/**
* @param BudgetModel $budget
*/
public function setBudget($budget)
public function setBudget(BudgetModel $budget)
{
$this->budget = $budget;
}
@@ -86,7 +87,7 @@ class BalanceLine
/**
* @param int $role
*/
public function setRole($role)
public function setRole(int $role)
{
$this->role = $role;
}
@@ -118,14 +119,15 @@ class BalanceLine
* on the given budget/repetition. If you subtract all those amounts from the budget/repetition's
* total amount, this is returned:
*
* @return float
* @return string
*/
public function leftOfRepetition()
{
$start = $this->budget->amount ?? 0;
bcscale(2);
$start = $this->budget->amount ?? '0';
/** @var BalanceEntry $balanceEntry */
foreach ($this->getBalanceEntries() as $balanceEntry) {
$start += $balanceEntry->getSpent();
$start = bcadd($balanceEntry->getSpent(), $start);
}
return $start;

16
app/Helpers/Collection/BillLine.php
View File

@@ -38,7 +38,7 @@ class BillLine
/**
* @param string $amount
*/
public function setAmount($amount)
public function setAmount(string $amount)
{
$this->amount = $amount;
}
@@ -54,7 +54,7 @@ class BillLine
/**
* @param BillModel $bill
*/
public function setBill($bill)
public function setBill(BillModel $bill)
{
$this->bill = $bill;
}
@@ -70,7 +70,7 @@ class BillLine
/**
* @param string $max
*/
public function setMax($max)
public function setMax(string $max)
{
$this->max = $max;
}
@@ -86,7 +86,7 @@ class BillLine
/**
* @param string $min
*/
public function setMin($min)
public function setMin(string $min)
{
$this->min = $min;
}
@@ -100,9 +100,9 @@ class BillLine
}
/**
* @param boolean $active
* @param bool $active
*/
public function setActive($active)
public function setActive(bool $active)
{
$this->active = $active;
}
@@ -116,9 +116,9 @@ class BillLine
}
/**
* @param boolean $hit
* @param bool $hit
*/
public function setHit($hit)
public function setHit(bool $hit)
{
$this->hit = $hit;
}

24
app/Helpers/Collection/Budget.php
View File

@@ -41,9 +41,9 @@ class Budget
}
/**
* @param float $add
* @param string $add
*/
public function addBudgeted($add)
public function addBudgeted(string $add)
{
$add = strval(round($add, 2));
bcscale(2);
@@ -51,9 +51,9 @@ class Budget
}
/**
* @param float $add
* @param string $add
*/
public function addLeft($add)
public function addLeft(string $add)
{
$add = strval(round($add, 2));
bcscale(2);
@@ -61,9 +61,9 @@ class Budget
}
/**
* @param float $add
* @param string $add
*/
public function addOverspent($add)
public function addOverspent(string $add)
{
$add = strval(round($add, 2));
bcscale(2);
@@ -71,9 +71,9 @@ class Budget
}
/**
* @param float $add
* @param string $add
*/
public function addSpent($add)
public function addSpent(string $add)
{
$add = strval(round($add, 2));
bcscale(2);
@@ -99,7 +99,7 @@ class Budget
/**
* @param string $budgeted
*/
public function setBudgeted($budgeted)
public function setBudgeted(string $budgeted)
{
$this->budgeted = $budgeted;
}
@@ -115,7 +115,7 @@ class Budget
/**
* @param string $left
*/
public function setLeft($left)
public function setLeft(string $left)
{
$this->left = $left;
}
@@ -131,7 +131,7 @@ class Budget
/**
* @param string $overspent
*/
public function setOverspent($overspent)
public function setOverspent(string $overspent)
{
$this->overspent = strval(round($overspent, 2));
}
@@ -147,7 +147,7 @@ class Budget
/**
* @param string $spent
*/
public function setSpent($spent)
public function setSpent(string $spent)
{
$this->spent = strval(round($spent, 2));
}

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

@@ -17,16 +17,16 @@ class BudgetLine
/** @var BudgetModel */
protected $budget;
/** @var float */
protected $budgeted = 0;
/** @var float */
protected $left = 0;
/** @var float */
protected $overspent = 0;
/** @var string */
protected $budgeted = '0';
/** @var string */
protected $left = '0';
/** @var string */
protected $overspent = '0';
/** @var LimitRepetition */
protected $repetition;
/** @var float */
protected $spent = 0;
/** @var string */
protected $spent = '0';
/**
* @return BudgetModel
@@ -39,13 +39,13 @@ class BudgetLine
/**
* @param BudgetModel $budget
*/
public function setBudget($budget)
public function setBudget(BudgetModel $budget)
{
$this->budget = $budget;
}
/**
* @return float
* @return string
*/
public function getBudgeted()
{
@@ -53,15 +53,15 @@ class BudgetLine
}
/**
* @param float $budgeted
* @param string $budgeted
*/
public function setBudgeted($budgeted)
public function setBudgeted(string $budgeted)
{
$this->budgeted = $budgeted;
}
/**
* @return float
* @return string
*/
public function getLeft()
{
@@ -69,15 +69,15 @@ class BudgetLine
}
/**
* @param float $left
* @param string $left
*/
public function setLeft($left)
public function setLeft(string $left)
{
$this->left = $left;
}
/**
* @return float
* @return string
*/
public function getOverspent()
{
@@ -85,9 +85,9 @@ class BudgetLine
}
/**
* @param float $overspent
* @param string $overspent
*/
public function setOverspent($overspent)
public function setOverspent(string $overspent)
{
$this->overspent = $overspent;
}
@@ -103,13 +103,13 @@ class BudgetLine
/**
* @param LimitRepetition $repetition
*/
public function setRepetition($repetition)
public function setRepetition(LimitRepetition $repetition)
{
$this->repetition = $repetition;
}
/**
* @return float
* @return string
*/
public function getSpent()
{
@@ -117,9 +117,9 @@ class BudgetLine
}
/**
* @param float $spent
* @param string $spent
*/
public function setSpent($spent)
public function setSpent(string $spent)
{
$this->spent = $spent;
}

4
app/Helpers/Collection/Category.php
View File

@@ -42,9 +42,9 @@ class Category
}
/**
* @param float $add
* @param string $add
*/
public function addTotal($add)
public function addTotal(string $add)
{
$add = strval(round($add, 2));
bcscale(2);

4
app/Helpers/Collection/Expense.php
View File

@@ -58,9 +58,9 @@ class Expense
}
/**
* @param $add
* @param string $add
*/
public function addToTotal($add)
public function addToTotal(string $add)
{
bcscale(2);

6
app/Helpers/Collection/Income.php
View File

@@ -20,7 +20,7 @@ class Income
/** @var Collection */
protected $incomes;
/** @var string */
protected $total;
protected $total = '0';
/**
*
@@ -54,9 +54,9 @@ class Income
}
/**
* @param $add
* @param string $add
*/
public function addToTotal($add)
public function addToTotal(string $add)
{
$add = strval(round($add, 2));
bcscale(2);