Various code cleanup.

app/Console/Commands/CreateImport.php

@@ -43,7 +43,8 @@ class CreateImport extends Command
      *
      * @var string
      */
-    protected $signature = 'firefly:create-import
+    protected $signature
+        = 'firefly:create-import
                             {file : The file to import.}
                             {configuration : The configuration file to use for the import/}
                             {--type=csv : The file type of the import.}

app/Console/Commands/VerifiesAccessToken.php

@@ -27,6 +27,7 @@ trait VerifiesAccessToken
 {
     /**
      * Abstract method to make sure trait knows about method "option".
+     *
      * @param null $key
      *
      * @return mixed

app/Export/Entry/Entry.php

@@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace FireflyIII\Export\Entry;
 
 use FireflyIII\Models\Transaction;
-use Steam;
 
 /**
  * To extend the exported object, in case of new features in Firefly III for example,

app/Handlers/Events/AdminEventHandler.php

@@ -49,6 +49,7 @@ class AdminEventHandler
             Session::flash('error', 'Possible email error: ' . $e->getMessage());
         }
         Log::debug('If no error above this line, message was sent.');
+
         // @codeCoverageIgnoreEnd
         return true;
     }

app/Http/Controllers/AccountController.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
@@ -73,7 +72,7 @@ class AccountController extends Controller
         $repository         = app(CurrencyRepositoryInterface::class);
         $allCurrencies      = $repository->get();
         $currencySelectList = ExpandedForm::makeSelectList($allCurrencies);
-        $defaultCurrency    = Amount::getDefaultCurrency();
+        $defaultCurrency    = app('amount')->getDefaultCurrency();
         $subTitleIcon       = config('firefly.subIconsByIdentifier.' . $what);
         $subTitle           = trans('firefly.make_new_' . $what . '_account');
         $roles              = [];
@@ -244,6 +243,7 @@ class AccountController extends Controller
 
     /**
      * Show an account.
+     *
      * @param Request                    $request
      * @param JournalRepositoryInterface $repository
      * @param Account                    $account

app/Http/Controllers/Admin/HomeController.php

@@ -17,8 +17,8 @@ namespace FireflyIII\Http\Controllers\Admin;
 use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Session;
 use Log;
+use Session;
 
 /**
  * Class HomeController
@@ -49,6 +49,7 @@ class HomeController extends Controller
         Log::debug(sprintf('Now in testMessage() controller. IP is %s', $ipAddress));
         event(new AdminRequestedTestMessage(auth()->user(), $ipAddress));
         Session::flash('info', strval(trans('firefly.send_test_triggered')));
+
         return redirect(route('admin.index'));
     }
 

app/Http/Controllers/Auth/LoginController.php

@@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyConfig;
-use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
 use Illuminate\Cookie\CookieJar;

app/Http/Controllers/BillController.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Requests\BillFormRequest;
@@ -131,7 +130,7 @@ class BillController extends Controller
             $this->rememberPreviousUri('bills.edit.uri');
         }
 
-        $currency         = Amount::getDefaultCurrency();
+        $currency         = app('amount')->getDefaultCurrency();
         $bill->amount_min = round($bill->amount_min, $currency->decimal_places);
         $bill->amount_max = round($bill->amount_max, $currency->decimal_places);
 

app/Http/Controllers/BudgetController.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
@@ -199,7 +198,7 @@ class BudgetController extends Controller
         $periodStart       = $start->formatLocalized($this->monthAndDayFormat);
         $periodEnd         = $end->formatLocalized($this->monthAndDayFormat);
         $budgetInformation = $this->repository->collectBudgetInformation($budgets, $start, $end);
-        $defaultCurrency   = Amount::getDefaultCurrency();
+        $defaultCurrency   = app('amount')->getDefaultCurrency();
         $available         = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
         $spent             = array_sum(array_column($budgetInformation, 'spent'));
         $budgeted          = array_sum(array_column($budgetInformation, 'budgeted'));
@@ -268,7 +267,7 @@ class BudgetController extends Controller
                 'earned'    => '0',
                 'suggested' => '0',
             ];
-            $currency = Amount::getDefaultCurrency();
+            $currency = app('amount')->getDefaultCurrency();
             $range    = Preferences::get('viewRange', '1M')->data;
             $begin    = Navigation::subtractPeriod($start, $range, 3);
 
@@ -380,7 +379,7 @@ class BudgetController extends Controller
     {
         $start           = Carbon::createFromFormat('Y-m-d', $request->string('start'));
         $end             = Carbon::createFromFormat('Y-m-d', $request->string('end'));
-        $defaultCurrency = Amount::getDefaultCurrency();
+        $defaultCurrency = app('amount')->getDefaultCurrency();
         $amount          = $request->get('amount');
 
         $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
@@ -515,7 +514,7 @@ class BudgetController extends Controller
      */
     public function updateIncome(Carbon $start, Carbon $end)
     {
-        $defaultCurrency = Amount::getDefaultCurrency();
+        $defaultCurrency = app('amount')->getDefaultCurrency();
         $available       = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
         $available       = round($available, $defaultCurrency->decimal_places);
 

app/Http/Controllers/HomeController.php

@@ -158,7 +158,7 @@ class HomeController extends Controller
                    'login', 'logout', 'password.reset', 'profile.confirm-email-change', 'profile.undo-email-change',
                    'register', 'report.options', 'routes', 'rule-groups.down', 'rule-groups.up', 'rules.up', 'rules.down',
                    'rules.select', 'search.search', 'test-flash', 'transactions.link.delete', 'transactions.link.switch',
-                   'two-factor.lost','report.options'
+                   'two-factor.lost', 'report.options',
 
         ];
 

app/Http/Controllers/JavascriptController.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
@@ -90,17 +89,17 @@ class JavascriptController extends Controller
     public function variables(Request $request)
     {
         $localeconv                = localeconv();
-        $accounting                = Amount::getJsConfig($localeconv);
+        $accounting                = app('amount')->getJsConfig($localeconv);
         $localeconv                = localeconv();
-        $defaultCurrency           = Amount::getDefaultCurrency();
+        $defaultCurrency           = app('amount')->getDefaultCurrency();
         $localeconv['frac_digits'] = $defaultCurrency->decimal_places;
         $pref                      = Preferences::get('language', config('firefly.default_language', 'en_US'));
         $lang                      = $pref->data;
         $dateRange                 = $this->getDateRangeConfig();
 
         $data = [
-            'currencyCode'    => Amount::getCurrencyCode(),
+            'currencyCode'    => app('amount')->getCurrencyCode(),
-            'currencySymbol'  => Amount::getCurrencySymbol(),
+            'currencySymbol'  => app('amount')->getCurrencySymbol(),
             'accounting'      => $accounting,
             'localeconv'      => $localeconv,
             'language'        => $lang,

app/Http/Controllers/JsonController.php

@@ -13,16 +13,10 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
-use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Response;
 

app/Http/Controllers/PiggyBankController.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
@@ -277,14 +276,14 @@ class PiggyBankController extends Controller
     public function postAdd(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $amount   = $request->get('amount');
-        $currency = Amount::getDefaultCurrency();
+        $currency = app('amount')->getDefaultCurrency();
         if ($repository->canAddAmount($piggyBank, $amount)) {
             $repository->addAmount($piggyBank, $amount);
             Session::flash(
                 'success', strval(
                              trans(
                                  'firefly.added_amount_to_piggy',
-                                 ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
+                                 ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
                              )
                          )
             );
@@ -296,7 +295,10 @@ class PiggyBankController extends Controller
         Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.');
         Session::flash(
             'error', strval(
-                       trans('firefly.cannot_add_amount_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
+                       trans(
+                           'firefly.cannot_add_amount_piggy',
+                           ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
+                       )
                    )
         );
 
@@ -313,12 +315,16 @@ class PiggyBankController extends Controller
     public function postRemove(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $amount   = $request->get('amount');
-        $currency = Amount::getDefaultCurrency();
+        $currency = app('amount')->getDefaultCurrency();
         if ($repository->canRemoveAmount($piggyBank, $amount)) {
             $repository->removeAmount($piggyBank, $amount);
             Session::flash(
                 'success',
-                strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => $piggyBank->name]))
+                strval(
+                    trans(
+                        'firefly.removed_amount_from_piggy', ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
+                    )
+                )
             );
             Preferences::mark();
 
@@ -329,7 +335,10 @@ class PiggyBankController extends Controller
 
         Session::flash(
             'error', strval(
-                       trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
+                       trans(
+                           'firefly.cannot_remove_from_piggy',
+                           ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
+                       )
                    )
         );
 

app/Http/Middleware/Range.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
-use Amount;
 use App;
 use Carbon\Carbon;
 use Closure;
@@ -109,7 +108,7 @@ class Range
         // save some formats:
         $monthAndDayFormat = (string)trans('config.month_and_day');
         $dateTimeFormat    = (string)trans('config.date_time');
-        $defaultCurrency   = Amount::getDefaultCurrency();
+        $defaultCurrency   = app('amount')->getDefaultCurrency();
 
         View::share('monthAndDayFormat', $monthAndDayFormat);
         View::share('dateTimeFormat', $dateTimeFormat);

app/Import/Storage/ImportSupport.php

@@ -44,12 +44,10 @@ trait ImportSupport
 {
     /** @var int */
     protected $defaultCurrencyId = 1;
-
-    /** @var  Collection */
-    protected $rules;
-
     /** @var  ImportJob */
     protected $job;
+    /** @var  Collection */
+    protected $rules;
 
     /**
      * @param TransactionJournal $journal

app/Mail/UndoEmailChangeMail.php

@@ -5,7 +5,6 @@ namespace FireflyIII\Mail;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class UndoEmailChangeMail extends Mailable
 {

app/Repositories/Budget/BudgetRepository.php

@@ -52,6 +52,52 @@ class BudgetRepository implements BudgetRepositoryInterface
 
     }
 
+    /**
+     * This method collects various info on budgets, used on the budget page and on the index.
+     *
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array
+    {
+        // get account information
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+        $return            = [];
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $budgetId          = $budget->id;
+            $return[$budgetId] = [
+                'spent'      => $this->spentInPeriod(new Collection([$budget]), $accounts, $start, $end),
+                'budgeted'   => '0',
+                'currentRep' => false,
+            ];
+            $budgetLimits      = $this->getBudgetLimits($budget, $start, $end);
+            $otherLimits       = new Collection;
+
+            // get all the budget limits relevant between start and end and examine them:
+            /** @var BudgetLimit $limit */
+            foreach ($budgetLimits as $limit) {
+                if ($limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)
+                ) {
+                    $return[$budgetId]['currentLimit'] = $limit;
+                    $return[$budgetId]['budgeted']     = $limit->amount;
+                    continue;
+                }
+                // otherwise it's just one of the many relevant repetitions:
+                $otherLimits->push($limit);
+            }
+            $return[$budgetId]['otherLimits'] = $otherLimits;
+        }
+
+        return $return;
+    }
+
     /**
      * @param Budget $budget
      *
@@ -222,53 +268,6 @@ class BudgetRepository implements BudgetRepositoryInterface
         return $set;
     }
 
-    /**
-     * This method collects various info on budgets, used on the budget page and on the index.
-     *
-     * @param Collection $budgets
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array
-    {
-        // get account information
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
-        $return            = [];
-        /** @var Budget $budget */
-        foreach ($budgets as $budget) {
-            $budgetId          = $budget->id;
-            $return[$budgetId] = [
-                'spent'      => $this->spentInPeriod(new Collection([$budget]), $accounts, $start, $end),
-                'budgeted'   => '0',
-                'currentRep' => false,
-            ];
-            $budgetLimits      = $this->getBudgetLimits($budget, $start, $end);
-            $otherLimits       = new Collection;
-
-            // get all the budget limits relevant between start and end and examine them:
-            /** @var BudgetLimit $limit */
-            foreach ($budgetLimits as $limit) {
-                if ($limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)
-                ) {
-                    $return[$budgetId]['currentLimit'] = $limit;
-                    $return[$budgetId]['budgeted']     = $limit->amount;
-                    continue;
-                }
-                // otherwise it's just one of the many relevant repetitions:
-                $otherLimits->push($limit);
-            }
-            $return[$budgetId]['otherLimits'] = $otherLimits;
-        }
-
-        return $return;
-    }
-
-
     /**
      * @param TransactionCurrency $currency
      * @param Carbon              $start

app/Repositories/ExportJob/ExportJobRepository.php

@@ -17,8 +17,8 @@ use Carbon\Carbon;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\User;
 use Illuminate\Support\Str;
-use Storage;
 use Log;
+use Storage;
 
 /**
  * Class ExportJobRepository

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Repositories\PiggyBank;
 
-use Amount;
 use Carbon\Carbon;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\PiggyBank;
@@ -240,12 +239,12 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function getPiggyBanksWithAmount(): Collection
     {
-        $currency = Amount::getDefaultCurrency();
+        $currency = app('amount')->getDefaultCurrency();
         $set      = $this->getPiggyBanks();
         foreach ($set as $piggy) {
             $currentAmount = $piggy->currentRelevantRep()->currentamount ?? '0';
 
-            $piggy->name = $piggy->name . ' (' . Amount::formatAnything($currency, $currentAmount, false) . ')';
+            $piggy->name = $piggy->name . ' (' . app('amount')->formatAnything($currency, $currentAmount, false) . ')';
         }
 
         return $set;

app/Services/Bunq/Request/BunqRequest.php

@@ -40,15 +40,6 @@ abstract class BunqRequest
             'x-bunq-client-request-id'  => 'X-Bunq-Client-Request-Id',
         ];
 
-    /**
-     * @return ServerPublicKey
-     */
-    public function getServerPublicKey(): ServerPublicKey
-    {
-        return $this->serverPublicKey;
-    }
-
-
     /**
      * BunqRequest constructor.
      */
@@ -70,6 +61,22 @@ abstract class BunqRequest
         return $this->server;
     }
 
+    /**
+     * @return ServerPublicKey
+     */
+    public function getServerPublicKey(): ServerPublicKey
+    {
+        return $this->serverPublicKey;
+    }
+
+    /**
+     * @param ServerPublicKey $serverPublicKey
+     */
+    public function setServerPublicKey(ServerPublicKey $serverPublicKey)
+    {
+        $this->serverPublicKey = $serverPublicKey;
+    }
+
     /**
      * @param string $privateKey
      */
@@ -86,14 +93,6 @@ abstract class BunqRequest
         $this->secret = $secret;
     }
 
-    /**
-     * @param ServerPublicKey $serverPublicKey
-     */
-    public function setServerPublicKey(ServerPublicKey $serverPublicKey)
-    {
-        $this->serverPublicKey = $serverPublicKey;
-    }
-
     /**
      * @param string $method
      * @param string $uri

app/Support/Steam.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support;
 
-use Amount as GlobalAmount;
 use Carbon\Carbon;
 use Crypt;
 use DB;
@@ -51,7 +50,7 @@ class Steam
         $currencyId = intval($account->getMeta('currency_id'));
         // use system default currency:
         if ($currencyId === 0) {
-            $currency   = GlobalAmount::getDefaultCurrency();
+            $currency   = app('amount')->getDefaultCurrency();
             $currencyId = $currency->id;
         }
         // first part: get all balances in own currency:

app/Support/Twig/AmountFormat.php

@@ -265,12 +265,12 @@ class AmountFormat extends Twig_Extension
     /**
      * @return Twig_SimpleFunction
      */
-    protected function journalTotalAmount(): Twig_SimpleFunction
+    protected function journalAmount(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'journalTotalAmount', function (TransactionJournal $journal): string {
+            'journalAmount', function (TransactionJournal $journal): string {
 
-            return app('amount')->journalTotalAmount($journal, true);
+            return app('amount')->journalAmount($journal, true);
         }, ['is_safe' => ['html']]
         );
     }
@@ -278,12 +278,12 @@ class AmountFormat extends Twig_Extension
     /**
      * @return Twig_SimpleFunction
      */
-    protected function journalAmount(): Twig_SimpleFunction
+    protected function journalTotalAmount(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'journalAmount', function (TransactionJournal $journal): string {
+            'journalTotalAmount', function (TransactionJournal $journal): string {
 
-            return app('amount')->journalAmount($journal, true);
+            return app('amount')->journalTotalAmount($journal, true);
         }, ['is_safe' => ['html']]
         );
     }

tests/Feature/Controllers/BudgetControllerTest.php

@@ -136,7 +136,6 @@ class BudgetControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::index
-     * @covers       \FireflyIII\Http\Controllers\BudgetController::collectBudgetInformation
      * @covers       \FireflyIII\Http\Controllers\BudgetController::__construct
      * @dataProvider dateRangeProvider
      *
@@ -184,7 +183,6 @@ class BudgetControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::index
-     * @covers       \FireflyIII\Http\Controllers\BudgetController::collectBudgetInformation
      * @covers       \FireflyIII\Http\Controllers\BudgetController::__construct
      * @dataProvider dateRangeProvider
      *
@@ -232,7 +230,6 @@ class BudgetControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::index
-     * @covers       \FireflyIII\Http\Controllers\BudgetController::collectBudgetInformation
      * @covers       \FireflyIII\Http\Controllers\BudgetController::__construct
      * @dataProvider dateRangeProvider
      *

tests/Feature/Controllers/JavascriptControllerTest.php

@@ -63,7 +63,7 @@ class JavascriptControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\JavascriptController::variables
-     * @covers       \FireflyIII\Http\Controllers\JavascriptController::getDateRangePicker
+     * @covers       \FireflyIII\Http\Controllers\JavascriptController::getDateRangeConfig
      *
      * @param string $range
      *

tests/Feature/Controllers/NewUserControllerTest.php

@@ -68,7 +68,6 @@ class NewUserControllerTest extends TestCase
      * @covers \FireflyIII\Http\Controllers\NewUserController::submit
      * @covers \FireflyIII\Http\Controllers\NewUserController::createAssetAccount
      * @covers \FireflyIII\Http\Controllers\NewUserController::createSavingsAccount
-     * @covers \FireflyIII\Http\Controllers\NewUserController::storeCreditCard
      */
     public function testSubmit()
     {