kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +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

19
app/Support/Amount.php
View File

@@ -18,12 +18,12 @@ class Amount
{
/**
* @param $amount
* @param bool $coloured
* @param string $amount
* @param bool $coloured
*
* @return string
*/
public function format($amount, $coloured = true)
public function format(string $amount, bool $coloured = true)
{
return $this->formatAnything($this->getDefaultCurrency(), $amount, $coloured);
}
@@ -33,16 +33,17 @@ class Amount
* as a currency, given two things: the currency required and the current locale.
*
* @param TransactionCurrency $format
* @param $amount
* @param string $amount
* @param bool $coloured
*
* @return string
*/
public function formatAnything(TransactionCurrency $format, $amount, $coloured = true)
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true)
{
$locale = setlocale(LC_MONETARY, 0);
$float = floatval($amount);
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
$result = $formatter->formatCurrency($amount, $format->code);
$result = $formatter->formatCurrency($float, $format->code);
if ($coloured === true) {
if ($amount == 0) {
@@ -66,7 +67,7 @@ class Amount
*
* @return string
*/
public function formatJournal(TransactionJournal $journal, $coloured = true)
public function formatJournal(TransactionJournal $journal, bool $coloured = true)
{
$cache = new CacheProperties;
$cache->addProperty($journal->id);
@@ -101,7 +102,7 @@ class Amount
*
* @return string
*/
public function formatTransaction(Transaction $transaction, $coloured = true)
public function formatTransaction(Transaction $transaction, bool $coloured = true)
{
$currency = $transaction->transactionJournal->transactionCurrency;
@@ -115,7 +116,7 @@ class Amount
*
* @return string
*/
public function formatWithSymbol($symbol, $amount, $coloured = true)
public function formatWithSymbol(string $symbol, string $amount, $coloured = true)
{
return $this->formatAnything($this->getDefaultCurrency(), $amount, $coloured);
}