kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Improve test coverage.

Browse Source
This commit is contained in:
James Cole
2019-06-29 19:47:31 +02:00
parent 003d07504f
commit 947b83cbd1
39 changed files with 238 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Support/Twig/AmountFormat.php
View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Support\Twig;
use FireflyIII\Models\Account as AccountModel;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Log;
use Twig_Extension;
use Twig_SimpleFilter;
@@ -87,23 +86,14 @@ class AmountFormat extends Twig_Extension
static function (AccountModel $account, string $amount, bool $coloured = null): string {
if ('testing' === config('app.env')) {
Log::warning('AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!');
Log::warning('Twig AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!');
Log::warning('Make sure AccountRepos and Amount::getDefaultCurrency are mocked.');
}
$coloured = $coloured ?? true;
/** @var AccountRepositoryInterface $accountRepos */
$accountRepos = app(AccountRepositoryInterface::class);
/** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class);
$currency = app('amount')->getDefaultCurrency();
$currencyId = (int)$accountRepos->getMetaValue($account, 'currency_id');
$accountCurrency = null;
if (0 !== $currencyId) {
$accountCurrency = $currencyRepos->findNull($currencyId);
}
if (null !== $accountCurrency) {
$currency = $accountCurrency;
}
$currency = $accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
return app('amount')->formatAnything($currency, $amount, $coloured);
},