From ae7933c8c9335538999f075ece2c8cbbf2bb71e2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 Dec 2017 11:57:38 +0100 Subject: [PATCH 01/22] use config, not preferences, first tests. --- .../Events/VersionCheckEventHandler.php | 12 ++- .../Controllers/Admin/UpdateController.php | 8 +- .../Admin/UpdateControllerTest.php | 79 +++++++++++++++++++ 3 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 tests/Feature/Controllers/Admin/UpdateControllerTest.php diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index e22655c65c..4308d8da10 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -23,10 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Handlers\Events; +use FireflyConfig; use FireflyIII\User; use Illuminate\Auth\Events\Login; use Log; -use Preferences; /** * Class VersionCheckEventHandler @@ -45,9 +45,13 @@ class VersionCheckEventHandler } /** @var User $user */ - $user = $event->user; - $permission = Preferences::getForUser($user, 'permission_update_check', -1); - $lastCheckTime = Preferences::getForUser($user, 'last_update_check', time()); + $user = $event->user; + if (!$user->hasRole('owner')) { + return; + } + + $permission = FireflyConfig::get('permission_update_check', -1); + $lastCheckTime = FireflyConfig::get('last_update_check', time()); $now = time(); if ($now - $lastCheckTime->data < 604800) { Log::debug('Checked for updates less than a week ago.'); diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 28127c4530..7142c43cde 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -30,7 +30,6 @@ use FireflyIII\Services\Github\Object\Release; use FireflyIII\Services\Github\Request\UpdateRequest; use Illuminate\Http\Request; use Log; -use Preferences; use Response; use Session; @@ -67,7 +66,7 @@ class UpdateController extends Controller { $subTitle = trans('firefly.update_check_title'); $subTitleIcon = 'fa-star'; - $permission = app('preferences')->get('permission_update_check', -1); + $permission = app('fireflyconfig')->get('permission_update_check', -1); $selected = $permission->data; $options = [ '-1' => trans('firefly.updates_ask_me_later'), @@ -86,9 +85,8 @@ class UpdateController extends Controller public function post(Request $request) { $checkForUpdates = intval($request->get('check_for_updates')); - Preferences::set('permission_update_check', $checkForUpdates); + app('fireflyconfig')->set('permission_update_check', $checkForUpdates); Session::flash('success', strval(trans('firefly.configuration_updated'))); - Preferences::mark(); return redirect(route('admin.update-check')); } @@ -109,7 +107,7 @@ class UpdateController extends Controller $first = reset($releases); $string = ''; $check = version_compare($current, $first->getTitle()); - Preferences::set('last_update_check', time()); + app('fireflyconfig')->set('last_update_check', time()); } catch (FireflyException $e) { Log::error(sprintf('Could not check for updates: %s', $e->getMessage())); } diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php new file mode 100644 index 0000000000..a0e4bf69d1 --- /dev/null +++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php @@ -0,0 +1,79 @@ +. + */ +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Admin; + +use FireflyConfig; +use FireflyIII\Models\Configuration; +use Tests\TestCase; + +/** + * Class UpdateControllerTest + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class ConfigurationControllerTest extends TestCase +{ + /** + * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::index + * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::__construct + */ + public function testIndex() + { + $this->be($this->user()); + + $config = new Configuration; + $config->data = -1; + + $falseConfig = new Configuration; + $falseConfig->data = false; + + FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', true])->once()->andReturn($config); + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); + + $response = $this->get(route('admin.update-check')); + $response->assertStatus(200); + + // has bread crumb + $response->assertSee('
    '); + } + +// /** +// * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex +// */ +// public function testPostIndex() +// { +// $falseConfig = new Configuration; +// $falseConfig->data = false; +// +// FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); +// FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once(); +// FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once(); +// +// $this->be($this->user()); +// $response = $this->post(route('admin.configuration.index.post')); +// $response->assertSessionHas('success'); +// $response->assertStatus(302); +// } +} From 42676746a2ac6e0f6d9b958a377228436a5f1f2f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 Dec 2017 18:26:08 +0100 Subject: [PATCH 02/22] Remove Spectre table. --- .../2017_12_09_111046_changes_for_spectre.php | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 database/migrations/2017_12_09_111046_changes_for_spectre.php diff --git a/database/migrations/2017_12_09_111046_changes_for_spectre.php b/database/migrations/2017_12_09_111046_changes_for_spectre.php deleted file mode 100644 index ce907194ce..0000000000 --- a/database/migrations/2017_12_09_111046_changes_for_spectre.php +++ /dev/null @@ -1,67 +0,0 @@ -. - */ - -use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; - -/** - * Class ChangesForSpectre - */ -class ChangesForSpectre extends Migration -{ - /** - * Reverse the migrations. - */ - public function down() - { - } - - /** - * Run the migrations. - */ - public function up() - { - // create provider table: - if (!Schema::hasTable('spectre_providers')) { - Schema::create( - 'spectre_providers', - function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - //'spectre_id', 'code', 'mode', 'name', 'status', 'interactive', 'automatic_fetch', 'country_code', 'data' - $table->integer('spectre_id', false, true); - $table->string('code', 100); - $table->string('mode', 20); - $table->string('status', 20); - $table->boolean('interactive')->default(0); - $table->boolean('automatic_fetch')->default(0); - $table->string('country_code', 3); - $table->text('data'); - } - ); - } - } -} From 0977d8d631d760e6b2771e710551479df13c3a0d Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 Dec 2017 18:28:22 +0100 Subject: [PATCH 03/22] Fix #1070 --- app/Import/Object/ImportAccount.php | 2 +- app/Repositories/Account/AccountRepository.php | 4 ++-- app/Repositories/Account/FindAccountsTrait.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Import/Object/ImportAccount.php b/app/Import/Object/ImportAccount.php index b122aee8c0..ba9330e8f3 100644 --- a/app/Import/Object/ImportAccount.php +++ b/app/Import/Object/ImportAccount.php @@ -359,7 +359,7 @@ class ImportAccount 'name' => $this->accountName['value'] ?? '(no name)', 'iban' => $this->accountIban['value'] ?? null, 'active' => true, - 'virtualBalance' => null, + 'virtualBalance' => '0', ]; $this->account = $this->repository->store($data); diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index d7f9d48757..849ce97aac 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -190,7 +190,7 @@ class AccountRepository implements AccountRepositoryInterface // update the account: $account->name = $data['name']; $account->active = $data['active']; - $account->virtual_balance = $data['virtualBalance']; + $account->virtual_balance = trim($data['virtualBalance']) === '' ? '0': $data['virtualBalance']; $account->iban = $data['iban']; $account->save(); @@ -424,7 +424,7 @@ class AccountRepository implements AccountRepositoryInterface 'name' => $name . ' initial balance', 'active' => false, 'iban' => '', - 'virtualBalance' => 0, + 'virtualBalance' => '0', ]; Log::debug('Going to create an opening balance opposing account.'); diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php index 95f43af9d0..8214dd1157 100644 --- a/app/Repositories/Account/FindAccountsTrait.php +++ b/app/Repositories/Account/FindAccountsTrait.php @@ -252,7 +252,7 @@ trait FindAccountsTrait 'accountType' => 'reconcile', 'name' => $name, 'iban' => null, - 'virtualBalance' => null, + 'virtualBalance' => '0', 'active' => true, ]; $account = $this->storeAccount($data); From a10672a6839ee2e79c6cd609bc464df797a988bd Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 Dec 2017 18:38:59 +0100 Subject: [PATCH 04/22] Progress for Spectre import. --- app/Import/Routine/SpectreRoutine.php | 160 +++----- app/Jobs/GetSpectreProviders.php | 109 ------ app/Models/ImportJob.php | 3 + app/Models/SpectreProvider.php | 52 --- app/Services/Spectre/Object/Customer.php | 12 + app/Services/Spectre/Object/Login.php | 32 -- app/Services/Spectre/Object/Token.php | 76 ++++ .../Spectre/Request/CreateLoginRequest.php | 109 ------ .../Spectre/Request/CreateTokenRequest.php | 94 +++++ .../Spectre/Request/ListLoginsRequest.php | 101 ----- .../Spectre/Request/ListProvidersRequest.php | 81 ---- .../Spectre/Request/NewCustomerRequest.php | 12 +- .../Configuration/Spectre/InputMandatory.php | 121 ------ .../Configuration/Spectre/SelectCountry.php | 348 ------------------ .../Configuration/Spectre/SelectProvider.php | 93 ----- .../Import/Information/SpectreInformation.php | 217 ----------- public/js/ff/import/status.js | 15 + resources/views/import/spectre/redirect.twig | 15 + resources/views/import/status.twig | 1 + 19 files changed, 272 insertions(+), 1379 deletions(-) delete mode 100644 app/Jobs/GetSpectreProviders.php delete mode 100644 app/Models/SpectreProvider.php delete mode 100644 app/Services/Spectre/Object/Login.php create mode 100644 app/Services/Spectre/Object/Token.php delete mode 100644 app/Services/Spectre/Request/CreateLoginRequest.php create mode 100644 app/Services/Spectre/Request/CreateTokenRequest.php delete mode 100644 app/Services/Spectre/Request/ListLoginsRequest.php delete mode 100644 app/Services/Spectre/Request/ListProvidersRequest.php delete mode 100644 app/Support/Import/Configuration/Spectre/InputMandatory.php delete mode 100644 app/Support/Import/Configuration/Spectre/SelectCountry.php delete mode 100644 app/Support/Import/Configuration/Spectre/SelectProvider.php delete mode 100644 app/Support/Import/Information/SpectreInformation.php create mode 100644 resources/views/import/spectre/redirect.twig diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php index fd9f0c6e03..fbd12ae9c7 100644 --- a/app/Import/Routine/SpectreRoutine.php +++ b/app/Import/Routine/SpectreRoutine.php @@ -22,11 +22,11 @@ declare(strict_types=1); namespace FireflyIII\Import\Routine; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; -use FireflyIII\Models\SpectreProvider; use FireflyIII\Services\Spectre\Object\Customer; -use FireflyIII\Services\Spectre\Request\CreateLoginRequest; -use FireflyIII\Services\Spectre\Request\ListLoginsRequest; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Services\Spectre\Request\CreateTokenRequest; use FireflyIII\Services\Spectre\Request\NewCustomerRequest; use Illuminate\Support\Collection; use Log; @@ -90,31 +90,48 @@ class SpectreRoutine implements RoutineInterface return false; } - set_time_limit(0); Log::info(sprintf('Start with import job %s using Spectre.', $this->job->key)); - // create customer if user does not have one: - $customer = $this->getCustomer(); + set_time_limit(0); - // list all logins present at Spectre - $logins = $this->listLogins($customer); + // check if job has token first! + $config = $this->job->configuration; + $hasToken = $config['has-token'] ?? false; + if ($hasToken === false) { + Log::debug('Job has no token'); + // create customer if user does not have one: + $customer = $this->getCustomer(); + Log::debug(sprintf('Customer ID is %s', $customer->getId())); + // use customer to request a token: + $uri = route('import.status', [$this->job->key]); + $token = $this->getToken($customer, $uri); + Log::debug(sprintf('Token is %s', $token->getToken())); - // use latest (depending on status, and if login exists for selected country + provider) - $country = $this->job->configuration['country']; - $providerId = $this->job->configuration['provider']; - $login = $this->filterLogins($logins, $country, $providerId); + // update job, give it the token: + $config = $this->job->configuration; + $config['has-token'] = true; + $config['token'] = $token->getToken(); + $config['token-expires'] = $token->getExpiresAt()->format('U'); + $config['token-url'] = $token->getConnectUrl(); + $this->job->configuration = $config; - // create new login if list is empty or no login exists. - if (is_null($login)) { - $login = $this->createLogin($customer); - var_dump($login); - exit; + Log::debug('Job config is now', $config); + + // update job, set status to "configuring". + $this->job->status = 'configuring'; + $this->job->save(); + Log::debug(sprintf('Job status is now %s', $this->job->status)); + + return true; + } + $isRedirected = $config['is-redirected'] ?? false; + if ($isRedirected === true) { + // assume user has "used" the token. + // ... + // now what? + throw new FireflyException('Application cannot handle this.'); } - echo '
    ';
-        print_r($logins);
-        exit;
-
-        return true;
+        throw new FireflyException('Application cannot handle this.');
     }
 
     /**
@@ -135,49 +152,12 @@ class SpectreRoutine implements RoutineInterface
         $newCustomerRequest->call();
         $customer = $newCustomerRequest->getCustomer();
 
-        // store customer. Not sure where. User preference? TODO
+        Preferences::setForUser($this->job->user, 'spectre_customer', $customer->toArray());
+
         return $customer;
 
     }
 
-    /**
-     * @param Customer $customer
-     */
-    protected function createLogin(Customer $customer)
-    {
-
-        $providerId = intval($this->job->configuration['provider']);
-        $provider   = $this->findProvider($providerId);
-
-
-        $createLoginRequest = new CreateLoginRequest($this->job->user);
-        $createLoginRequest->setCustomer($customer);
-        $createLoginRequest->setProvider($provider);
-        $createLoginRequest->setMandatoryFields($this->decrypt($this->job->configuration['mandatory-fields']));
-        $createLoginRequest->call();
-        echo '123';
-        // country code, provider code (find by spectre ID)
-        // credentials
-        // daily_refresh=true
-        // fetch_type=recent
-        // include_fake_providers=true
-        // store_credentials=true
-
-
-        var_dump($this->job->configuration);
-        exit;
-    }
-
-    /**
-     * @param int $providerId
-     *
-     * @return SpectreProvider|null
-     */
-    protected function findProvider(int $providerId): ?SpectreProvider
-    {
-        return SpectreProvider::where('spectre_id', $providerId)->first();
-    }
-
     /**
      * @return Customer
      * @throws \FireflyIII\Exceptions\FireflyException
@@ -188,61 +168,27 @@ class SpectreRoutine implements RoutineInterface
         if (is_null($preference)) {
             return $this->createCustomer();
         }
-        var_dump($preference->data);
-        exit;
+        $customer = new Customer($preference->data);
+
+        return $customer;
     }
 
     /**
      * @param Customer $customer
+     * @param string   $returnUri
      *
-     * @return array
+     * @return Token
      * @throws \FireflyIII\Exceptions\FireflyException
      */
-    protected function listLogins(Customer $customer): array
+    protected function getToken(Customer $customer, string $returnUri): Token
     {
-        $listLoginRequest = new ListLoginsRequest($this->job->user);
-        $listLoginRequest->setCustomer($customer);
-        $listLoginRequest->call();
+        $request = new CreateTokenRequest($this->job->user);
+        $request->setUri($returnUri);
+        $request->setCustomer($customer);
+        $request->call();
+        Log::debug('Call to get token is finished');
 
-        $logins = $listLoginRequest->getLogins();
+        return $request->getToken();
 
-        return $logins;
-    }
-
-    /**
-     * @param array $configuration
-     *
-     * @return array
-     */
-    private function decrypt(array $configuration): array
-    {
-        $new = [];
-        foreach ($configuration as $key => $value) {
-            $new[$key] = app('steam')->tryDecrypt($value);
-        }
-
-        return $new;
-    }
-
-    /**
-     * Return login belonging to country and provider
-     * TODO must return Login object, not array
-     *
-     * @param array  $logins
-     * @param string $country
-     * @param int    $providerId
-     *
-     * @return array|null
-     */
-    private function filterLogins(array $logins, string $country, int $providerId): ?array
-    {
-        if (count($logins) === 0) {
-            return null;
-        }
-        foreach ($logins as $login) {
-            die('do some filter');
-        }
-
-        return null;
     }
 }
diff --git a/app/Jobs/GetSpectreProviders.php b/app/Jobs/GetSpectreProviders.php
deleted file mode 100644
index d29da378fd..0000000000
--- a/app/Jobs/GetSpectreProviders.php
+++ /dev/null
@@ -1,109 +0,0 @@
-.
- */
-
-namespace FireflyIII\Jobs;
-
-use FireflyIII\Models\Configuration;
-use FireflyIII\Models\SpectreProvider;
-use FireflyIII\Services\Spectre\Request\ListProvidersRequest;
-use FireflyIII\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Log;
-
-/**
- * Class GetSpectreProviders
- */
-class GetSpectreProviders implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * @var User
-     */
-    protected $user;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param User $user
-     */
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-        Log::debug('Constructed job GetSpectreProviders');
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @throws \Illuminate\Container\EntryNotFoundException
-     * @throws \Exception
-     */
-    public function handle()
-    {
-        /** @var Configuration $configValue */
-        $configValue = app('fireflyconfig')->get('spectre_provider_download', 0);
-        $now         = time();
-        if ($now - intval($configValue->data) < 86400) {
-            Log::debug(sprintf('Difference is %d, so will NOT execute job.', ($now - intval($configValue->data))));
-
-            return;
-        }
-        Log::debug(sprintf('Difference is %d, so will execute job.', ($now - intval($configValue->data))));
-
-        // get user
-
-        // fire away!
-        $request = new ListProvidersRequest($this->user);
-        $request->call();
-
-        // store all providers:
-        $providers = $request->getProviders();
-        foreach ($providers as $provider) {
-            // find provider?
-            $dbProvider = SpectreProvider::where('spectre_id', $provider['id'])->first();
-            if (is_null($dbProvider)) {
-                $dbProvider = new SpectreProvider;
-            }
-            // update fields:
-            $dbProvider->spectre_id      = $provider['id'];
-            $dbProvider->code            = $provider['code'];
-            $dbProvider->mode            = $provider['mode'];
-            $dbProvider->status          = $provider['status'];
-            $dbProvider->interactive     = 1 === $provider['interactive'];
-            $dbProvider->automatic_fetch = 1 === $provider['automatic_fetch'];
-            $dbProvider->country_code    = $provider['country_code'];
-            $dbProvider->data            = $provider;
-            $dbProvider->save();
-            Log::debug(sprintf('Stored provider #%d under ID #%d', $provider['id'], $dbProvider->id));
-        }
-
-        app('fireflyconfig')->set('spectre_provider_download', time());
-
-        return;
-    }
-}
diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php
index b9256ea25a..57015f946b 100644
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@@ -127,6 +127,7 @@ class ImportJob extends Model
     public function change(string $status): void
     {
         if (in_array($status, $this->validStatus)) {
+            Log::debug(sprintf('Job status set (in model) to "%s"', $status));
             $this->status = $status;
             $this->save();
 
@@ -169,6 +170,7 @@ class ImportJob extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setConfigurationAttribute($value)
@@ -178,6 +180,7 @@ class ImportJob extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setExtendedStatusAttribute($value)
diff --git a/app/Models/SpectreProvider.php b/app/Models/SpectreProvider.php
deleted file mode 100644
index a1d056f93c..0000000000
--- a/app/Models/SpectreProvider.php
+++ /dev/null
@@ -1,52 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Class SpectreProvider
- */
-class SpectreProvider extends Model
-{
-    /**
-     * The attributes that should be casted to native types.
-     *
-     * @var array
-     */
-    protected $casts
-        = [
-            'spectre_id'      => 'int',
-            'created_at'      => 'datetime',
-            'updated_at'      => 'datetime',
-            'deleted_at'      => 'datetime',
-            'interactive'     => 'boolean',
-            'automatic_fetch' => 'boolean',
-            'data'            => 'array',
-        ];
-
-    /**
-     * @var array
-     */
-    protected $fillable = ['spectre_id', 'code', 'mode', 'name', 'status', 'interactive', 'automatic_fetch', 'country_code', 'data'];
-}
diff --git a/app/Services/Spectre/Object/Customer.php b/app/Services/Spectre/Object/Customer.php
index 53d046a6d9..755dcfc38d 100644
--- a/app/Services/Spectre/Object/Customer.php
+++ b/app/Services/Spectre/Object/Customer.php
@@ -93,4 +93,16 @@ class Customer extends SpectreObject
     {
         $this->secret = $secret;
     }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return [
+            'id'         => $this->id,
+            'identifier' => $this->identifier,
+            'secret'     => $this->secret,
+        ];
+    }
 }
diff --git a/app/Services/Spectre/Object/Login.php b/app/Services/Spectre/Object/Login.php
deleted file mode 100644
index 6de8bed874..0000000000
--- a/app/Services/Spectre/Object/Login.php
+++ /dev/null
@@ -1,32 +0,0 @@
-.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Services\Spectre\Object;
-
-/**
- * Class Login
- */
-class Login extends SpectreObject
-{
-
-}
\ No newline at end of file
diff --git a/app/Services/Spectre/Object/Token.php b/app/Services/Spectre/Object/Token.php
new file mode 100644
index 0000000000..d2e51d3c18
--- /dev/null
+++ b/app/Services/Spectre/Object/Token.php
@@ -0,0 +1,76 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Spectre\Object;
+
+use Carbon\Carbon;
+
+/**
+ * Class Token
+ */
+class Token extends SpectreObject
+{
+    /** @var string */
+    private $connectUrl;
+    /** @var Carbon */
+    private $expiresAt;
+    /** @var string */
+    private $token;
+
+    /**
+     * Token constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->token      = $data['token'];
+        $this->expiresAt  = new Carbon($data['expires_at']);
+        $this->connectUrl = $data['connect_url'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getConnectUrl(): string
+    {
+        return $this->connectUrl;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getExpiresAt(): Carbon
+    {
+        return $this->expiresAt;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToken(): string
+    {
+        return $this->token;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Spectre/Request/CreateLoginRequest.php b/app/Services/Spectre/Request/CreateLoginRequest.php
deleted file mode 100644
index 1b0e3e6b79..0000000000
--- a/app/Services/Spectre/Request/CreateLoginRequest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Services\Spectre\Request;
-
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Models\SpectreProvider;
-use FireflyIII\Services\Spectre\Object\Customer;
-
-/**
- * Class CreateLoginRequest
- */
-class CreateLoginRequest extends SpectreRequest
-{
-    /** @var Customer */
-    private $customer;
-    /** @var array */
-    private $mandatoryFields = [];
-    /** @var SpectreProvider */
-    private $provider;
-
-    /**
-     *
-     * @throws FireflyException
-     */
-    public function call(): void
-    {
-        // add mandatory fields to login object
-        $data = [
-            'customer_id'            => $this->customer->getId(),
-            'country_code'           => $this->provider->country_code,
-            'provider_code'          => $this->provider->code,
-            'credentials'            => $this->buildCredentials(),
-            'daily_refresh'          => true,
-            'fetch_type'             => 'recent',
-            'include_fake_providers' => true,
-        ];
-        $uri  = '/api/v3/logins';
-        $response = $this->sendSignedSpectrePost($uri, $data);
-        echo '
    ';
-        print_r($response);
-        exit;
-    }
-
-    /**
-     * @param Customer $customer
-     */
-    public function setCustomer(Customer $customer): void
-    {
-        $this->customer = $customer;
-    }
-
-    /**
-     * @param array $mandatoryFields
-     */
-    public function setMandatoryFields(array $mandatoryFields): void
-    {
-        $this->mandatoryFields = $mandatoryFields;
-    }
-
-    /**
-     * @param SpectreProvider $provider
-     */
-    public function setProvider(SpectreProvider $provider): void
-    {
-        $this->provider = $provider;
-    }
-
-    /**
-     * @return array
-     * @throws FireflyException
-     */
-    private function buildCredentials(): array
-    {
-        $return = [];
-        /** @var array $requiredField */
-        foreach ($this->provider->data['required_fields'] as $requiredField) {
-            $fieldName = $requiredField['name'];
-            if (!isset($this->mandatoryFields[$fieldName])) {
-                throw new FireflyException(sprintf('Mandatory field "%s" is missing from job.', $fieldName));
-            }
-            $return[$fieldName] = $this->mandatoryFields[$fieldName];
-        }
-
-        return $return;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/Services/Spectre/Request/CreateTokenRequest.php b/app/Services/Spectre/Request/CreateTokenRequest.php
new file mode 100644
index 0000000000..adacab4ae8
--- /dev/null
+++ b/app/Services/Spectre/Request/CreateTokenRequest.php
@@ -0,0 +1,94 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Spectre\Request;
+
+use FireflyIII\Services\Spectre\Object\Customer;
+use FireflyIII\Services\Spectre\Object\Token;
+
+
+/**
+ * Class CreateTokenRequest
+ */
+class CreateTokenRequest extends SpectreRequest
+{
+    /** @var Customer */
+    private $customer;
+
+    /** @var Token */
+    private $token;
+
+    /** @var string */
+    private $uri;
+
+    /**
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function call(): void
+    {
+        // add mandatory fields to login object
+        $data        = [
+            'data' => [
+                'customer_id'               => $this->customer->getId(),
+                'fetch_type'                => 'recent',
+                'daily_refresh'             => true,
+                'include_fake_providers'    => true,
+                'show_consent_confirmation' => true,
+                'credentials_strategy'      => 'ask',
+                'return_to'                 => $this->uri,
+            ],
+        ];
+        $uri         = '/api/v3/tokens/create';
+        $response    = $this->sendSignedSpectrePost($uri, $data);
+        $this->token = new Token($response['data']);
+
+        return;
+    }
+
+    /**
+     * @return Token
+     */
+    public function getToken(): Token
+    {
+        return $this->token;
+    }
+
+    /**
+     * @param Customer $customer
+     */
+    public function setCustomer(Customer $customer): void
+    {
+        $this->customer = $customer;
+    }
+
+    /**
+     * @param string $uri
+     */
+    public function setUri(string $uri): void
+    {
+        $this->uri = $uri;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Spectre/Request/ListLoginsRequest.php b/app/Services/Spectre/Request/ListLoginsRequest.php
deleted file mode 100644
index d69af2a026..0000000000
--- a/app/Services/Spectre/Request/ListLoginsRequest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Services\Spectre\Request;
-
-use FireflyIII\Services\Spectre\Object\Customer;
-use Log;
-
-/**
- * Class ListLoginsRequest
- */
-class ListLoginsRequest extends SpectreRequest
-{
-    /** @var Customer */
-    protected $customer;
-
-    /** @var array */
-    protected $logins = [];
-
-    /**
-     *
-     * @throws \FireflyIII\Exceptions\FireflyException
-     */
-    public function call(): void
-    {
-        $hasNextPage = true;
-        $nextId      = 0;
-        while ($hasNextPage) {
-            Log::debug(sprintf('Now calling list-logins for next_id %d', $nextId));
-            $parameters = ['customer_id' => $this->customer->getId(), 'from_id' => $nextId];
-            $uri        = '/api/v3/logins?' . http_build_query($parameters);
-            $response   = $this->sendSignedSpectreGet($uri, []);
-
-            // count entries:
-            Log::debug(sprintf('Found %d entries in data-array', count($response['data'])));
-
-            // extract next ID
-            $hasNextPage = false;
-            if (isset($response['meta']['next_id']) && intval($response['meta']['next_id']) > $nextId) {
-                $hasNextPage = true;
-                $nextId      = $response['meta']['next_id'];
-                Log::debug(sprintf('Next ID is now %d.', $nextId));
-            } else {
-                Log::debug('No next page.');
-            }
-
-            // store providers:
-            foreach ($response['data'] as $loginArray) {
-                var_dump($loginArray);
-                exit;
-            }
-        }
-
-        return;
-    }
-
-    /**
-     * @return Customer
-     */
-    public function getCustomer(): Customer
-    {
-        return $this->customer;
-    }
-
-    /**
-     * @param Customer $customer
-     */
-    public function setCustomer(Customer $customer): void
-    {
-        $this->customer = $customer;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLogins(): array
-    {
-        return $this->logins;
-    }
-
-
-}
diff --git a/app/Services/Spectre/Request/ListProvidersRequest.php b/app/Services/Spectre/Request/ListProvidersRequest.php
deleted file mode 100644
index 966023904c..0000000000
--- a/app/Services/Spectre/Request/ListProvidersRequest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Services\Spectre\Request;
-
-use Log;
-
-/**
- * Class ListProvidersRequest
- */
-class ListProvidersRequest extends SpectreRequest
-{
-    /**
-     * @var array
-     */
-    protected $providers = [];
-
-    /**
-     * @throws \Exception
-     */
-    public function call(): void
-    {
-        $hasNextPage = true;
-        $nextId      = 0;
-        while ($hasNextPage) {
-            Log::debug(sprintf('Now calling for next_id %d', $nextId));
-            $parameters = ['include_fake_providers' => 'true', 'include_provider_fields' => 'true', 'from_id' => $nextId];
-            $uri        = '/api/v3/providers?' . http_build_query($parameters);
-            $response   = $this->sendSignedSpectreGet($uri, []);
-
-            // count entries:
-            Log::debug(sprintf('Found %d entries in data-array', count($response['data'])));
-
-            // extract next ID
-            $hasNextPage = false;
-            if (isset($response['meta']['next_id']) && intval($response['meta']['next_id']) > $nextId) {
-                $hasNextPage = true;
-                $nextId      = $response['meta']['next_id'];
-                Log::debug(sprintf('Next ID is now %d.', $nextId));
-            } else {
-                Log::debug('No next page.');
-            }
-
-            // store providers:
-            foreach ($response['data'] as $providerArray) {
-                $providerId                   = $providerArray['id'];
-                $this->providers[$providerId] = $providerArray;
-                Log::debug(sprintf('Stored provider #%d', $providerId));
-            }
-        }
-
-        return;
-    }
-
-    /**
-     * @return array
-     */
-    public function getProviders(): array
-    {
-        return $this->providers;
-    }
-}
diff --git a/app/Services/Spectre/Request/NewCustomerRequest.php b/app/Services/Spectre/Request/NewCustomerRequest.php
index ff36919d70..0c6960be90 100644
--- a/app/Services/Spectre/Request/NewCustomerRequest.php
+++ b/app/Services/Spectre/Request/NewCustomerRequest.php
@@ -37,19 +37,13 @@ class NewCustomerRequest extends SpectreRequest
      */
     public function call(): void
     {
-        $data = [
+        $data     = [
             'data' => [
                 'identifier' => 'default_ff3_customer',
             ],
         ];
-        $uri  = '/api/v3/customers/';
-        //$response = $this->sendSignedSpectrePost($uri, $data);
-        $response = ['data' => [
-            'id'         => 527858,
-            'identifier' => 'default_ff3_customer',
-            'secret'     => 'qpZjRPJRTb6mMcQgwDkssZ3fQVVDPIH04zBlkKC6MvI',
-        ],
-        ];
+        $uri      = '/api/v3/customers/';
+        $response = $this->sendSignedSpectrePost($uri, $data);
         // create customer:
         $this->customer = new Customer($response['data']);
 
diff --git a/app/Support/Import/Configuration/Spectre/InputMandatory.php b/app/Support/Import/Configuration/Spectre/InputMandatory.php
deleted file mode 100644
index c6182ff53a..0000000000
--- a/app/Support/Import/Configuration/Spectre/InputMandatory.php
+++ /dev/null
@@ -1,121 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Support\Import\Configuration\Spectre;
-
-use Crypt;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\SpectreProvider;
-use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
-
-/**
- * Class InputMandatory
- */
-class InputMandatory implements ConfigurationInterface
-{
-    /** @var ImportJob */
-    private $job;
-
-    /**
-     * Get the data necessary to show the configuration screen.
-     *
-     * @return array
-     *
-     * @throws FireflyException
-     */
-    public function getData(): array
-    {
-        $config     = $this->job->configuration;
-        $providerId = $config['provider'];
-        $provider   = SpectreProvider::where('spectre_id', $providerId)->first();
-        if (is_null($provider)) {
-            throw new FireflyException(sprintf('Cannot find Spectre provider with ID #%d', $providerId));
-        }
-        $fields    = $provider->data['required_fields'] ?? [];
-        $positions = [];
-        // Obtain a list of columns
-        foreach ($fields as $key => $row) {
-            $positions[$key] = $row['position'];
-        }
-        array_multisort($positions, SORT_ASC, $fields);
-        $country = SelectCountry::$allCountries[$config['country']] ?? $config['country'];
-
-        return compact('provider', 'country', 'fields');
-    }
-
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string
-    {
-        return '';
-    }
-
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job)
-    {
-        $this->job = $job;
-    }
-
-    /**
-     * Store the result.
-     *
-     * @param array $data
-     *
-     * @return bool
-     *
-     * @throws FireflyException
-     */
-    public function storeConfiguration(array $data): bool
-    {
-        $config     = $this->job->configuration;
-        $providerId = $config['provider'];
-        $provider   = SpectreProvider::where('spectre_id', $providerId)->first();
-        if (is_null($provider)) {
-            throw new FireflyException(sprintf('Cannot find Spectre provider with ID #%d', $providerId));
-        }
-        $mandatory = [];
-        $fields    = $provider->data['required_fields'] ?? [];
-        foreach ($fields as $field) {
-            $name             = $field['name'];
-            $mandatory[$name] = Crypt::encrypt($data[$name]) ?? null;
-        }
-
-        // store in config of job:
-        $config['mandatory-fields']    = $mandatory;
-        $config['has-input-mandatory'] = true;
-        $this->job->configuration      = $config;
-        $this->job->save();
-
-        // try to grab login for this job. See what happens?
-        // fire job that creates login object. user is redirected to "wait here" page (status page). Page should
-        // refresh and go back to interactive when user is supposed to enter SMS code or something.
-        // otherwise start downloading stuff
-
-        return true;
-    }
-}
diff --git a/app/Support/Import/Configuration/Spectre/SelectCountry.php b/app/Support/Import/Configuration/Spectre/SelectCountry.php
deleted file mode 100644
index eec76e8e54..0000000000
--- a/app/Support/Import/Configuration/Spectre/SelectCountry.php
+++ /dev/null
@@ -1,348 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Support\Import\Configuration\Spectre;
-
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\SpectreProvider;
-use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
-
-/**
- * Class SelectCountry
- */
-class SelectCountry implements ConfigurationInterface
-{
-    /**
-     * @var array
-     */
-    public static $allCountries
-        = [
-            'AF' => 'Afghanistan',
-            'AX' => 'Aland Islands',
-            'AL' => 'Albania',
-            'DZ' => 'Algeria',
-            'AS' => 'American Samoa',
-            'AD' => 'Andorra',
-            'AO' => 'Angola',
-            'AI' => 'Anguilla',
-            'AQ' => 'Antarctica',
-            'AG' => 'Antigua and Barbuda',
-            'AR' => 'Argentina',
-            'AM' => 'Armenia',
-            'AW' => 'Aruba',
-            'AU' => 'Australia',
-            'AT' => 'Austria',
-            'AZ' => 'Azerbaijan',
-            'BS' => 'Bahamas',
-            'BH' => 'Bahrain',
-            'BD' => 'Bangladesh',
-            'BB' => 'Barbados',
-            'BY' => 'Belarus',
-            'BE' => 'Belgium',
-            'BZ' => 'Belize',
-            'BJ' => 'Benin',
-            'BM' => 'Bermuda',
-            'BT' => 'Bhutan',
-            'BO' => 'Bolivia',
-            'BQ' => 'Bonaire, Saint Eustatius and Saba',
-            'BA' => 'Bosnia and Herzegovina',
-            'BW' => 'Botswana',
-            'BV' => 'Bouvet Island',
-            'BR' => 'Brazil',
-            'IO' => 'British Indian Ocean Territory',
-            'VG' => 'British Virgin Islands',
-            'BN' => 'Brunei',
-            'BG' => 'Bulgaria',
-            'BF' => 'Burkina Faso',
-            'BI' => 'Burundi',
-            'KH' => 'Cambodia',
-            'CM' => 'Cameroon',
-            'CA' => 'Canada',
-            'CV' => 'Cape Verde',
-            'KY' => 'Cayman Islands',
-            'CF' => 'Central African Republic',
-            'TD' => 'Chad',
-            'CL' => 'Chile',
-            'CN' => 'China',
-            'CX' => 'Christmas Island',
-            'CC' => 'Cocos Islands',
-            'CO' => 'Colombia',
-            'KM' => 'Comoros',
-            'CK' => 'Cook Islands',
-            'CR' => 'Costa Rica',
-            'HR' => 'Croatia',
-            'CU' => 'Cuba',
-            'CW' => 'Curacao',
-            'CY' => 'Cyprus',
-            'CZ' => 'Czech Republic',
-            'CD' => 'Democratic Republic of the Congo',
-            'DK' => 'Denmark',
-            'DJ' => 'Djibouti',
-            'DM' => 'Dominica',
-            'DO' => 'Dominican Republic',
-            'TL' => 'East Timor',
-            'EC' => 'Ecuador',
-            'EG' => 'Egypt',
-            'SV' => 'El Salvador',
-            'GQ' => 'Equatorial Guinea',
-            'ER' => 'Eritrea',
-            'EE' => 'Estonia',
-            'ET' => 'Ethiopia',
-            'FK' => 'Falkland Islands',
-            'FO' => 'Faroe Islands',
-            'FJ' => 'Fiji',
-            'FI' => 'Finland',
-            'FR' => 'France',
-            'GF' => 'French Guiana',
-            'PF' => 'French Polynesia',
-            'TF' => 'French Southern Territories',
-            'GA' => 'Gabon',
-            'GM' => 'Gambia',
-            'GE' => 'Georgia',
-            'DE' => 'Germany',
-            'GH' => 'Ghana',
-            'GI' => 'Gibraltar',
-            'GR' => 'Greece',
-            'GL' => 'Greenland',
-            'GD' => 'Grenada',
-            'GP' => 'Guadeloupe',
-            'GU' => 'Guam',
-            'GT' => 'Guatemala',
-            'GG' => 'Guernsey',
-            'GN' => 'Guinea',
-            'GW' => 'Guinea-Bissau',
-            'GY' => 'Guyana',
-            'HT' => 'Haiti',
-            'HM' => 'Heard Island and McDonald Islands',
-            'HN' => 'Honduras',
-            'HK' => 'Hong Kong',
-            'HU' => 'Hungary',
-            'IS' => 'Iceland',
-            'IN' => 'India',
-            'ID' => 'Indonesia',
-            'IR' => 'Iran',
-            'IQ' => 'Iraq',
-            'IE' => 'Ireland',
-            'IM' => 'Isle of Man',
-            'IL' => 'Israel',
-            'IT' => 'Italy',
-            'CI' => 'Ivory Coast',
-            'JM' => 'Jamaica',
-            'JP' => 'Japan',
-            'JE' => 'Jersey',
-            'JO' => 'Jordan',
-            'KZ' => 'Kazakhstan',
-            'KE' => 'Kenya',
-            'KI' => 'Kiribati',
-            'XK' => 'Kosovo',
-            'KW' => 'Kuwait',
-            'KG' => 'Kyrgyzstan',
-            'LA' => 'Laos',
-            'LV' => 'Latvia',
-            'LB' => 'Lebanon',
-            'LS' => 'Lesotho',
-            'LR' => 'Liberia',
-            'LY' => 'Libya',
-            'LI' => 'Liechtenstein',
-            'LT' => 'Lithuania',
-            'LU' => 'Luxembourg',
-            'MO' => 'Macao',
-            'MK' => 'Macedonia',
-            'MG' => 'Madagascar',
-            'MW' => 'Malawi',
-            'MY' => 'Malaysia',
-            'MV' => 'Maldives',
-            'ML' => 'Mali',
-            'MT' => 'Malta',
-            'MH' => 'Marshall Islands',
-            'MQ' => 'Martinique',
-            'MR' => 'Mauritania',
-            'MU' => 'Mauritius',
-            'YT' => 'Mayotte',
-            'MX' => 'Mexico',
-            'FM' => 'Micronesia',
-            'MD' => 'Moldova',
-            'MC' => 'Monaco',
-            'MN' => 'Mongolia',
-            'ME' => 'Montenegro',
-            'MS' => 'Montserrat',
-            'MA' => 'Morocco',
-            'MZ' => 'Mozambique',
-            'MM' => 'Myanmar',
-            'NA' => 'Namibia',
-            'NR' => 'Nauru',
-            'NP' => 'Nepal',
-            'NL' => 'Netherlands',
-            'NC' => 'New Caledonia',
-            'NZ' => 'New Zealand',
-            'NI' => 'Nicaragua',
-            'NE' => 'Niger',
-            'NG' => 'Nigeria',
-            'NU' => 'Niue',
-            'NF' => 'Norfolk Island',
-            'KP' => 'North Korea',
-            'MP' => 'Northern Mariana Islands',
-            'NO' => 'Norway',
-            'OM' => 'Oman',
-            'PK' => 'Pakistan',
-            'PW' => 'Palau',
-            'PS' => 'Palestinian Territory',
-            'PA' => 'Panama',
-            'PG' => 'Papua New Guinea',
-            'PY' => 'Paraguay',
-            'PE' => 'Peru',
-            'PH' => 'Philippines',
-            'PN' => 'Pitcairn',
-            'PL' => 'Poland',
-            'PT' => 'Portugal',
-            'PR' => 'Puerto Rico',
-            'QA' => 'Qatar',
-            'CG' => 'Republic of the Congo',
-            'RE' => 'Reunion',
-            'RO' => 'Romania',
-            'RU' => 'Russia',
-            'RW' => 'Rwanda',
-            'BL' => 'Saint Barthelemy',
-            'SH' => 'Saint Helena',
-            'KN' => 'Saint Kitts and Nevis',
-            'LC' => 'Saint Lucia',
-            'MF' => 'Saint Martin',
-            'PM' => 'Saint Pierre and Miquelon',
-            'VC' => 'Saint Vincent and the Grenadines',
-            'WS' => 'Samoa',
-            'SM' => 'San Marino',
-            'ST' => 'Sao Tome and Principe',
-            'SA' => 'Saudi Arabia',
-            'SN' => 'Senegal',
-            'RS' => 'Serbia',
-            'SC' => 'Seychelles',
-            'SL' => 'Sierra Leone',
-            'SG' => 'Singapore',
-            'SX' => 'Sint Maarten',
-            'SK' => 'Slovakia',
-            'SI' => 'Slovenia',
-            'SB' => 'Solomon Islands',
-            'SO' => 'Somalia',
-            'ZA' => 'South Africa',
-            'GS' => 'South Georgia and the South Sandwich Islands',
-            'KR' => 'South Korea',
-            'SS' => 'South Sudan',
-            'ES' => 'Spain',
-            'LK' => 'Sri Lanka',
-            'SD' => 'Sudan',
-            'SR' => 'Suriname',
-            'SJ' => 'Svalbard and Jan Mayen',
-            'SZ' => 'Swaziland',
-            'SE' => 'Sweden',
-            'CH' => 'Switzerland',
-            'SY' => 'Syria',
-            'TW' => 'Taiwan',
-            'TJ' => 'Tajikistan',
-            'TZ' => 'Tanzania',
-            'TH' => 'Thailand',
-            'TG' => 'Togo',
-            'TK' => 'Tokelau',
-            'TO' => 'Tonga',
-            'TT' => 'Trinidad and Tobago',
-            'TN' => 'Tunisia',
-            'TR' => 'Turkey',
-            'TM' => 'Turkmenistan',
-            'TC' => 'Turks and Caicos Islands',
-            'TV' => 'Tuvalu',
-            'VI' => 'U.S. Virgin Islands',
-            'UG' => 'Uganda',
-            'UA' => 'Ukraine',
-            'AE' => 'United Arab Emirates',
-            'GB' => 'United Kingdom',
-            'US' => 'United States',
-            'UM' => 'United States Minor Outlying Islands',
-            'UY' => 'Uruguay',
-            'UZ' => 'Uzbekistan',
-            'VU' => 'Vanuatu',
-            'VA' => 'Vatican',
-            'VE' => 'Venezuela',
-            'VN' => 'Vietnam',
-            'WF' => 'Wallis and Futuna',
-            'EH' => 'Western Sahara',
-            'YE' => 'Yemen',
-            'ZM' => 'Zambia',
-            'ZW' => 'Zimbabwe',
-            'XF' => 'Fake Country (for testing)',
-            'XO' => 'Other financial applications',
-        ];
-    /** @var ImportJob */
-    private $job;
-
-    /**
-     * Get the data necessary to show the configuration screen.
-     *
-     * @return array
-     */
-    public function getData(): array
-    {
-        $providers = SpectreProvider::get();
-        $countries = [];
-        /** @var SpectreProvider $provider */
-        foreach ($providers as $provider) {
-            $countries[$provider->country_code] = self::$allCountries[$provider->country_code] ?? $provider->country_code;
-        }
-        asort($countries);
-
-        return compact('countries');
-    }
-
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string
-    {
-        return '';
-    }
-
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job)
-    {
-        $this->job = $job;
-    }
-
-    /**
-     * Store the result.
-     *
-     * @param array $data
-     *
-     * @return bool
-     */
-    public function storeConfiguration(array $data): bool
-    {
-        $config                     = $this->job->configuration;
-        $config['country']          = $data['country_code'] ?? 'XF'; // default to fake country.
-        $config['selected-country'] = true;
-        $this->job->configuration   = $config;
-        $this->job->save();
-
-        return true;
-    }
-}
diff --git a/app/Support/Import/Configuration/Spectre/SelectProvider.php b/app/Support/Import/Configuration/Spectre/SelectProvider.php
deleted file mode 100644
index 843a722c04..0000000000
--- a/app/Support/Import/Configuration/Spectre/SelectProvider.php
+++ /dev/null
@@ -1,93 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Support\Import\Configuration\Spectre;
-
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\SpectreProvider;
-use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
-
-/**
- * Class SelectProvider
- */
-class SelectProvider implements ConfigurationInterface
-{
-    /** @var ImportJob */
-    private $job;
-
-    /**
-     * Get the data necessary to show the configuration screen.
-     *
-     * @return array
-     */
-    public function getData(): array
-    {
-        $config    = $this->job->configuration;
-        $selection = SpectreProvider::where('country_code', $config['country'])->where('status', 'active')->get();
-        $providers = [];
-        /** @var SpectreProvider $provider */
-        foreach ($selection as $provider) {
-            $providerId             = $provider->spectre_id;
-            $name                   = $provider->data['name'];
-            $providers[$providerId] = $name;
-        }
-        $country = SelectCountry::$allCountries[$config['country']] ?? $config['country'];
-
-        return compact('providers', 'country');
-    }
-
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string
-    {
-        return '';
-    }
-
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job)
-    {
-        $this->job = $job;
-    }
-
-    /**
-     * Store the result.
-     *
-     * @param array $data
-     *
-     * @return bool
-     */
-    public function storeConfiguration(array $data): bool
-    {
-        $config                      = $this->job->configuration;
-        $config['provider']          = intval($data['provider_code']) ?? 0; // default to fake country.
-        $config['selected-provider'] = true;
-        $this->job->configuration    = $config;
-        $this->job->save();
-
-        return true;
-    }
-}
diff --git a/app/Support/Import/Information/SpectreInformation.php b/app/Support/Import/Information/SpectreInformation.php
deleted file mode 100644
index 0cc93f8992..0000000000
--- a/app/Support/Import/Information/SpectreInformation.php
+++ /dev/null
@@ -1,217 +0,0 @@
-.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Support\Import\Information;
-
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Services\Bunq\Object\Alias;
-use FireflyIII\Services\Bunq\Object\MonetaryAccountBank;
-use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
-use FireflyIII\Services\Bunq\Request\DeviceSessionRequest;
-use FireflyIII\Services\Bunq\Request\ListMonetaryAccountRequest;
-use FireflyIII\Services\Bunq\Request\ListUserRequest;
-use FireflyIII\Services\Bunq\Token\SessionToken;
-use FireflyIII\Support\CacheProperties;
-use FireflyIII\User;
-use Illuminate\Support\Collection;
-use Log;
-use Preferences;
-
-/**
- * Class SpectreInformation
- */
-class SpectreInformation implements InformationInterface
-{
-    /** @var User */
-    private $user;
-
-    /**
-     * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
-     *
-     * The format for these bank accounts is basically this:
-     *
-     * id: bank specific id
-     * name: bank appointed name
-     * number: account number (usually IBAN)
-     * currency: ISO code of currency
-     * balance: current balance
-     *
-     *
-     * any other fields are optional but can be useful:
-     * image: logo or account specific thing
-     * color: any associated color.
-     *
-     * @return array
-     *
-     * @throws FireflyException
-     * @throws \Exception
-     */
-    public function getAccounts(): array
-    {
-        // cache for an hour:
-        $cache = new CacheProperties;
-        $cache->addProperty('bunq.get-accounts');
-        $cache->addProperty(date('dmy h'));
-        if ($cache->has()) {
-            return $cache->get(); // @codeCoverageIgnore
-        }
-        Log::debug('Now in getAccounts()');
-        $sessionToken = $this->startSession();
-        $userId       = $this->getUserInformation($sessionToken);
-        // get list of Bunq accounts:
-        $accounts = $this->getMonetaryAccounts($sessionToken, $userId);
-        $return   = [];
-        /** @var MonetaryAccountBank $account */
-        foreach ($accounts as $account) {
-            $current = [
-                'id'       => $account->getId(),
-                'name'     => $account->getDescription(),
-                'currency' => $account->getCurrency(),
-                'balance'  => $account->getBalance()->getValue(),
-                'color'    => $account->getSetting()->getColor(),
-            ];
-            /** @var Alias $alias */
-            foreach ($account->getAliases() as $alias) {
-                if ('IBAN' === $alias->getType()) {
-                    $current['number'] = $alias->getValue();
-                }
-            }
-            $return[] = $current;
-        }
-        $cache->store($return);
-
-        $this->closeSession($sessionToken);
-
-        return $return;
-    }
-
-    /**
-     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
-     *
-     * @param User $user
-     */
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @param SessionToken $sessionToken
-     *
-     * @throws \Exception
-     */
-    private function closeSession(SessionToken $sessionToken): void
-    {
-        Log::debug('Going to close session');
-        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
-        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
-        $request         = new DeleteDeviceSessionRequest();
-        $request->setSecret($apiKey);
-        $request->setPrivateKey($privateKey);
-        $request->setServerPublicKey($serverPublicKey);
-        $request->setSessionToken($sessionToken);
-        $request->call();
-
-        return;
-    }
-
-    /**
-     * @param SessionToken $sessionToken
-     * @param int          $userId
-     *
-     * @return Collection
-     *
-     * @throws \Exception
-     */
-    private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection
-    {
-        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
-        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
-        $request         = new ListMonetaryAccountRequest;
-
-        $request->setSessionToken($sessionToken);
-        $request->setSecret($apiKey);
-        $request->setServerPublicKey($serverPublicKey);
-        $request->setPrivateKey($privateKey);
-        $request->setUserId($userId);
-        $request->call();
-
-        return $request->getMonetaryAccounts();
-    }
-
-    /**
-     * @param SessionToken $sessionToken
-     *
-     * @return int
-     *
-     * @throws FireflyException
-     * @throws \Exception
-     */
-    private function getUserInformation(SessionToken $sessionToken): int
-    {
-        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
-        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
-        $request         = new ListUserRequest;
-        $request->setSessionToken($sessionToken);
-        $request->setSecret($apiKey);
-        $request->setServerPublicKey($serverPublicKey);
-        $request->setPrivateKey($privateKey);
-        $request->call();
-        // return the first that isn't null?
-        $company = $request->getUserCompany();
-        if ($company->getId() > 0) {
-            return $company->getId();
-        }
-        $user = $request->getUserPerson();
-        if ($user->getId() > 0) {
-            return $user->getId();
-        }
-        throw new FireflyException('Expected user or company from Bunq, but got neither.');
-    }
-
-    /**
-     * @return SessionToken
-     *
-     * @throws \Exception
-     */
-    private function startSession(): SessionToken
-    {
-        Log::debug('Now in startSession.');
-        $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key')->data;
-        $serverPublicKey   = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $privateKey        = Preferences::getForUser($this->user, 'bunq_private_key')->data;
-        $installationToken = Preferences::getForUser($this->user, 'bunq_installation_token')->data;
-        $request           = new DeviceSessionRequest();
-        $request->setSecret($apiKey);
-        $request->setServerPublicKey($serverPublicKey);
-        $request->setPrivateKey($privateKey);
-        $request->setInstallationToken($installationToken);
-        $request->call();
-        $sessionToken = $request->getSessionToken();
-        Log::debug(sprintf('Now have got session token: %s', serialize($sessionToken)));
-
-        return $sessionToken;
-    }
-}
diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js
index 0f65e71b60..9fa0198516 100644
--- a/public/js/ff/import/status.js
+++ b/public/js/ff/import/status.js
@@ -34,10 +34,12 @@ var knownErrors = 0;
 
 $(function () {
     "use strict";
+    console.log('in start');
     timeOutId = setTimeout(checkJobStatus, startInterval);
 
     $('.start-job').click(startJob);
     if (job.configuration['auto-start']) {
+        console.log('Called startJob()!');
         startJob();
     }
 });
@@ -46,6 +48,7 @@ $(function () {
  * Downloads some JSON and responds to its content to see what the status is of the current import.
  */
 function checkJobStatus() {
+    console.log('in checkJobStatus');
     $.getJSON(jobStatusUri).done(reportOnJobStatus).fail(reportFailedJob);
 }
 
@@ -53,6 +56,7 @@ function checkJobStatus() {
  * This method is called when the JSON query returns an error. If possible, this error is relayed to the user.
  */
 function reportFailedJob(jqxhr, textStatus, error) {
+    console.log('in reportFailedJob');
     // hide all possible boxes:
     $('.statusbox').hide();
 
@@ -72,6 +76,7 @@ function reportFailedJob(jqxhr, textStatus, error) {
  * @param data
  */
 function reportOnJobStatus(data) {
+    console.log('in reportOnJobStatus: ' + data.status);
 
     switch (data.status) {
         case "configured":
@@ -80,6 +85,10 @@ function reportOnJobStatus(data) {
                 $('.statusbox').hide();
                 $('.status_configured').show();
             }
+            if (job.configuration['auto-start']) {
+                console.log('Job is auto start. Check status again in 500ms.');
+                timeOutId = setTimeout(checkJobStatus, interval);
+            }
             break;
         case "running":
             // job is running! Show the running box:
@@ -122,7 +131,13 @@ function reportOnJobStatus(data) {
             // show the fatal error box:
             $('.fatal_error').show();
             break;
+        case "configuring":
+            // redirect back to configure screen.
+            console.log('Will now redirect to ' + jobConfigureUri);
+            window.location = jobConfigureUri;
+            break;
         default:
+            console.error('Cannot handle job status ' + data.status);
             break;
 
     }
diff --git a/resources/views/import/spectre/redirect.twig b/resources/views/import/spectre/redirect.twig
new file mode 100644
index 0000000000..e76c8b4bdb
--- /dev/null
+++ b/resources/views/import/spectre/redirect.twig
@@ -0,0 +1,15 @@
+
+
+
+    
+    
+    
+    Page Redirection
+
+
+
+If you are not redirected automatically, follow this link to Spectre..
+
+#}
\ No newline at end of file
diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig
index 2844f818fa..650c224fac 100644
--- a/resources/views/import/status.twig
+++ b/resources/views/import/status.twig
@@ -149,6 +149,7 @@
         var langImportMultiError = '{{ trans('import.status_errors_multi')|escape('js') }}';
         var jobStatusUri = '{{ route('import.status.json', [job.key]) }}';
         var jobStartUri = '{{ route('import.start', [job.key]) }}';
+        var jobConfigureUri = '{{ route('import.configure', [job.key]) }}';
         var token = '{{ csrf_token() }}';
         var job = {{ job|json_encode|raw }};
     

From ca4db81dbd7b56c8c9acc33cf0250f84b5f20480 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 18:39:17 +0100
Subject: [PATCH 05/22] First code to check for new version.

---
 .../Controllers/Admin/UpdateController.php    |  5 +-
 .../Admin/UpdateControllerTest.php            | 83 ++++++++++++++-----
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 7142c43cde..6eb781c3ad 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyConfig;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -85,7 +86,7 @@ class UpdateController extends Controller
     public function post(Request $request)
     {
         $checkForUpdates = intval($request->get('check_for_updates'));
-        app('fireflyconfig')->set('permission_update_check', $checkForUpdates);
+        FireflyConfig::set('permission_update_check', $checkForUpdates);
         Session::flash('success', strval(trans('firefly.configuration_updated')));
 
         return redirect(route('admin.update-check'));
@@ -107,7 +108,7 @@ class UpdateController extends Controller
             $first  = reset($releases);
             $string = '';
             $check  = version_compare($current, $first->getTitle());
-            app('fireflyconfig')->set('last_update_check', time());
+            FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
             Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
         }
diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
index a0e4bf69d1..7d05ff5ee8 100644
--- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
@@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Admin;
 
 use FireflyConfig;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Services\Github\Request\UpdateRequest;
 use Tests\TestCase;
 
 /**
@@ -33,23 +34,23 @@ use Tests\TestCase;
  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ConfigurationControllerTest extends TestCase
+class UpdateControllerTest extends TestCase
 {
     /**
-     * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::index
-     * @covers \FireflyIII\Http\Controllers\Admin\UpdateControllerTest::__construct
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::index
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::__construct
      */
     public function testIndex()
     {
         $this->be($this->user());
 
-        $config = new Configuration;
+        $config       = new Configuration;
         $config->data = -1;
 
         $falseConfig       = new Configuration;
         $falseConfig->data = false;
 
-        FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', true])->once()->andReturn($config);
+        FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($config);
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
 
         $response = $this->get(route('admin.update-check'));
@@ -59,21 +60,59 @@ class ConfigurationControllerTest extends TestCase
         $response->assertSee('
      ');
     }
 
-//    /**
-//     * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex
-//     */
-//    public function testPostIndex()
-//    {
-//        $falseConfig       = new Configuration;
-//        $falseConfig->data = false;
-//
-//        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
-//        FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once();
-//        FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once();
-//
-//        $this->be($this->user());
-//        $response = $this->post(route('admin.configuration.index.post'));
-//        $response->assertSessionHas('success');
-//        $response->assertStatus(302);
-//    }
+    /**
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::post
+     */
+    public function testPost()
+    {
+        $falseConfig       = new Configuration;
+        $falseConfig->data = false;
+
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('set')->withArgs(['permission_update_check', 1])->once()->andReturn(new Configuration);
+        $this->be($this->user());
+        $response = $this->post(route('admin.update-check.post'), ['check_for_updates' => 1]);
+        $response->assertSessionHas('success');
+        $response->assertStatus(302);
+        $response->assertRedirect(route('admin.update-check'));
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck
+     */
+    public function testUpdateCheck()
+    {
+
+        $releases = [
+
+        ];
+        $updater = $this->mock(UpdateRequest::class);
+        $updater->shouldReceive('call')->andReturnNull();
+        $updater->shouldReceive('getReleases')->andReturn(true);
+
+
+        $this->be($this->user());
+        $response = $this->post(route('admin.update-check.manual'));
+        $response->assertStatus(200);
+    }
+
+
+
+    //    /**
+    //     * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex
+    //     */
+    //    public function testPostIndex()
+    //    {
+    //        $falseConfig       = new Configuration;
+    //        $falseConfig->data = false;
+    //
+    //        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+    //        FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once();
+    //        FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once();
+    //
+    //        $this->be($this->user());
+    //        $response = $this->post(route('admin.configuration.index.post'));
+    //        $response->assertSessionHas('success');
+    //        $response->assertStatus(302);
+    //    }
 }

From 67cc03e4dd5c4a819e2f917f09f98d133e5a65aa Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 18:39:30 +0100
Subject: [PATCH 06/22] More code for spectre.

---
 .../Configuration/SpectreConfigurator.php     | 112 ++++--------------
 .../Prerequisites/SpectrePrerequisites.php    |   5 -
 2 files changed, 25 insertions(+), 92 deletions(-)

diff --git a/app/Import/Configuration/SpectreConfigurator.php b/app/Import/Configuration/SpectreConfigurator.php
index a2875487a5..125d7e2bd5 100644
--- a/app/Import/Configuration/SpectreConfigurator.php
+++ b/app/Import/Configuration/SpectreConfigurator.php
@@ -22,13 +22,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Configuration;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\ImportJob;
-use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
-use FireflyIII\Support\Import\Configuration\Spectre\InputMandatory;
-use FireflyIII\Support\Import\Configuration\Spectre\SelectCountry;
-use FireflyIII\Support\Import\Configuration\Spectre\SelectProvider;
-use Log;
 
 /**
  * Class SpectreConfigurator.
@@ -54,58 +48,35 @@ class SpectreConfigurator implements ConfiguratorInterface
      * @param array $data
      *
      * @return bool
-     *
-     * @throws FireflyException
      */
     public function configureJob(array $data): bool
     {
-        $class = $this->getConfigurationClass();
-        $job   = $this->job;
-        /** @var ConfigurationInterface $object */
-        $object = new $class($this->job);
-        $object->setJob($job);
-        $result        = $object->storeConfiguration($data);
-        $this->warning = $object->getWarningMessage();
-
-        return $result;
+        die('cannot store config');
     }
 
     /**
      * Return the data required for the next step in the job configuration.
      *
      * @return array
-     *
-     * @throws FireflyException
      */
     public function getNextData(): array
     {
-        $class = $this->getConfigurationClass();
-        $job   = $this->job;
-        /** @var ConfigurationInterface $object */
-        $object = app($class);
-        $object->setJob($job);
+        // update config to tell Firefly we've redirected the user.
+        $config                   = $this->job->configuration;
+        $config['is-redirected']  = true;
+        $this->job->configuration = $config;
+        $this->job->status        = 'configured';
+        $this->job->save();
 
-        return $object->getData();
+        return $this->job->configuration;
     }
 
     /**
      * @return string
-     *
-     * @throws FireflyException
      */
     public function getNextView(): string
     {
-        if (!$this->job->configuration['selected-country']) {
-            return 'import.spectre.select-country';
-        }
-        if (!$this->job->configuration['selected-provider']) {
-            return 'import.spectre.select-provider';
-        }
-        if (!$this->job->configuration['has-input-mandatory']) {
-            return 'import.spectre.input-fields';
-        }
-
-        throw new FireflyException('No view for state');
+        return 'import.spectre.redirect';
     }
 
     /**
@@ -123,16 +94,9 @@ class SpectreConfigurator implements ConfiguratorInterface
      */
     public function isJobConfigured(): bool
     {
-        $config                          = $this->job->configuration;
-        $config['selected-country']      = $config['selected-country'] ?? false;
-        $config['selected-provider']     = $config['selected-provider'] ?? false;
-        $config['has-input-mandatory']   = $config['has-input-mandatory'] ?? false;
-        $config['has-input-interactive'] = $config['has-input-interactive'] ?? true; // defaults to true.
-        $this->job->configuration        = $config;
-        $this->job->save();
-
-        if ($config['selected-country'] && $config['selected-provider'] && $config['has-input-mandatory'] && $config['has-input-interactive']) {
-            // give job another status
+        // job is configured (and can start) when token is empty:
+        $config = $this->job->configuration;
+        if ($config['has-token'] === false) {
             return true;
         }
 
@@ -144,45 +108,19 @@ class SpectreConfigurator implements ConfiguratorInterface
      */
     public function setJob(ImportJob $job)
     {
+        $defaultConfig = [
+            'has-token'     => false,
+            'token'         => '',
+            'token-expires' => 0,
+            'token-url'     => '',
+            'is-redirected' => false,
+
+        ];
+
+        $config             = $job->configuration;
+        $finalConfig        = array_merge($defaultConfig, $config);
+        $job->configuration = $finalConfig;
+        $job->save();
         $this->job = $job;
-        if (null === $this->job->configuration || 0 === count($this->job->configuration)) {
-            Log::debug(sprintf('Gave import job %s initial configuration.', $this->job->key));
-            $this->job->configuration = [
-                'selected-country' => false,
-            ];
-            $this->job->save();
-        }
-    }
-
-    /**
-     * @return string
-     *
-     * @throws FireflyException
-     */
-    private function getConfigurationClass(): string
-    {
-        $class = false;
-        switch (true) {
-            case !$this->job->configuration['selected-country']:
-                $class = SelectCountry::class;
-                break;
-            case !$this->job->configuration['selected-provider']:
-                $class = SelectProvider::class;
-                break;
-            case !$this->job->configuration['has-input-mandatory']:
-                $class = InputMandatory::class;
-            // no break
-            default:
-                break;
-        }
-
-        if (false === $class || 0 === strlen($class)) {
-            throw new FireflyException('Cannot handle current job state in getConfigurationClass().');
-        }
-        if (!class_exists($class)) {
-            throw new FireflyException(sprintf('Class %s does not exist in getConfigurationClass().', $class));
-        }
-
-        return $class;
     }
 }
diff --git a/app/Import/Prerequisites/SpectrePrerequisites.php b/app/Import/Prerequisites/SpectrePrerequisites.php
index f9a1102def..e59e102ecc 100644
--- a/app/Import/Prerequisites/SpectrePrerequisites.php
+++ b/app/Import/Prerequisites/SpectrePrerequisites.php
@@ -22,7 +22,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Prerequisites;
 
-use FireflyIII\Jobs\GetSpectreProviders;
 use FireflyIII\Models\Preference;
 use FireflyIII\User;
 use Illuminate\Http\Request;
@@ -86,10 +85,6 @@ class SpectrePrerequisites implements PrerequisitesInterface
         }
         Log::debug('All prerequisites are here!');
 
-        // at this point, check if all providers are present. Providers are shared amongst
-        // users in a multi-user environment.
-        GetSpectreProviders::dispatch($this->user);
-
         return false;
     }
 

From 128085963f5a5b863ca29b3d872ba4dbb6af5ec7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 19:03:15 +0100
Subject: [PATCH 07/22] Small update to update checker.

---
 app/Events/RequestedVersionCheckStatus.php    | 52 +++++++++++++++++++
 .../Events/VersionCheckEventHandler.php       |  6 ++-
 .../Controllers/Admin/UpdateController.php    |  4 +-
 app/Http/Controllers/HomeController.php       |  4 ++
 app/Providers/EventServiceProvider.php        |  4 ++
 5 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 app/Events/RequestedVersionCheckStatus.php

diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php
new file mode 100644
index 0000000000..c87a0b35b8
--- /dev/null
+++ b/app/Events/RequestedVersionCheckStatus.php
@@ -0,0 +1,52 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+
+/**
+ * Class RequestedVersionCheckStatus
+ */
+class RequestedVersionCheckStatus extends Event
+{
+    use SerializesModels;
+
+    /**
+     * @var User
+     */
+    public $user;
+
+    /**
+     * Create a new event instance. This event is triggered when Firefly III wants to know
+     * what the deal is with the version checker.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
\ No newline at end of file
diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php
index 4308d8da10..18d101c1cf 100644
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyConfig;
+use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\User;
 use Illuminate\Auth\Events\Login;
 use Log;
@@ -33,10 +34,11 @@ use Log;
  */
 class VersionCheckEventHandler
 {
+
     /**
-     * @param Login $event
+     * @param RequestedVersionCheckStatus $event
      */
-    public function checkForUpdates(Login $event)
+    public function checkForUpdates(RequestedVersionCheckStatus $event)
     {
         // in Sandstorm, cannot check for updates:
         $sandstorm = 1 === intval(getenv('SANDSTORM'));
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 6eb781c3ad..df69858a75 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -87,6 +87,7 @@ class UpdateController extends Controller
     {
         $checkForUpdates = intval($request->get('check_for_updates'));
         FireflyConfig::set('permission_update_check', $checkForUpdates);
+        FireflyConfig::set('last_update_check', time());
         Session::flash('success', strval(trans('firefly.configuration_updated')));
 
         return redirect(route('admin.update-check'));
@@ -98,7 +99,8 @@ class UpdateController extends Controller
     public function updateCheck()
     {
         $current = config('firefly.version');
-        $request = new UpdateRequest();
+        /** @var UpdateRequest $request */
+        $request = app(UpdateRequest::class);
         $check   = -2;
         try {
             $request->call();
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index b077674fa4..59ea09c3c7 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers;
 use Artisan;
 use Carbon\Carbon;
 use DB;
+use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -234,6 +235,9 @@ class HomeController extends Controller
             $transactions[] = [$set, $account];
         }
 
+        // fire check update event:
+        event(new RequestedVersionCheckStatus(auth()->user()));
+
         return view(
             'index',
             compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount', 'start', 'end', 'today')
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 3ad80238f7..9cd5f2d8d5 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Providers;
 
 use FireflyIII\Events\RegisteredUser;
+use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
@@ -54,6 +55,9 @@ class EventServiceProvider extends ServiceProvider
             // is a User related event.
             Login::class                                  => [
                 'FireflyIII\Handlers\Events\UserEventHandler@checkSingleUserIsAdmin',
+
+            ],
+            RequestedVersionCheckStatus::class            => [
                 'FireflyIII\Handlers\Events\VersionCheckEventHandler@checkForUpdates',
             ],
 

From ca1b6046f31396c21f0ba9cdc5549d26e933d165 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 19:16:27 +0100
Subject: [PATCH 08/22] Test update checker.

---
 .../Events/VersionCheckEventHandler.php       |  2 +
 .../Controllers/Admin/UpdateController.php    |  6 +-
 resources/lang/en_US/firefly.php              |  2 +-
 .../Admin/UpdateControllerTest.php            | 72 +++++++++++++++++--
 4 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php
index 18d101c1cf..612af9f13b 100644
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -72,6 +72,8 @@ class VersionCheckEventHandler
             return;
         }
 
+        // actually check for update and inform the user.
+
     }
 
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index df69858a75..d00a5ae311 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -112,15 +112,15 @@ class UpdateController extends Controller
             $check  = version_compare($current, $first->getTitle());
             FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
-            Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
+            Log::error(sprintf('Could not check for updates: %s', $e->getMessage())); // @codeCoverageIgnore
         }
         if ($check === -2) {
-            $string = strval(trans('firefly.update_check_error'));
+            $string = strval(trans('firefly.update_check_error')); // @codeCoverageIgnore
         }
 
         if ($check === -1) {
             // there is a new FF version!
-            $string = strval(trans('firefly.update_new_version_alert', ['your_version' => $current, 'new_version' => $first->getTitle()]));
+            $string = strval(trans('firefly.update_new_version_alert', ['your_version' => $current, 'new_version' => $first->getTitle(), 'date' => $first->getUpdated()->formatLocalized($this->monthAndDayFormat)]));
         }
         if ($check === 0) {
             // you are running the current version!
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 74ea4fea3f..e079ca7c37 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -153,7 +153,7 @@ return [
     'admin_update_check_now_title'               => 'Check for updates now',
     'admin_update_check_now_explain'             => 'If you press the button, Firefly III will see if your current version is the latest.',
     'check_for_updates_button'                   => 'Check now!',
-    'update_new_version_alert'                   => 'A new version is available. You are running v:your_version, the latest version is v:new_version.',
+    'update_new_version_alert'                   => 'A new version is available. You are running v:your_version, the latest version is v:new_version which was released on :date.',
     'update_current_version_alert'               => 'You are running v:version, which is the latest available release.',
     'update_newer_version_alert'                 => 'You are running v:your_version, which is newer than the latest release, v:new_version.',
     'update_check_error'                         => 'An error occurred while checking for updates. Please view the log files.',
diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
index 7d05ff5ee8..68d0ab7843 100644
--- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
@@ -22,8 +22,10 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers\Admin;
 
+use Carbon\Carbon;
 use FireflyConfig;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Services\Github\Object\Release;
 use FireflyIII\Services\Github\Request\UpdateRequest;
 use Tests\TestCase;
 
@@ -70,6 +72,7 @@ class UpdateControllerTest extends TestCase
 
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
         FireflyConfig::shouldReceive('set')->withArgs(['permission_update_check', 1])->once()->andReturn(new Configuration);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
         $this->be($this->user());
         $response = $this->post(route('admin.update-check.post'), ['check_for_updates' => 1]);
         $response->assertSessionHas('success');
@@ -82,18 +85,79 @@ class UpdateControllerTest extends TestCase
      */
     public function testUpdateCheck()
     {
+        $falseConfig       = new Configuration;
+        $falseConfig->data = false;
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
 
+        $version  = config('firefly.version');
         $releases = [
-
+            new Release(['id' => 'x', 'title' => $version . '.1', 'content' => '', 'updated' => new Carbon]),
         ];
-        $updater = $this->mock(UpdateRequest::class);
+        $updater  = $this->mock(UpdateRequest::class);
         $updater->shouldReceive('call')->andReturnNull();
-        $updater->shouldReceive('getReleases')->andReturn(true);
-
+        $updater->shouldReceive('getReleases')->andReturn($releases);
 
+        // expect a new release (because of .1)
         $this->be($this->user());
         $response = $this->post(route('admin.update-check.manual'));
         $response->assertStatus(200);
+        $response->assertSee($version);
+        $response->assertSee('which was released on');
+        $response->assertSee($version . '.1');
+    }
+
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck
+     */
+    public function testUpdateCheckCurrent()
+    {
+        $falseConfig       = new Configuration;
+        $falseConfig->data = false;
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+
+        $version  = config('firefly.version');
+        $releases = [
+            new Release(['id' => 'x', 'title' => $version, 'content' => '', 'updated' => new Carbon]),
+        ];
+        $updater  = $this->mock(UpdateRequest::class);
+        $updater->shouldReceive('call')->andReturnNull();
+        $updater->shouldReceive('getReleases')->andReturn($releases);
+
+        // expect a new release (because of .1)
+        $this->be($this->user());
+        $response = $this->post(route('admin.update-check.manual'));
+        $response->assertStatus(200);
+        $response->assertSee($version);
+        $response->assertSee('the latest available release');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck
+     */
+    public function testUpdateCheckNewer()
+    {
+        $falseConfig       = new Configuration;
+        $falseConfig->data = false;
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+
+        $version  = config('firefly.version') . '-alpha';
+        $releases = [
+            new Release(['id' => 'x', 'title' => $version, 'content' => '', 'updated' => new Carbon]),
+        ];
+        $updater  = $this->mock(UpdateRequest::class);
+        $updater->shouldReceive('call')->andReturnNull();
+        $updater->shouldReceive('getReleases')->andReturn($releases);
+
+        // expect a new release (because of .1)
+        $this->be($this->user());
+        $response = $this->post(route('admin.update-check.manual'));
+        $response->assertStatus(200);
+        $response->assertSee($version);
+        $response->assertSee('which is newer than the');
     }
 
 

From fa65035664a1c8b6c756e913bedc3c77c1aea728 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 19:47:58 +0100
Subject: [PATCH 09/22] make sure mocked class accepts all arguments.

---
 .../Admin/UpdateControllerTest.php            | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
index 68d0ab7843..a37a97ae46 100644
--- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
@@ -27,6 +27,7 @@ use FireflyConfig;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Services\Github\Object\Release;
 use FireflyIII\Services\Github\Request\UpdateRequest;
+use Mockery;
 use Tests\TestCase;
 
 /**
@@ -72,7 +73,7 @@ class UpdateControllerTest extends TestCase
 
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
         FireflyConfig::shouldReceive('set')->withArgs(['permission_update_check', 1])->once()->andReturn(new Configuration);
-        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn(new Configuration);
         $this->be($this->user());
         $response = $this->post(route('admin.update-check.post'), ['check_for_updates' => 1]);
         $response->assertSessionHas('success');
@@ -88,7 +89,7 @@ class UpdateControllerTest extends TestCase
         $falseConfig       = new Configuration;
         $falseConfig->data = false;
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
-        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn(new Configuration);
 
         $version  = config('firefly.version');
         $releases = [
@@ -116,7 +117,7 @@ class UpdateControllerTest extends TestCase
         $falseConfig       = new Configuration;
         $falseConfig->data = false;
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
-        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn(new Configuration);
 
         $version  = config('firefly.version');
         $releases = [
@@ -142,7 +143,7 @@ class UpdateControllerTest extends TestCase
         $falseConfig       = new Configuration;
         $falseConfig->data = false;
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
-        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', time()])->once()->andReturn(new Configuration);
+        FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn(new Configuration);
 
         $version  = config('firefly.version') . '-alpha';
         $releases = [
@@ -159,24 +160,4 @@ class UpdateControllerTest extends TestCase
         $response->assertSee($version);
         $response->assertSee('which is newer than the');
     }
-
-
-
-    //    /**
-    //     * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex
-    //     */
-    //    public function testPostIndex()
-    //    {
-    //        $falseConfig       = new Configuration;
-    //        $falseConfig->data = false;
-    //
-    //        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
-    //        FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once();
-    //        FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once();
-    //
-    //        $this->be($this->user());
-    //        $response = $this->post(route('admin.configuration.index.post'));
-    //        $response->assertSessionHas('success');
-    //        $response->assertStatus(302);
-    //    }
 }

From bd3e262273cdf026c747cf1953995fe339fb0099 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 19:55:10 +0100
Subject: [PATCH 10/22] Expand coverage.

---
 .../Controllers/Admin/UpdateController.php    |  4 +--
 .../Admin/UpdateControllerTest.php            | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index d00a5ae311..38b2723ca1 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -112,10 +112,10 @@ class UpdateController extends Controller
             $check  = version_compare($current, $first->getTitle());
             FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
-            Log::error(sprintf('Could not check for updates: %s', $e->getMessage())); // @codeCoverageIgnore
+            Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
         }
         if ($check === -2) {
-            $string = strval(trans('firefly.update_check_error')); // @codeCoverageIgnore
+            $string = strval(trans('firefly.update_check_error'));
         }
 
         if ($check === -1) {
diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
index a37a97ae46..8a0c56771f 100644
--- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
@@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Admin;
 
 use Carbon\Carbon;
 use FireflyConfig;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Services\Github\Object\Release;
 use FireflyIII\Services\Github\Request\UpdateRequest;
@@ -160,4 +161,28 @@ class UpdateControllerTest extends TestCase
         $response->assertSee($version);
         $response->assertSee('which is newer than the');
     }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck
+     */
+    public function testUpdateCheckError()
+    {
+        $falseConfig       = new Configuration;
+        $falseConfig->data = false;
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+
+        $version  = config('firefly.version') . '-alpha';
+        $releases = [
+            new Release(['id' => 'x', 'title' => $version, 'content' => '', 'updated' => new Carbon]),
+        ];
+        $updater  = $this->mock(UpdateRequest::class);
+        $updater->shouldReceive('call')->andThrow(FireflyException::class, 'Something broke.');
+        $updater->shouldReceive('getReleases')->andReturn($releases);
+
+        // expect a new release (because of .1)
+        $this->be($this->user());
+        $response = $this->post(route('admin.update-check.manual'));
+        $response->assertStatus(200);
+        $response->assertSee('An error occurred while checking');
+    }
 }

From 962324c3f73561b313f42f2863000cb5c7134c42 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 28 Dec 2017 20:06:16 +0100
Subject: [PATCH 11/22] Expand test coverage.

---
 .../Import/Converter/AmountCreditTest.php     | 170 ++++++++++++++++++
 .../Unit/Import/Converter/AmountDebitTest.php | 170 ++++++++++++++++++
 .../Import/Converter/INGDebitCreditTest.php   |  63 +++++++
 3 files changed, 403 insertions(+)
 create mode 100644 tests/Unit/Import/Converter/AmountCreditTest.php
 create mode 100644 tests/Unit/Import/Converter/AmountDebitTest.php
 create mode 100644 tests/Unit/Import/Converter/INGDebitCreditTest.php

diff --git a/tests/Unit/Import/Converter/AmountCreditTest.php b/tests/Unit/Import/Converter/AmountCreditTest.php
new file mode 100644
index 0000000000..2e4bbd888f
--- /dev/null
+++ b/tests/Unit/Import/Converter/AmountCreditTest.php
@@ -0,0 +1,170 @@
+.
+ */
+declare(strict_types=1);
+
+namespace Tests\Unit\Import\Converter;
+
+use FireflyIII\Import\Converter\AmountCredit;
+use Tests\TestCase;
+
+/**
+ * Class AmountCreditTest
+ */
+class AmountCreditTest extends TestCase
+{
+    /**
+     * @covers \FireflyIII\Import\Converter\AmountCredit::convert()
+     */
+    public function testConvert()
+    {
+        $values = [
+            '0'                       => '0',
+            '0.0'                     => '0',
+            '0.1'                     => '0.1',
+            '.2'                      => '0.2',
+            '0.01'                    => '0.01',
+            '1'                       => '1',
+            '1.0'                     => '1',
+            '1.1'                     => '1.1',
+            '1.12'                    => '1.12',
+            '1.10'                    => '1.1',
+            '12'                      => '12',
+            '12.3'                    => '12.3',
+            '12.34'                   => '12.34',
+            '123'                     => '123',
+            '123.4'                   => '123.4',
+            '123.45'                  => '123.45',
+            '1234'                    => '1234',
+            '1234.5'                  => '1234.5',
+            '1234.56'                 => '1234.56',
+            '1 234'                   => '1234',
+            '1 234.5'                 => '1234.5',
+            '1 234.56'                => '1234.56',
+            '1,234'                   => '1234',
+            '1,234.5'                 => '1234.5',
+            '1,234.56'                => '1234.56',
+            '123,456,789'             => '123456789',
+            '0,0'                     => '0',
+            '0,1'                     => '0.1',
+            ',2'                      => '0.2',
+            '0,01'                    => '0.01',
+            '1,0'                     => '1',
+            '1,1'                     => '1.1',
+            '1,12'                    => '1.12',
+            '1,10'                    => '1.1',
+            '12,3'                    => '12.3',
+            '12,34'                   => '12.34',
+            '123,4'                   => '123.4',
+            '123,45'                  => '123.45',
+            '1234,5'                  => '1234.5',
+            '1234,56'                 => '1234.56',
+            '1 234,5'                 => '1234.5',
+            '1 234,56'                => '1234.56',
+            '1.234'                   => '1.234', // will no longer match as 1234, but as 1.234
+            '1.234,5'                 => '1234.5',
+            '1.234,56'                => '1234.56',
+            // many decimals
+            '2.00'                    => '2',
+            '3.000'                   => '3',
+            '4.0000'                  => '4',
+            '5.000'                   => '5',
+            '6.0000'                  => '6',
+            '7.200'                   => '7.2',
+            '8.2000'                  => '8.2',
+            '9.330'                   => '9.33',
+            '10.3300'                 => '10.33',
+            '11.444'                  => '11.444',
+            '12.4440'                 => '12.444',
+            '13.5555'                 => '13.5555',
+            '14.45678'                => '14.45678',
+            '15.456789'               => '15.456789',
+            '16.4567898'              => '16.4567898',
+            '17.34567898'             => '17.34567898',
+            '18.134567898'            => '18.134567898',
+            '19.1634567898'           => '19.1634567898',
+            '20.16334567898'          => '20.16334567898',
+            '21.16364567898'          => '21.16364567898',
+            '22.163644567898'         => '22.163644567898',
+            // many decimals, mixed, large numbers
+            '63522.00'                => '63522',
+            '63523.000'               => '63523',
+            '63524.0000'              => '63524',
+            '63525.000'               => '63525',
+            '63526.0000'              => '63526',
+            '63527.200'               => '63527.2',
+            '63528.2000'              => '63528.2',
+            '63529.330'               => '63529.33',
+            '635210.3300'             => '635210.33',
+            '635211.444'              => '635211.444',
+            '635212.4440'             => '635212.444',
+            '635213.5555'             => '635213.5555',
+            '635214.45678'            => '635214.45678',
+            '635215.456789'           => '635215.456789',
+            '635216.4567898'          => '635216.4567898',
+            '635217.34567898'         => '635217.34567898',
+            '635218.134567898'        => '635218.134567898',
+            '635219.1634567898'       => '635219.1634567898',
+            '635220.16334567898'      => '635220.16334567898',
+            '635221.16364567898'      => '635221.16364567898',
+            '635222.163644567898'     => '635222.163644567898',
+            // many decimals, mixed, also mixed thousands separators
+            '63 522.00'               => '63522',
+            '63 523.000'              => '63523',
+            '63,524.0000'             => '63524',
+            '63 525.000'              => '63525',
+            '63,526.0000'             => '63526',
+            '63 527.200'              => '63527.2',
+            '63 528.2000'             => '63528.2',
+            '63 529.330'              => '63529.33',
+            '63,5210.3300'            => '635210.33',
+            '63,5211.444'             => '635211.444',
+            '63 5212.4440'            => '635212.444',
+            '163 5219.1634567898'     => '1635219.1634567898',
+            '444 163 5219.1634567898' => '4441635219.1634567898',
+            '-0.34918323'             => '0.34918323',
+            '0.208'                   => '0.208',
+            '-0.15'                   => '0.15',
+            '-0.03881677'             => '0.03881677',
+            '0.33'                    => '0.33',
+            '-0.1'                    => '0.1',
+            '0.01124'                 => '0.01124',
+            '-0.01124'                => '0.01124',
+            '0.115'                   => '0.115',
+            '-0.115'                  => '0.115',
+            '1.33'                    => '1.33',
+        ];
+        foreach ($values as $value => $expected) {
+            $converter = new AmountCredit;
+            $result    = $converter->convert($value);
+            $this->assertEquals($expected, $result, sprintf('The original value was %s', $value));
+        }
+    }
+
+    /**
+     * @covers \FireflyIII\Import\Converter\AmountCredit::convert()
+     */
+    public function testConvertNull()
+    {
+        $converter = new AmountCredit;
+        $result    = $converter->convert(null);
+        $this->assertEquals('0', $result);
+    }
+}
diff --git a/tests/Unit/Import/Converter/AmountDebitTest.php b/tests/Unit/Import/Converter/AmountDebitTest.php
new file mode 100644
index 0000000000..702b9f0992
--- /dev/null
+++ b/tests/Unit/Import/Converter/AmountDebitTest.php
@@ -0,0 +1,170 @@
+.
+ */
+declare(strict_types=1);
+
+namespace Tests\Unit\Import\Converter;
+
+use FireflyIII\Import\Converter\AmountDebit;
+use Tests\TestCase;
+
+/**
+ * Class AmountDebitTest
+ */
+class AmountDebitTest extends TestCase
+{
+    /**
+     * @covers \FireflyIII\Import\Converter\AmountDebit::convert()
+     */
+    public function testConvert()
+    {
+        $values = [
+            '0'                       => '0',
+            '0.0'                     => '0',
+            '0.1'                     => '-0.1',
+            '.2'                      => '-0.2',
+            '0.01'                    => '-0.01',
+            '1'                       => '-1',
+            '1.0'                     => '-1',
+            '1.1'                     => '-1.1',
+            '1.12'                    => '-1.12',
+            '1.10'                    => '-1.1',
+            '12'                      => '-12',
+            '12.3'                    => '-12.3',
+            '12.34'                   => '-12.34',
+            '123'                     => '-123',
+            '123.4'                   => '-123.4',
+            '123.45'                  => '-123.45',
+            '1234'                    => '-1234',
+            '1234.5'                  => '-1234.5',
+            '1234.56'                 => '-1234.56',
+            '1 234'                   => '-1234',
+            '1 234.5'                 => '-1234.5',
+            '1 234.56'                => '-1234.56',
+            '1,234'                   => '-1234',
+            '1,234.5'                 => '-1234.5',
+            '1,234.56'                => '-1234.56',
+            '123,456,789'             => '-123456789',
+            '0,0'                     => '0',
+            '0,1'                     => '-0.1',
+            ',2'                      => '-0.2',
+            '0,01'                    => '-0.01',
+            '1,0'                     => '-1',
+            '1,1'                     => '-1.1',
+            '1,12'                    => '-1.12',
+            '1,10'                    => '-1.1',
+            '12,3'                    => '-12.3',
+            '12,34'                   => '-12.34',
+            '123,4'                   => '-123.4',
+            '123,45'                  => '-123.45',
+            '1234,5'                  => '-1234.5',
+            '1234,56'                 => '-1234.56',
+            '1 234,5'                 => '-1234.5',
+            '1 234,56'                => '-1234.56',
+            '1.234'                   => '-1.234', // will no longer match as 1234, but as 1.234
+            '1.234,5'                 => '-1234.5',
+            '1.234,56'                => '-1234.56',
+            // many decimals
+            '2.00'                    => '-2',
+            '3.000'                   => '-3',
+            '4.0000'                  => '-4',
+            '5.000'                   => '-5',
+            '6.0000'                  => '-6',
+            '7.200'                   => '-7.2',
+            '8.2000'                  => '-8.2',
+            '9.330'                   => '-9.33',
+            '10.3300'                 => '-10.33',
+            '11.444'                  => '-11.444',
+            '12.4440'                 => '-12.444',
+            '13.5555'                 => '-13.5555',
+            '14.45678'                => '-14.45678',
+            '15.456789'               => '-15.456789',
+            '16.4567898'              => '-16.4567898',
+            '17.34567898'             => '-17.34567898',
+            '18.134567898'            => '-18.134567898',
+            '19.1634567898'           => '-19.1634567898',
+            '20.16334567898'          => '-20.16334567898',
+            '21.16364567898'          => '-21.16364567898',
+            '22.163644567898'         => '-22.163644567898',
+            // many decimals, mixed, large numbers
+            '63522.00'                => '-63522',
+            '63523.000'               => '-63523',
+            '63524.0000'              => '-63524',
+            '63525.000'               => '-63525',
+            '63526.0000'              => '-63526',
+            '63527.200'               => '-63527.2',
+            '63528.2000'              => '-63528.2',
+            '63529.330'               => '-63529.33',
+            '635210.3300'             => '-635210.33',
+            '635211.444'              => '-635211.444',
+            '635212.4440'             => '-635212.444',
+            '635213.5555'             => '-635213.5555',
+            '635214.45678'            => '-635214.45678',
+            '635215.456789'           => '-635215.456789',
+            '635216.4567898'          => '-635216.4567898',
+            '635217.34567898'         => '-635217.34567898',
+            '635218.134567898'        => '-635218.134567898',
+            '635219.1634567898'       => '-635219.1634567898',
+            '635220.16334567898'      => '-635220.16334567898',
+            '635221.16364567898'      => '-635221.16364567898',
+            '635222.163644567898'     => '-635222.163644567898',
+            // many decimals, mixed, also mixed thousands separators
+            '63 522.00'               => '-63522',
+            '63 523.000'              => '-63523',
+            '63,524.0000'             => '-63524',
+            '63 525.000'              => '-63525',
+            '63,526.0000'             => '-63526',
+            '63 527.200'              => '-63527.2',
+            '63 528.2000'             => '-63528.2',
+            '63 529.330'              => '-63529.33',
+            '63,5210.3300'            => '-635210.33',
+            '63,5211.444'             => '-635211.444',
+            '63 5212.4440'            => '-635212.444',
+            '163 5219.1634567898'     => '-1635219.1634567898',
+            '444 163 5219.1634567898' => '-4441635219.1634567898',
+            '-0.34918323'             => '-0.34918323',
+            '0.208'                   => '-0.208',
+            '-0.15'                   => '-0.15',
+            '-0.03881677'             => '-0.03881677',
+            '0.33'                    => '-0.33',
+            '-0.1'                    => '-0.1',
+            '0.01124'                 => '-0.01124',
+            '-0.01124'                => '-0.01124',
+            '0.115'                   => '-0.115',
+            '-0.115'                  => '-0.115',
+            '1.33'                    => '-1.33',
+        ];
+        foreach ($values as $value => $expected) {
+            $converter = new AmountDebit;
+            $result    = $converter->convert($value);
+            $this->assertEquals($expected, $result, sprintf('The original value was %s', $value));
+        }
+    }
+
+    /**
+     * @covers \FireflyIII\Import\Converter\AmountDebit::convert()
+     */
+    public function testConvertNull()
+    {
+        $converter = new AmountDebit;
+        $result    = $converter->convert(null);
+        $this->assertEquals('0', $result);
+    }
+}
diff --git a/tests/Unit/Import/Converter/INGDebitCreditTest.php b/tests/Unit/Import/Converter/INGDebitCreditTest.php
new file mode 100644
index 0000000000..d24e1da395
--- /dev/null
+++ b/tests/Unit/Import/Converter/INGDebitCreditTest.php
@@ -0,0 +1,63 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Import\Converter;
+
+use FireflyIII\Import\Converter\INGDebitCredit;
+use Tests\TestCase;
+
+/**
+ * Class INGDebitCreditTest
+ */
+class INGDebitCreditTest extends TestCase
+{
+    /**
+     * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert()
+     */
+    public function testConvertAf()
+    {
+        $converter = new INGDebitCredit;
+        $result    = $converter->convert('Af');
+        $this->assertEquals(-1, $result);
+    }
+
+    /**
+     * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert()
+     */
+    public function testConvertBij()
+    {
+        $converter = new INGDebitCredit;
+        $result    = $converter->convert('Bij');
+        $this->assertEquals(1, $result);
+    }
+
+    /**
+     * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert()
+     */
+    public function testConvertAnything()
+    {
+        $converter = new INGDebitCredit;
+        $result    = $converter->convert('9083jkdkj');
+        $this->assertEquals(1, $result);
+    }
+}
\ No newline at end of file

From cf66ae61e199db85a6f9367055a2cf6cf66009a0 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 29 Dec 2017 07:25:30 +0100
Subject: [PATCH 12/22] Add extra info line.

---
 app/Console/Commands/UseEncryption.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php
index 8516a9bcf4..0809ec08b2 100644
--- a/app/Console/Commands/UseEncryption.php
+++ b/app/Console/Commands/UseEncryption.php
@@ -57,6 +57,12 @@ class UseEncryption extends Command
      */
     public function handle()
     {
+        if (config('firefly.encryption') === true) {
+            $this->info('Firefly III configuration calls for encrypted data.');
+        }
+        if (config('firefly.encryption') === false) {
+            $this->info('Firefly III configuration calls for unencrypted data.');
+        }
         $this->handleObjects('Account', 'name', 'encrypted');
         $this->handleObjects('Bill', 'name', 'name_encrypted');
         $this->handleObjects('Bill', 'match', 'match_encrypted');
@@ -76,7 +82,7 @@ class UseEncryption extends Command
     public function handleObjects(string $class, string $field, string $indicator)
     {
         $fqn     = sprintf('FireflyIII\Models\%s', $class);
-        $encrypt = config('firefly.encryption') ? 0 : 1;
+        $encrypt = config('firefly.encryption') === true ? 0 : 1;
         $set     = $fqn::where($indicator, $encrypt)->get();
 
         foreach ($set as $entry) {

From 3815f9836f106da3410ab9cbc385eba13e34eb34 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 29 Dec 2017 09:05:35 +0100
Subject: [PATCH 13/22] Various code cleanup.

---
 app/Console/Commands/CreateImport.php         |   4 +-
 app/Console/Commands/Import.php               |  10 +-
 app/Export/Entry/Entry.php                    |  12 +-
 app/Export/Exporter/CsvExporter.php           |  11 +-
 .../Report/Tag/MonthReportGenerator.php       |   1 +
 app/Handlers/Events/UserEventHandler.php      |   1 +
 .../Events/VersionCheckEventHandler.php       |   1 -
 app/Http/Controllers/AccountController.php    |   3 +-
 .../Controllers/Admin/UpdateController.php    |  14 +-
 app/Http/Controllers/AttachmentController.php |   3 +-
 app/Http/Controllers/Auth/LoginController.php |   4 +-
 app/Http/Controllers/BillController.php       |   7 +-
 app/Http/Controllers/BudgetController.php     |   5 +-
 app/Http/Controllers/CategoryController.php   |   3 +-
 app/Http/Controllers/HomeController.php       |   4 +-
 .../Import/PrerequisitesController.php        |   2 +-
 .../Controllers/Import/StatusController.php   |   2 -
 .../Json/AutoCompleteController.php           |   1 -
 app/Http/Controllers/Json/IntroController.php |   1 +
 .../Controllers/Popup/ReportController.php    |   2 +-
 .../Controllers/PreferencesController.php     |   2 +-
 .../Controllers/Report/ExpenseController.php  |   2 +-
 .../Transaction/SplitController.php           |  12 +-
 app/Import/FileProcessor/CsvProcessor.php     |   1 +
 app/Import/Object/ImportJournal.php           |   1 +
 app/Import/Storage/ImportStorage.php          |   1 -
 app/Models/Account.php                        |   9 +
 app/Models/AccountMeta.php                    |   1 +
 app/Models/Attachment.php                     |  24 ++-
 app/Models/Bill.php                           |   6 +
 app/Models/Budget.php                         |   4 +-
 app/Models/BudgetLimit.php                    |   1 +
 app/Models/Category.php                       |   4 +-
 app/Models/Configuration.php                  |   2 +
 app/Models/ExportJob.php                      |   1 +
 app/Models/PiggyBank.php                      |   9 +-
 app/Models/PiggyBankEvent.php                 |   1 +
 app/Models/PiggyBankRepetition.php            |   3 +
 app/Models/Preference.php                     |   1 +
 app/Models/Tag.php                            |   4 +
 app/Models/Transaction.php                    |   6 +
 app/Models/TransactionCurrency.php            |   2 +-
 app/Models/TransactionJournal.php             |   8 +
 app/Models/TransactionJournalLink.php         |   2 +
 app/Models/TransactionJournalMeta.php         |   2 +
 .../Account/AccountRepository.php             |   2 +-
 .../Journal/JournalRepositoryInterface.php    |  15 +-
 .../LinkType/LinkTypeRepositoryInterface.php  |   2 +-
 .../User/UserRepositoryInterface.php          |  28 +--
 .../Spectre/Request/SpectreRequest.php        |  28 ---
 app/Support/Amount.php                        |   4 +-
 app/Support/Binder/Date.php                   |   1 -
 app/Support/ExpandedForm.php                  |  14 +-
 .../Import/Information/BunqInformation.php    |   1 +
 app/Support/Navigation.php                    |   1 +
 .../Triggers/AbstractTrigger.php              |  10 +-
 app/Validation/FireflyValidator.php           |   2 +-
 public/js/ff/accounts/reconcile.js            |   1 -
 public/js/ff/accounts/show.js                 |   2 +-
 public/js/ff/admin/update/index.js            |   4 +-
 public/js/ff/budgets/index.js                 |   6 +-
 public/js/ff/charts.defaults.js               |  21 +-
 public/js/ff/help.js                          |   2 +-
 public/js/ff/import/status.js                 |   2 +-
 public/js/ff/piggy-banks/index.js             |   2 +-
 public/js/ff/reports/account/month.js         |  11 +-
 public/js/ff/reports/all.js                   |   2 +-
 public/js/ff/reports/index.js                 |   3 +-
 public/js/ff/rules/index.js                   |   2 +-
 public/js/ff/search/index.js                  |   2 +-
 public/js/ff/tags/show.js                     |   2 +-
 public/js/ff/transactions/list.js             |   2 +-
 resources/stubs/demo-configuration.json       |  68 +++----
 .../views/accounts/reconcile/overview.twig    |  52 ++---
 resources/views/admin/link/edit.twig          |  56 ++---
 resources/views/admin/link/index.twig         |   6 +-
 resources/views/admin/link/show.twig          |   3 +-
 resources/views/admin/users/delete.twig       |   3 +-
 resources/views/bills/index.twig              |  34 ++--
 resources/views/bills/show.twig               |   4 +-
 resources/views/budgets/income.twig           |   2 +-
 resources/views/budgets/index.twig            |   8 +-
 resources/views/budgets/info.twig             |  82 ++++----
 resources/views/budgets/show.twig             |  42 ++--
 resources/views/categories/index.twig         |  36 ++--
 resources/views/form/location.twig            | 192 +++++++++---------
 resources/views/form/number.twig              |   2 +-
 resources/views/import/bank/form.twig         |   4 +-
 resources/views/import/file/initial.twig      |   2 +-
 resources/views/import/file/map.twig          |   4 +-
 resources/views/import/status.twig            |  20 +-
 resources/views/index.twig                    |  10 +-
 resources/views/javascript/variables.twig     |  25 ++-
 resources/views/json/piggy-banks.twig         |   5 +-
 resources/views/layout/default.twig           |   3 +-
 resources/views/list/accounts.twig            |   9 +-
 resources/views/list/bills.twig               |   4 +-
 resources/views/list/journals.twig            |   8 +-
 resources/views/list/piggy-bank-events.twig   |   2 +-
 resources/views/partials/menu-sidebar.twig    |   3 +-
 resources/views/partials/transaction-row.twig |   4 +-
 resources/views/piggy-banks/index.twig        |  88 ++++----
 .../views/popup/report/balance-amount.twig    |   2 +-
 resources/views/profile/index.twig            |   6 +-
 resources/views/reports/audit/report.twig     | 128 ++++++------
 resources/views/reports/partials/bills.twig   |   2 +-
 .../views/reports/partials/exp-budgets.twig   |   4 +-
 .../reports/partials/exp-categories.twig      |   6 +-
 .../reports/partials/exp-not-grouped.twig     |   9 +-
 .../reports/partials/top-transactions.twig    |   3 +-
 resources/views/rules/index.twig              |   4 +-
 resources/views/tags/create.twig              |   2 +-
 resources/views/tags/edit.twig                |   2 +-
 resources/views/tags/index.twig               |  33 +--
 resources/views/tags/show.twig                |  30 +--
 resources/views/transactions/convert.twig     |  84 ++++----
 .../views/transactions/single/create.twig     |  24 +--
 resources/views/transactions/single/edit.twig |  48 ++---
 resources/views/transactions/split/edit.twig  | 152 +++++++-------
 routes/api.php                                |   6 +-
 routes/breadcrumbs.php                        |   4 +-
 routes/channels.php                           |   8 +-
 routes/console.php                            |   6 +-
 .../Admin/UpdateControllerTest.php            |  48 ++---
 .../Auth/TwoFactorControllerTest.php          |   2 +-
 .../Import/StatusControllerTest.php           |   2 +-
 .../Controllers/PreferencesControllerTest.php |   2 +-
 .../Transaction/LinkControllerTest.php        |  54 +++--
 .../Transaction/SingleControllerTest.php      |  10 +-
 .../Import/Converter/INGDebitCreditTest.php   |  20 +-
 .../Middleware/AuthenticateTwoFactorTest.php  |  67 +++---
 tests/Unit/Middleware/IsAdminTest.php         |  22 +-
 tests/Unit/Middleware/IsDemoUserTest.php      |  20 +-
 tests/Unit/Middleware/IsSandstormUserTest.php |   1 -
 tests/Unit/Middleware/SandstormTest.php       |  30 +--
 135 files changed, 1021 insertions(+), 973 deletions(-)

diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php
index b29d83e291..bfb52735e2 100644
--- a/app/Console/Commands/CreateImport.php
+++ b/app/Console/Commands/CreateImport.php
@@ -150,7 +150,9 @@ class CreateImport extends Command
                 $this->error(sprintf('Error importing line #%d: %s', $index, $error));
             }
             $this->line(
-                sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->lines)
+                sprintf(
+                    'The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines()
+                )
             );
         }
 
diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php
index 5f156c3e1f..65ae256332 100644
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -85,8 +85,8 @@ class Import extends Command
         $monolog->pushHandler($handler);
 
         // actually start job:
-        $type      = 'csv' === $job->file_type ? 'file' : $job->file_type;
-        $key       = sprintf('import.routine.%s', $type);
+        $type = 'csv' === $job->file_type ? 'file' : $job->file_type;
+        $key = sprintf('import.routine.%s', $type);
         $className = config($key);
         if (null === $className || !class_exists($className)) {
             throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
@@ -98,11 +98,13 @@ class Import extends Command
         $routine->run();
 
         /** @var MessageBag $error */
-        foreach ($routine->errors as $index => $error) {
+        foreach ($routine->getErrors() as $index => $error) {
             $this->error(sprintf('Error importing line #%d: %s', $index, $error));
         }
 
-        $this->line(sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines));
+        $this->line(
+            sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines())
+        );
 
         return;
     }
diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php
index 8819b726fc..63f0c5ea43 100644
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -203,7 +203,7 @@ final class Entry
             $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
         }
         $entry->currency_code = $transaction->transactionCurrency->code;
-        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+        $entry->amount        = strval(round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places));
 
         $entry->foreign_currency_code = null === $transaction->foreign_currency_id ? null : $transaction->foreignCurrency->code;
         $entry->foreign_amount        = null === $transaction->foreign_currency_id
@@ -216,14 +216,14 @@ final class Entry
             );
 
         $entry->transaction_type     = $transaction->transaction_type_type;
-        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_id     = strval($transaction->account_id);
         $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
         $entry->asset_account_iban   = $transaction->account_iban;
         $entry->asset_account_number = $transaction->account_number;
         $entry->asset_account_bic    = $transaction->account_bic;
         $entry->asset_currency_code  = $transaction->account_currency_code;
 
-        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_id     = strval($transaction->opposing_account_id);
         $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
         $entry->opposing_account_iban   = $transaction->opposing_account_iban;
         $entry->opposing_account_number = $transaction->opposing_account_number;
@@ -231,7 +231,7 @@ final class Entry
         $entry->opposing_currency_code  = $transaction->opposing_currency_code;
 
         // budget
-        $entry->budget_id   = $transaction->transaction_budget_id;
+        $entry->budget_id   = strval($transaction->transaction_budget_id);
         $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
         if (null === $transaction->transaction_budget_id) {
             $entry->budget_id   = $transaction->transaction_journal_budget_id;
@@ -239,7 +239,7 @@ final class Entry
         }
 
         // category
-        $entry->category_id   = $transaction->transaction_category_id;
+        $entry->category_id   = strval($transaction->transaction_category_id);
         $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
         if (null === $transaction->transaction_category_id) {
             $entry->category_id   = $transaction->transaction_journal_category_id;
@@ -247,7 +247,7 @@ final class Entry
         }
 
         // budget
-        $entry->bill_id   = $transaction->bill_id;
+        $entry->bill_id   = strval($transaction->bill_id);
         $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
 
         $entry->tags  = $transaction->tags;
diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php
index e2703b0d20..012e4d6e2b 100644
--- a/app/Export/Exporter/CsvExporter.php
+++ b/app/Export/Exporter/CsvExporter.php
@@ -24,8 +24,6 @@ namespace FireflyIII\Export\Exporter;
 
 use FireflyIII\Export\Entry\Entry;
 use League\Csv\Writer;
-use SplFileObject;
-use SplTempFileObject;
 use Storage;
 
 /**
@@ -66,12 +64,9 @@ class CsvExporter extends BasicExporter implements ExporterInterface
         $fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->fileName;
 
 
-
         //we create the CSV into memory
-        //$writer = Writer::createFromFileObject(new SplTempFileObject());
         $writer = Writer::createFromPath($fullPath);
-        //$writer   = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
-        $rows     = [];
+        $rows   = [];
 
         // get field names for header row:
         $first   = $this->getEntries()->first();
@@ -91,8 +86,6 @@ class CsvExporter extends BasicExporter implements ExporterInterface
             $rows[] = $line;
         }
         $writer->insertAll($rows);
-        //$writer->output($fullPath);
-        //$writer->
 
         return true;
     }
@@ -102,6 +95,6 @@ class CsvExporter extends BasicExporter implements ExporterInterface
         $this->fileName = $this->job->key . '-records.csv';
         // touch file in export directory:
         $disk = Storage::disk('export');
-        $disk->put($this->fileName,'');
+        $disk->put($this->fileName, '');
     }
 }
diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php
index 43a6899482..e1cdc808fc 100644
--- a/app/Generator/Report/Tag/MonthReportGenerator.php
+++ b/app/Generator/Report/Tag/MonthReportGenerator.php
@@ -65,6 +65,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
 
     /**
      * @return string
+     * @throws \Throwable
      */
     public function generate(): string
     {
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 6fcb3428eb..23f09fbfeb 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -76,6 +76,7 @@ class UserEventHandler
     {
         Log::debug('In checkSingleUserIsAdmin');
 
+        /** @var User $user */
         $user  = $event->user;
         $count = User::count();
 
diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php
index 612af9f13b..6753f1d9a6 100644
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Handlers\Events;
 use FireflyConfig;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\User;
-use Illuminate\Auth\Events\Login;
 use Log;
 
 /**
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 8ef77b6326..421425a835 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -101,13 +101,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Request                    $request
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
      * @return View
      */
-    public function delete(Request $request, AccountRepositoryInterface $repository, Account $account)
+    public function delete(AccountRepositoryInterface $repository, Account $account)
     {
         $typeName    = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 38b2723ca1..f8208d659f 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -102,14 +102,15 @@ class UpdateController extends Controller
         /** @var UpdateRequest $request */
         $request = app(UpdateRequest::class);
         $check   = -2;
+        $first   = new Release(['id' => '0', 'title' => '0', 'updated' => '2017-01-01', 'content' => '']);
+        $string  = '';
         try {
             $request->call();
             $releases = $request->getReleases();
             // first entry should be the latest entry:
             /** @var Release $first */
-            $first  = reset($releases);
-            $string = '';
-            $check  = version_compare($current, $first->getTitle());
+            $first = reset($releases);
+            $check = version_compare($current, $first->getTitle());
             FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
             Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
@@ -120,7 +121,12 @@ class UpdateController extends Controller
 
         if ($check === -1) {
             // there is a new FF version!
-            $string = strval(trans('firefly.update_new_version_alert', ['your_version' => $current, 'new_version' => $first->getTitle(), 'date' => $first->getUpdated()->formatLocalized($this->monthAndDayFormat)]));
+            $string = strval(
+                trans(
+                    'firefly.update_new_version_alert',
+                    ['your_version' => $current, 'new_version' => $first->getTitle(), 'date' => $first->getUpdated()->formatLocalized($this->monthAndDayFormat)]
+                )
+            );
         }
         if ($check === 0) {
             // you are running the current version!
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 6407760e55..8937027dfd 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -59,12 +59,11 @@ class AttachmentController extends Controller
     }
 
     /**
-     * @param Request    $request
      * @param Attachment $attachment
      *
      * @return View
      */
-    public function delete(Request $request, Attachment $attachment)
+    public function delete(Attachment $attachment)
     {
         $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
 
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 46f24a243f..e6a4bfcc9b 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -64,7 +64,7 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void
+     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
      *
      * @throws \Illuminate\Validation\ValidationException
      */
@@ -102,7 +102,7 @@ class LoginController extends Controller
      * @param Request   $request
      * @param CookieJar $cookieJar
      *
-     * @return $this
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function logout(Request $request, CookieJar $cookieJar)
     {
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index e867c87b95..391749489a 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -91,12 +91,11 @@ class BillController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param Bill    $bill
+     * @param Bill $bill
      *
      * @return View
      */
-    public function delete(Request $request, Bill $bill)
+    public function delete(Bill $bill)
     {
         // put previous url in session
         $this->rememberPreviousUri('bills.delete.uri');
@@ -194,7 +193,7 @@ class BillController extends Controller
             }
         );
         // paginate bills
-        $bills= new LengthAwarePaginator($collection, $total, $pageSize, $page);
+        $bills = new LengthAwarePaginator($collection, $total, $pageSize, $page);
         $bills->setPath(route('bills.index'));
 
         return view('bills.index', compact('bills'));
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 50c21f95d3..cf5a41bc6f 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -118,12 +118,11 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param Budget  $budget
+     * @param Budget $budget
      *
      * @return View
      */
-    public function delete(Request $request, Budget $budget)
+    public function delete(Budget $budget)
     {
         $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]);
 
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 61f1c9980f..0e3013f88a 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -80,12 +80,11 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param Request  $request
      * @param Category $category
      *
      * @return View
      */
-    public function delete(Request $request, Category $category)
+    public function delete(Category $category)
     {
         $subTitle = trans('firefly.delete_category', ['name' => $category->name]);
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 59ea09c3c7..32c2c63a24 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers;
 use Artisan;
 use Carbon\Carbon;
 use DB;
+use Exception;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
@@ -39,7 +40,6 @@ use Illuminate\Support\Collection;
 use Log;
 use Monolog\Handler\RotatingFileHandler;
 use Preferences;
-use ReflectionException;
 use Response;
 use Route as RouteFacade;
 use View;
@@ -186,7 +186,7 @@ class HomeController extends Controller
         Log::debug('Call twig:clean...');
         try {
             Artisan::call('twig:clean');
-        } catch (ReflectionException $e) {
+        } catch (Exception $e) {
             // dont care
         }
         Log::debug('Call view:clear...');
diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php
index 9d0755fdbc..42a7b3d243 100644
--- a/app/Http/Controllers/Import/PrerequisitesController.php
+++ b/app/Http/Controllers/Import/PrerequisitesController.php
@@ -60,7 +60,7 @@ class PrerequisitesController extends Controller
      *
      * @param string $bank
      *
-     * @return \Illuminate\Http\RedirectResponse|null
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      *
      * @throws FireflyException
      */
diff --git a/app/Http/Controllers/Import/StatusController.php b/app/Http/Controllers/Import/StatusController.php
index 267ba7f5e4..fd54229a95 100644
--- a/app/Http/Controllers/Import/StatusController.php
+++ b/app/Http/Controllers/Import/StatusController.php
@@ -108,8 +108,6 @@ class StatusController extends Controller
             $result['running'] = true;
         }
 
-        // TODO cannot handle 'error'
-
         return Response::json($result);
     }
 }
diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index 3381500649..6e28443d54 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -29,7 +29,6 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use Log;
 use Response;
 
 /**
diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php
index 986a3b103e..ace783ae57 100644
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -46,6 +46,7 @@ class IntroController
         $specificSteps = $this->getSpecificSteps($route, $specificPage);
         if (0 === count($specificSteps)) {
             Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage));
+
             return Response::json($steps);
         }
         if ($this->hasOutroStep($route)) {
diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php
index 0a27cdb2f2..b7d3fc7654 100644
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -238,7 +238,7 @@ class ReportController extends Controller
     private function parseAttributes(array $attributes): array
     {
         $attributes['location'] = $attributes['location'] ?? '';
-        $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get','',[]));
+        $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));
         try {
             $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']);
         } catch (InvalidArgumentException $e) {
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 608cb1e6c4..75e3a70a50 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -26,8 +26,8 @@ use FireflyIII\Http\Requests\TokenFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Illuminate\Http\Request;
 use Google2FA;
+use Illuminate\Http\Request;
 use Preferences;
 use Session;
 use View;
diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php
index eea0e638b6..90dc90a2ea 100644
--- a/app/Http/Controllers/Report/ExpenseController.php
+++ b/app/Http/Controllers/Report/ExpenseController.php
@@ -231,7 +231,7 @@ class ExpenseController extends Controller
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($expense->pluck('id')->toArray());
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         $combined = $this->combineAccounts($expense);
         $all      = new Collection;
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index ae111b3827..d93e431df7 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -59,12 +59,10 @@ class SplitController extends Controller
 
     /** @var CurrencyRepositoryInterface */
     private $currencies;
-
-    /** @var JournalTaskerInterface */
-    private $tasker;
-
     /** @var JournalRepositoryInterface */
     private $repository;
+    /** @var JournalTaskerInterface */
+    private $tasker;
 
     /**
      *
@@ -81,7 +79,7 @@ class SplitController extends Controller
                 $this->tasker      = app(JournalTaskerInterface::class);
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->currencies  = app(CurrencyRepositoryInterface::class);
-                $this->repository = app(JournalRepositoryInterface::class);
+                $this->repository  = app(JournalRepositoryInterface::class);
                 app('view')->share('mainTitleIcon', 'fa-share-alt');
                 app('view')->share('title', trans('firefly.split-transactions'));
 
@@ -145,8 +143,8 @@ class SplitController extends Controller
     }
 
     /**
-     * @param SplitJournalFormRequest    $request
-     * @param TransactionJournal         $journal
+     * @param SplitJournalFormRequest $request
+     * @param TransactionJournal      $journal
      *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php
index 1608c4e7bf..1ad9d6b973 100644
--- a/app/Import/FileProcessor/CsvProcessor.php
+++ b/app/Import/FileProcessor/CsvProcessor.php
@@ -72,6 +72,7 @@ class CsvProcessor implements FileProcessorInterface
      * @return bool
      *
      * @throws \League\Csv\Exception
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function run(): bool
     {
diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php
index b7f8e3ca89..a903ffe7e1 100644
--- a/app/Import/Object/ImportJournal.php
+++ b/app/Import/Object/ImportJournal.php
@@ -330,6 +330,7 @@ class ImportJournal
      */
     private function selectAmountInput()
     {
+        $info           = [];
         $converterClass = '';
         if (!is_null($this->amount)) {
             Log::debug('Amount value is not NULL, assume this is the correct value.');
diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 4b0823fbba..f548ae0068 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -236,7 +236,6 @@ class ImportStorage
 
         // match bills if config calls for it.
         if (true === $this->matchBills) {
-            //$this->/applyRules($journal);
             Log::info('Cannot match bills (yet).');
             $this->matchBills($journal);
         }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index c4e523a886..11a1061320 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -189,6 +189,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $fieldName
      *
      * @return string
@@ -206,6 +207,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -299,6 +301,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param array           $types
      */
@@ -313,6 +316,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param string          $name
      * @param string          $value
@@ -331,7 +335,9 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setIbanAttribute($value)
@@ -341,6 +347,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setNameAttribute($value)
@@ -352,7 +359,9 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setVirtualBalanceAttribute($value)
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index f70953f3be..c98e4780da 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -69,6 +69,7 @@ class AccountMeta extends Model
 
     /**
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setDataAttribute($value)
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 957996968e..f78478dde8 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -70,6 +70,7 @@ class Attachment extends Model
 
     /**
      * Get all of the owning attachable models.
+     *
      * @codeCoverageIgnore
      *
      * @return MorphTo
@@ -81,7 +82,8 @@ class Attachment extends Model
 
     /**
      * Returns the expected filename for this attachment.
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return string
      */
     public function fileName(): string
@@ -91,7 +93,8 @@ class Attachment extends Model
 
     /**
      * @param $value
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return null|string
      */
     public function getDescriptionAttribute($value)
@@ -105,7 +108,8 @@ class Attachment extends Model
 
     /**
      * @param $value
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return null|string
      */
     public function getFilenameAttribute($value)
@@ -119,7 +123,8 @@ class Attachment extends Model
 
     /**
      * @param $value
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return null|string
      */
     public function getMimeAttribute($value)
@@ -133,7 +138,8 @@ class Attachment extends Model
 
     /**
      * @param $value
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return null|string
      */
     public function getNotesAttribute($value)
@@ -147,7 +153,8 @@ class Attachment extends Model
 
     /**
      * @param $value
-     *@codeCoverageIgnore
+     *
+     * @codeCoverageIgnore
      * @return null|string
      */
     public function getTitleAttribute($value)
@@ -161,6 +168,7 @@ class Attachment extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $value
      */
     public function setDescriptionAttribute(string $value)
@@ -170,6 +178,7 @@ class Attachment extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $value
      */
     public function setFilenameAttribute(string $value)
@@ -179,6 +188,7 @@ class Attachment extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $value
      */
     public function setMimeAttribute(string $value)
@@ -188,6 +198,7 @@ class Attachment extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $value
      */
     public function setNotesAttribute(string $value)
@@ -197,6 +208,7 @@ class Attachment extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $value
      */
     public function setTitleAttribute(string $value)
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 68121c947c..b7dcb125cd 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -96,6 +96,7 @@ class Bill extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -111,6 +112,7 @@ class Bill extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -135,6 +137,7 @@ class Bill extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setAmountMaxAttribute($value)
@@ -144,6 +147,7 @@ class Bill extends Model
 
     /**
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setAmountMinAttribute($value)
@@ -153,6 +157,7 @@ class Bill extends Model
 
     /**
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setMatchAttribute($value)
@@ -164,6 +169,7 @@ class Bill extends Model
 
     /**
      * @param $value
+     *
      * @codeCoverageIgnore
      */
     public function setNameAttribute($value)
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index a47b9e9176..ba013701ea 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -84,7 +84,7 @@ class Budget extends Model
     }
 
     /**
-     * @param Budget $value
+     * @param string $value
      *
      * @return Budget
      */
@@ -111,6 +111,7 @@ class Budget extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -126,6 +127,7 @@ class Budget extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setNameAttribute($value)
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 6d5ebad901..ddab3dfab0 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -77,6 +77,7 @@ class BudgetLimit extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setAmountAttribute($value)
diff --git a/app/Models/Category.php b/app/Models/Category.php
index c5b3b741ae..38f6e3712d 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -83,7 +83,7 @@ class Category extends Model
     }
 
     /**
-     * @param Category $value
+     * @param string $value
      *
      * @return Category
      */
@@ -101,6 +101,7 @@ class Category extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -116,6 +117,7 @@ class Category extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setNameAttribute($value)
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index bf36775c52..6a2b97c9bf 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -49,6 +49,7 @@ class Configuration extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return mixed
@@ -60,6 +61,7 @@ class Configuration extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setDataAttribute($value)
diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php
index 65bcd1820b..1c019919e6 100644
--- a/app/Models/ExportJob.php
+++ b/app/Models/ExportJob.php
@@ -61,6 +61,7 @@ class ExportJob extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $status
      */
     public function change($status)
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index c4bf040c6c..51904e9f9d 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -69,9 +69,9 @@ class PiggyBank extends Model
     {
         if (auth()->check()) {
             $piggyBankId = intval($value);
-            $piggyBank   = PiggyBank::where('piggy_banks.id', $piggyBankId)
-                                    ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
-                                    ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']);
+            $piggyBank   = self::where('piggy_banks.id', $piggyBankId)
+                               ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
+                               ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']);
             if (!is_null($piggyBank)) {
                 return $piggyBank;
             }
@@ -111,6 +111,7 @@ class PiggyBank extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -196,6 +197,7 @@ class PiggyBank extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setNameAttribute($value)
@@ -207,6 +209,7 @@ class PiggyBank extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setTargetamountAttribute($value)
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 683f2b7b9e..4bd7753aa9 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -62,6 +62,7 @@ class PiggyBankEvent extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setAmountAttribute($value)
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 77e09eadbc..af65867865 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -60,6 +60,7 @@ class PiggyBankRepetition extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param Carbon          $start
      * @param Carbon          $target
@@ -73,6 +74,7 @@ class PiggyBankRepetition extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -96,6 +98,7 @@ class PiggyBankRepetition extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setCurrentamountAttribute($value)
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index d85c3323ba..e59f68148d 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -80,6 +80,7 @@ class Preference extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setDataAttribute($value)
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index f7d6351642..5f70bee39e 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -123,6 +123,7 @@ class Tag extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -138,6 +139,7 @@ class Tag extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -171,6 +173,7 @@ class Tag extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setDescriptionAttribute($value)
@@ -180,6 +183,7 @@ class Tag extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setTagAttribute($value)
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 0378477c4b..35d388ad99 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -108,6 +108,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param Builder $query
      * @param string  $table
      *
@@ -168,6 +169,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return float|int
@@ -179,6 +181,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param Builder $query
      * @param Carbon  $date
      */
@@ -192,6 +195,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param Builder $query
      * @param Carbon  $date
      */
@@ -205,6 +209,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param Builder $query
      * @param array   $types
      */
@@ -222,6 +227,7 @@ class Transaction extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setAmountAttribute($value)
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index beacb01102..708fc36217 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -59,7 +59,7 @@ class TransactionCurrency extends Model
     {
         if (auth()->check()) {
             $currencyId = intval($value);
-            $currency   = TransactionCurrency::find($currencyId);
+            $currency   = self::find($currencyId);
             if (!is_null($currency)) {
                 return $currency;
             }
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 4ba5ae9283..74fc1fd07a 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -141,6 +141,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $name
      *
      * @return bool
@@ -163,6 +164,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
@@ -214,6 +216,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param string $name
      *
      * @return bool
@@ -311,6 +314,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -323,6 +327,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -335,6 +340,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      */
     public function scopeSortCorrectly(EloquentBuilder $query)
@@ -346,6 +352,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param array           $types
      */
@@ -361,6 +368,7 @@ class TransactionJournal extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setDescriptionAttribute($value)
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index f8f625d645..36ec286341 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -72,6 +72,7 @@ class TransactionJournalLink extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return null|string
@@ -96,6 +97,7 @@ class TransactionJournalLink extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setCommentAttribute($value): void
diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php
index 827d3f7301..3e87d48d0b 100644
--- a/app/Models/TransactionJournalMeta.php
+++ b/app/Models/TransactionJournalMeta.php
@@ -50,6 +50,7 @@ class TransactionJournalMeta extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return mixed
@@ -61,6 +62,7 @@ class TransactionJournalMeta extends Model
 
     /**
      * @codeCoverageIgnore
+     *
      * @param $value
      */
     public function setDataAttribute($value)
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 849ce97aac..3c404fdf88 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -190,7 +190,7 @@ class AccountRepository implements AccountRepositoryInterface
         // update the account:
         $account->name            = $data['name'];
         $account->active          = $data['active'];
-        $account->virtual_balance = trim($data['virtualBalance']) === '' ? '0': $data['virtualBalance'];
+        $account->virtual_balance = trim($data['virtualBalance']) === '' ? '0' : $data['virtualBalance'];
         $account->iban            = $data['iban'];
         $account->save();
 
diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php
index a136ed1784..782b38cca3 100644
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -26,7 +26,6 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
@@ -54,13 +53,6 @@ interface JournalRepositoryInterface
      */
     public function countTransactions(TransactionJournal $journal): int;
 
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return Note|null
-     */
-    public function getNote(TransactionJournal $journal): ?Note;
-
     /**
      * Deletes a journal.
      *
@@ -107,6 +99,13 @@ interface JournalRepositoryInterface
      */
     public function getAssetTransaction(TransactionJournal $journal): ?Transaction;
 
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Note|null
+     */
+    public function getNote(TransactionJournal $journal): ?Note;
+
     /**
      * @return Collection
      */
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
index a94ed251b2..19ae1c8846 100644
--- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -95,7 +95,7 @@ interface LinkTypeRepositoryInterface
     /**
      * Store link between two journals.
      *
-     * @param array $information
+     * @param array              $information
      * @param TransactionJournal $left
      * @param TransactionJournal $right
      *
diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php
index 1588696677..f3a76efcd4 100644
--- a/app/Repositories/User/UserRepositoryInterface.php
+++ b/app/Repositories/User/UserRepositoryInterface.php
@@ -37,20 +37,6 @@ interface UserRepositoryInterface
      */
     public function all(): Collection;
 
-    /**
-     * Returns the first user in the DB. Generally only works when there is just one.
-     *
-     * @return null|User
-     */
-    public function first(): ?User;
-
-    /**
-     * @param array $data
-     *
-     * @return User
-     */
-    public function store(array $data): User;
-
     /**
      * Gives a user a role.
      *
@@ -119,6 +105,13 @@ interface UserRepositoryInterface
      */
     public function findByEmail(string $email): ?User;
 
+    /**
+     * Returns the first user in the DB. Generally only works when there is just one.
+     *
+     * @return null|User
+     */
+    public function first(): ?User;
+
     /**
      * Return basic user information.
      *
@@ -136,6 +129,13 @@ interface UserRepositoryInterface
      */
     public function hasRole(User $user, string $role): bool;
 
+    /**
+     * @param array $data
+     *
+     * @return User
+     */
+    public function store(array $data): User;
+
     /**
      * @param User $user
      */
diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php
index 8d87297829..8db025b6ba 100644
--- a/app/Services/Spectre/Request/SpectreRequest.php
+++ b/app/Services/Spectre/Request/SpectreRequest.php
@@ -40,8 +40,6 @@ abstract class SpectreRequest
      * @var int
      */
     protected $expiresAt = 0;
-    /** @var ServerPublicKey */
-    protected $serverPublicKey;
     /** @var string */
     protected $serviceSecret = '';
     /** @var string */
@@ -104,22 +102,6 @@ abstract class SpectreRequest
         return $this->server;
     }
 
-    /**
-     * @return ServerPublicKey
-     */
-    public function getServerPublicKey(): ServerPublicKey
-    {
-        return $this->serverPublicKey;
-    }
-
-    /**
-     * @param ServerPublicKey $serverPublicKey
-     */
-    public function setServerPublicKey(ServerPublicKey $serverPublicKey)
-    {
-        $this->serverPublicKey = $serverPublicKey;
-    }
-
     /**
      * @return string
      */
@@ -144,14 +126,6 @@ abstract class SpectreRequest
         $this->privateKey = $privateKey;
     }
 
-    /**
-     * @param string $secret
-     */
-    public function setSecret(string $secret)
-    {
-        $this->secret = $secret;
-    }
-
     /**
      * @param string $method
      * @param string $uri
@@ -169,8 +143,6 @@ abstract class SpectreRequest
         if ('get' === strtolower($method) || 'delete' === strtolower($method)) {
             $data = '';
         }
-        // base64(sha1_signature(private_key, "Expires-at|request_method|original_url|post_body|md5_of_uploaded_file|")))
-        // Prepare the signature
         $toSign = $this->expiresAt . '|' . strtoupper($method) . '|' . $uri . '|' . $data . ''; // no file so no content there.
         Log::debug(sprintf('String to sign: "%s"', $toSign));
         $signature = '';
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index 8d79402963..a9d066e557 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -202,7 +202,7 @@ class Amount
     /**
      * @return \FireflyIII\Models\TransactionCurrency
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function getDefaultCurrency(): TransactionCurrency
     {
@@ -216,7 +216,7 @@ class Amount
      *
      * @return \FireflyIII\Models\TransactionCurrency
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function getDefaultCurrencyByUser(User $user): TransactionCurrency
     {
diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php
index 7622b5d8b0..5b04cfbd54 100644
--- a/app/Support/Binder/Date.php
+++ b/app/Support/Binder/Date.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Support\Binder;
 
 use Carbon\Carbon;
 use Exception;
-use FireflyIII\Helpers\FiscalHelper;
 use FireflyIII\Helpers\FiscalHelperInterface;
 use Illuminate\Routing\Route;
 use Log;
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 02e3775377..04ce257ebb 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Support;
 use Amount as Amt;
 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use RuntimeException;
@@ -36,11 +37,12 @@ use Session;
 class ExpandedForm
 {
     /**
-     * @param       $name
-     * @param null  $value
-     * @param array $options
+     * @param string $name
+     * @param null   $value
+     * @param array  $options
      *
      * @return string
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function amount(string $name, $value = null, array $options = []): string
     {
@@ -53,6 +55,7 @@ class ExpandedForm
      * @param array $options
      *
      * @return string
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function amountSmall(string $name, $value = null, array $options = []): string
     {
@@ -65,6 +68,8 @@ class ExpandedForm
      * @param array $options
      *
      * @return string
+     * @throws \FireflyIII\Exceptions\FireflyException
+     *
      */
     public function balance(string $name, $value = null, array $options = []): string
     {
@@ -594,8 +599,7 @@ class ExpandedForm
      *
      * @return string
      *
-     * @throws \Throwable
-     * @throws Facades\FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     private function currencyField(string $name, string $view, $value = null, array $options = []): string
     {
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 851cafb2af..ab12faf500 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -63,6 +63,7 @@ class BunqInformation implements InformationInterface
      * @return array
      *
      * @throws FireflyException
+     * @throws \Exception
      */
     public function getAccounts(): array
     {
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index ebc33e78bc..59de0f956d 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -473,6 +473,7 @@ class Navigation
             $date->subMonths($subtract);
             Log::debug(sprintf('%s is in modifier map with value %d, execute subMonths with argument %d', $repeatFreq, $modifierMap[$repeatFreq], $subtract));
             Log::debug(sprintf('subtractPeriod: resulting date is %s', $date->format('Y-m-d')));
+
             return $date;
         }
         // a custom range requires the session start
diff --git a/app/TransactionRules/Triggers/AbstractTrigger.php b/app/TransactionRules/Triggers/AbstractTrigger.php
index 201bcbad57..0177db9860 100644
--- a/app/TransactionRules/Triggers/AbstractTrigger.php
+++ b/app/TransactionRules/Triggers/AbstractTrigger.php
@@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionJournal;
  * This class will be magical!
  *
  * Class AbstractTrigger
+ * @method triggered
  */
 class AbstractTrigger
 {
@@ -43,15 +44,6 @@ class AbstractTrigger
     /** @var string Trigger value */
     protected $triggerValue;
 
-    /**
-     * AbstractTrigger constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    private function __construct()
-    {
-    }
-
     /**
      * Make a new trigger from the value given in the string.
      *
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index a7f73f4b9e..b50b3b4659 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -340,7 +340,7 @@ class FireflyValidator extends Validator
      *
      * @return bool
      */
-    public function validateUniqueAccountNumberForUser($attribute, $value, $parameters): bool
+    public function validateUniqueAccountNumberForUser($attribute, $value): bool
     {
         $accountId = $this->data['id'] ?? 0;
 
diff --git a/public/js/ff/accounts/reconcile.js b/public/js/ff/accounts/reconcile.js
index 98ddc523e0..4f1b46666d 100644
--- a/public/js/ff/accounts/reconcile.js
+++ b/public/js/ff/accounts/reconcile.js
@@ -92,7 +92,6 @@ function storeReconcile() {
         transactions: ids,
         cleared: cleared,
     };
-    console.log
     var uri = overviewUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());
 
 
diff --git a/public/js/ff/accounts/show.js b/public/js/ff/accounts/show.js
index 3b1ca6ce87..ba77ebff95 100644
--- a/public/js/ff/accounts/show.js
+++ b/public/js/ff/accounts/show.js
@@ -18,7 +18,7 @@
  * along with Firefly III. If not, see .
  */
 
-/** global: chartUri, incomeCategoryUri, expenseCategoryUri, expenseBudgetUri */
+/** global: chartUri, incomeCategoryUri, expenseCategoryUri, expenseBudgetUri, token */
 
 var fixHelper = function (e, tr) {
     "use strict";
diff --git a/public/js/ff/admin/update/index.js b/public/js/ff/admin/update/index.js
index 39a427e77e..d02d0ad23f 100644
--- a/public/js/ff/admin/update/index.js
+++ b/public/js/ff/admin/update/index.js
@@ -18,6 +18,8 @@
  * along with Firefly III. If not, see .
  */
 
+/** global: updateCheckUri */
+
 $(function () {
     "use strict";
 
@@ -31,7 +33,7 @@ function checkUpdate() {
     // do post update check:
     $.post(updateCheckUri).done(function (data) {
         alert(data.result);
-    }).fail(function() {
+    }).fail(function () {
         alert('Error while checking.');
     });
 
diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js
index db07e9088d..6a36dae5a0 100644
--- a/public/js/ff/budgets/index.js
+++ b/public/js/ff/budgets/index.js
@@ -18,7 +18,7 @@
  * along with Firefly III. If not, see .
  */
 
-/** global: infoIncomeUri, spent, budgeted, available, currencySymbol, budgetIndexUri, updateIncomeUri, periodStart, periodEnd, budgetAmountUri, accounting */
+/** global: infoIncomeUri, token, spent, budgeted, available, currencySymbol, budgetIndexUri, updateIncomeUri, periodStart, periodEnd, budgetAmountUri, accounting */
 /**
  *
  */
@@ -104,7 +104,7 @@ function updateBudgetedAmounts(e) {
     var target = $(e.target);
     var id = target.data('id');
     var leftCell = $('td[class$="left"][data-id="' + id + '"]');
-    var link = $('a[data-id="'+id+'"][class="budget-link"]');
+    var link = $('a[data-id="' + id + '"][class="budget-link"]');
     var value = target.val();
     var original = target.data('original');
 
@@ -112,7 +112,7 @@ function updateBudgetedAmounts(e) {
     target.prop('disabled', true);
 
     // replace link (for now)
-    link.attr('href','#');
+    link.attr('href', '#');
 
     // replace "left" with spinner.
     leftCell.empty().html('');
diff --git a/public/js/ff/charts.defaults.js b/public/js/ff/charts.defaults.js
index 21c5852877..e2764d5567 100644
--- a/public/js/ff/charts.defaults.js
+++ b/public/js/ff/charts.defaults.js
@@ -29,40 +29,37 @@
  * @param maxwidth
  * @returns {Array}
  */
-function formatLabel(str, maxwidth){
+function formatLabel(str, maxwidth) {
     var sections = [];
     var words = str.split(" ");
     var temp = "";
 
-    words.forEach(function(item, index){
-        if(temp.length > 0)
-        {
+    words.forEach(function (item, index) {
+        if (temp.length > 0) {
             var concat = temp + ' ' + item;
 
-            if(concat.length > maxwidth){
+            if (concat.length > maxwidth) {
                 sections.push(temp);
                 temp = "";
             }
-            else{
-                if(index === (words.length-1))
-                {
+            else {
+                if (index === (words.length - 1)) {
                     sections.push(concat);
                     return;
                 }
-                else{
+                else {
                     temp = concat;
                     return;
                 }
             }
         }
 
-        if(index === (words.length-1))
-        {
+        if (index === (words.length - 1)) {
             sections.push(item);
             return;
         }
 
-        if(item.length < maxwidth) {
+        if (item.length < maxwidth) {
             temp = item;
         }
         else {
diff --git a/public/js/ff/help.js b/public/js/ff/help.js
index 9894563e66..9e7280b1c0 100644
--- a/public/js/ff/help.js
+++ b/public/js/ff/help.js
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see .
  */
-
+/** global: token */
 $(function () {
     "use strict";
     $('#help').click(showHelp);
diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js
index 9fa0198516..c05560cafd 100644
--- a/public/js/ff/import/status.js
+++ b/public/js/ff/import/status.js
@@ -18,7 +18,7 @@
  * along with Firefly III. If not, see .
  */
 
-/** global: langImportSingleError, langImportMultiError, jobStartUrl, langImportTimeOutError, langImportFinished, langImportFatalError */
+/** global: job, langImportSingleError, langImportMultiError, jobStartUrl, langImportTimeOutError, langImportFinished, langImportFatalError */
 
 var timeOutId;
 var startInterval = 1000;
diff --git a/public/js/ff/piggy-banks/index.js b/public/js/ff/piggy-banks/index.js
index 72f128a2a0..292d7f7f7d 100644
--- a/public/js/ff/piggy-banks/index.js
+++ b/public/js/ff/piggy-banks/index.js
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see .
  */
-
+/** global: token */
 var fixHelper = function (e, tr) {
     "use strict";
     var $originals = tr.children();
diff --git a/public/js/ff/reports/account/month.js b/public/js/ff/reports/account/month.js
index a8d2129875..6aba68d1b0 100644
--- a/public/js/ff/reports/account/month.js
+++ b/public/js/ff/reports/account/month.js
@@ -1,4 +1,3 @@
-
 /*
  * month.js
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -18,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see .
  */
-
+/** global: spentUri, categoryUri, budgetUri, expenseUri, incomeUri, mainUri  */
 $(function () {
     "use strict";
-    drawChart();
+    doubleYChart(mainUri, 'in-out-chart');
 
     loadAjaxPartial('inOutAccounts', spentUri);
     loadAjaxPartial('inOutCategory', categoryUri);
@@ -31,9 +30,3 @@ $(function () {
 
 });
 
-function drawChart() {
-    "use strict";
-
-    // month view:
-    doubleYChart(mainUri, 'in-out-chart');
-}
\ No newline at end of file
diff --git a/public/js/ff/reports/all.js b/public/js/ff/reports/all.js
index 3c34cb9a35..912539796c 100644
--- a/public/js/ff/reports/all.js
+++ b/public/js/ff/reports/all.js
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see .
  */
-
+/** global: startDate, endDate, accountIds */
 function loadAjaxPartial(holder, uri) {
     "use strict";
     $.get(uri).done(function (data) {
diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js
index dfea1c9fc0..9e9562e947 100644
--- a/public/js/ff/reports/index.js
+++ b/public/js/ff/reports/index.js
@@ -139,7 +139,6 @@ function setOptionalFromCookies() {
     $('#inputExpRevAccounts').multiselect(defaultMultiSelect);
 
 
-
 }
 
 function catchSubmit() {
@@ -161,7 +160,7 @@ function catchSubmit() {
     createCookie('report-categories', categories, 365);
     createCookie('report-budgets', budgets, 365);
     createCookie('report-tags', tags, 365);
-    createCookie('report-exp-rev', expRev   , 365);
+    createCookie('report-exp-rev', expRev, 365);
     createCookie('report-start', moment(picker.startDate).format("YYYYMMDD"), 365);
     createCookie('report-end', moment(picker.endDate).format("YYYYMMDD"), 365);
 
diff --git a/public/js/ff/rules/index.js b/public/js/ff/rules/index.js
index 5c58468fa1..27ef2fb053 100644
--- a/public/js/ff/rules/index.js
+++ b/public/js/ff/rules/index.js
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see .
  */
-
+/** global: token */
 var fixHelper = function (e, tr) {
     "use strict";
     var $originals = tr.children();
diff --git a/public/js/ff/search/index.js b/public/js/ff/search/index.js
index 8b8cea4304..70615ae476 100644
--- a/public/js/ff/search/index.js
+++ b/public/js/ff/search/index.js
@@ -18,7 +18,7 @@
  * along with Firefly III. If not, see .
  */
 
-/** global: searchQuery,searchUri */
+/** global: searchQuery,searchUri,token */
 
 
 
diff --git a/public/js/ff/tags/show.js b/public/js/ff/tags/show.js
index e2b5f75922..b199393bbe 100644
--- a/public/js/ff/tags/show.js
+++ b/public/js/ff/tags/show.js
@@ -48,7 +48,7 @@ $(function () {
         }).addTo(mymap);
 
         if (doPlaceMarker) {
-            var marker = L.marker([latitude, longitude]).addTo(mymap);
+            L.marker([latitude, longitude]).addTo(mymap);
         }
     }
 });
diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js
index 1a9b5d1230..70694d0598 100644
--- a/public/js/ff/transactions/list.js
+++ b/public/js/ff/transactions/list.js
@@ -18,7 +18,7 @@
  * along with Firefly III. If not, see .
  */
 
-/** global: edit_selected_txt, delete_selected_txt */
+/** global: edit_selected_txt, delete_selected_txt, token */
 
 /**
  *
diff --git a/resources/stubs/demo-configuration.json b/resources/stubs/demo-configuration.json
index c69c8bfe71..ed3e7a60b1 100644
--- a/resources/stubs/demo-configuration.json
+++ b/resources/stubs/demo-configuration.json
@@ -1,37 +1,37 @@
 {
-    "has-headers": true,
-    "date-format": "Y-m-d",
-    "delimiter": ",",
-    "import-account": 1,
-    "specifics": [],
-    "column-count": 7,
-    "column-roles": [
-        "account-iban",
-        "opposing-name",
-        "amount",
-        "date-transaction",
-        "description",
-        "category-name",
-        "budget-name"
-    ],
-    "column-do-mapping": [
-        true,
-        true,
-        false,
-        false,
-        false,
-        false,
-        false
-    ],
-    "column-roles-complete": false,
-    "column-mapping-config": {
-        "0": {
-            "NL11XOLA6707795988": 1,
-            "NL81RCQZ7160379858": 3
-        },
-        "1": [],
-        "5": [],
-        "6": []
+  "has-headers": true,
+  "date-format": "Y-m-d",
+  "delimiter": ",",
+  "import-account": 1,
+  "specifics": [],
+  "column-count": 7,
+  "column-roles": [
+    "account-iban",
+    "opposing-name",
+    "amount",
+    "date-transaction",
+    "description",
+    "category-name",
+    "budget-name"
+  ],
+  "column-do-mapping": [
+    true,
+    true,
+    false,
+    false,
+    false,
+    false,
+    false
+  ],
+  "column-roles-complete": false,
+  "column-mapping-config": {
+    "0": {
+      "NL11XOLA6707795988": 1,
+      "NL81RCQZ7160379858": 3
     },
-    "column-mapping-complete": false
+    "1": [],
+    "5": [],
+    "6": []
+  },
+  "column-mapping-complete": false
 }
\ No newline at end of file
diff --git a/resources/views/accounts/reconcile/overview.twig b/resources/views/accounts/reconcile/overview.twig
index abc2fe9af3..78502d20af 100644
--- a/resources/views/accounts/reconcile/overview.twig
+++ b/resources/views/accounts/reconcile/overview.twig
@@ -15,7 +15,7 @@
                 
                 
                 {% for id in transactionIds %}
-                    
+                    
                 {% endfor %}
 
                 
@@ -33,14 +33,14 @@
                     
-                        
+                        
@@ -60,36 +60,36 @@
                     
                 {% endif %}
                 {% if diffCompare != 0 %}
-                
      
-                    
      
-                        
      
-                            
      
 
-                
      
-                    
      
-                        
      
-                            
+                    
      
+                        
      
+                            
      
+                                
+                            
      
                         
      
                     
      
-                
      
 
-                
      
-                    {{ 'reconcile_go_back'|_ }}
-                
      
+                    
      
+                        {{ 'reconcile_go_back'|_ }}
+                    
      
                 {% endif %}
             
      
             
      
diff --git a/resources/views/admin/link/edit.twig b/resources/views/admin/link/edit.twig
index c72e131b1c..80b7833500 100644
--- a/resources/views/admin/link/edit.twig
+++ b/resources/views/admin/link/edit.twig
@@ -7,41 +7,41 @@
 {% block content %}
 
     {{ Form.model(linkType, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.links.update', linkType.id) } ) }}
-        
-        
-        
      
-            
      
-                
      
-                    
      
-                        
      {{ 'mandatoryFields'|_ }}
      
-                    
      
-                    
      
-                        {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
-                        {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
-                        {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
-                    
      
+    
+    
+    
      
+        
      
+            
      
+                
      
+                    
      {{ 'mandatoryFields'|_ }}
      
+                
      
+                
      
+                    {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
+                    {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
+                    {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
                 
      
             
      
-            
      
+        
      
+        
      
 
-                
-                
      
-                    
      
-                        
      {{ 'options'|_ }}
      
-                    
      
-                    
      
-                        {{ ExpandedForm.optionsList('update','link_type') }}
-                    
      
-                    
      
-                        
-                    
      
+            
+            
      
+                
      
+                    
      {{ 'options'|_ }}
      
+                
      
+                
      
+                    {{ ExpandedForm.optionsList('update','link_type') }}
+                
      
+                
      
+                    
                 
      
-
             
      
 
         
      
+
+    
      
     
 
 
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index 059c67b2d8..f49df83759 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -27,8 +27,10 @@
                                 
      
diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig
index 3a1dab5af5..3d452df573 100644
--- a/resources/views/admin/link/show.twig
+++ b/resources/views/admin/link/show.twig
@@ -28,7 +28,8 @@
                                 
      
                     
      
                         {{ 'submitted_end_balance'|_ }} (date){{ formatAmountByAccount(account, endBalance)}}{{ formatAmountByAccount(account, endBalance) }}
                     
      
 
                     
      
                         {{ 'difference'|_ }}
                         
                             {{ formatAmountByAccount(account, difference) }}
-                            
+                            
                         
 
                     
      
                                     {% if linkType.editable %}
                                         
      
-                                            
-                                            
+                                            
+                                            
                                         
      
                                     {% endif %}
                                       		
                                     
      
                                         
-                                        
+                                        
                                     
      
                                       		
                                 
diff --git a/resources/views/admin/users/delete.twig b/resources/views/admin/users/delete.twig
index 80c194816d..64ad1ec1ae 100644
--- a/resources/views/admin/users/delete.twig
+++ b/resources/views/admin/users/delete.twig
@@ -25,7 +25,8 @@
                         
      
                     
                     
      
-                        
+                        
                         {{ trans('form.cancel') }}
                     
      
 
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index b262cd604a..5635099605 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -8,29 +8,29 @@
     {% if bills.count == 0 %}
         {% include 'partials.empty' with {what: 'default', type: 'bills',route: route('bills.create')} %}
     {% else %}
-        
      
-            
      
-                
      
-                    
      
-                        
      {{ title }}
      
+
      
+    
      
+        
      
+            
      
+                
      {{ title }}
      
 
 
-                        
      
-                            
      
-                                
-                                
-                            
      
-                        
      
-                    
      
-                    
      
-                        {% include 'list/bills' %}
+                
      
+                    
      
+                        
+                        
                     
      
                 
      
             
      
+            
      
+                {% include 'list/bills' %}
+            
      
         
      
-    {% endif %}
+    
      
+
      
+{% endif %}
 {% endblock %}
 
 {% block styles %}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 4a2542f91b..afde0b88fe 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -86,12 +86,12 @@
                 
      
                 
      
                     {% if bill.notes.count == 1 %}
-                    
+                        
      
-                    
      
                             
      
                                 {{ trans('list.notes') }}
                                 {{ bill.notes.first.text|markdown }}
                             
      
+                        
      
                     {% endif %}
                 
 
diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig
index 50c80832f3..201e2f2a3c 100644
--- a/resources/views/budgets/income.twig
+++ b/resources/views/budgets/income.twig
@@ -5,7 +5,7 @@
             
             
      
                 {{ trans('firefly.update_budget_amount_range',
-                {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
+                    {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
             
      
         
 
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index f0b12e1493..b340a9ef02 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -17,10 +17,10 @@
                             {{ 'budgeted'|_ }}: {{ budgeted|formatAmountPlain }}
                         
                         
      
-                                {{ trans('firefly.available_between',{start : periodStart, end: periodEnd }) }}:
-                                    {{ available|formatAmountPlain }}
-                                    
-                                    
+                            {{ trans('firefly.available_between',{start : periodStart, end: periodEnd }) }}:
+                                {{ available|formatAmountPlain }}
+                                
+                                
                             
                         
      
                     
diff --git a/resources/views/budgets/info.twig b/resources/views/budgets/info.twig
index 25a8104b47..6bc6ff6582 100644
--- a/resources/views/budgets/info.twig
+++ b/resources/views/budgets/info.twig
@@ -5,50 +5,50 @@
             
             
      
                 {{ trans('firefly.info_on_available_amount',
-                {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
+                    {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
             
      
         
 
-            
      
-                
      
-                    {{ 'available_amount_indication'|_ }}
-                
      
-                
-                    
-                        
-                        
-                    
-                    
-                        
-                        
-                    
-                    
-                        
-                        
-                    
-                    
-                        
-                        
-                    
-                
      
-                            {{ 'budgeted'|_ }}
-                            
      
-                                {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
-                              		
-                            {{ result.available|formatAmount }}
-                        
      {{ 'earned'|_ }}
-                            
      
-                                {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
-                                  
-                              		{{ result.earned|formatAmount }}
      {{ 'spent'|_ }}
-                            
      
-                                {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
-                                  
-                              		{{ result.spent|formatAmount }}
      {{ 'suggested'|_ }}{{ result.suggested|formatAmount }}
      
-            
      
-            
      
-                
-            
      
+        
      
+            
      
+                {{ 'available_amount_indication'|_ }}
+            
      
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+            
      
+                        {{ 'budgeted'|_ }}
+                        
      
+                            {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
+                          		
+                        {{ result.available|formatAmount }}
+                    
      {{ 'earned'|_ }}
+                        
      
+                            {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
+                              
+                          		{{ result.earned|formatAmount }}
      {{ 'spent'|_ }}
+                        
      
+                            {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }}
+                              
+                          		{{ result.spent|formatAmount }}
      {{ 'suggested'|_ }}{{ result.suggested|formatAmount }}
      
+        
      
+        
      
+            
+        
      
     
 
 
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index f2a1c9e945..4a697a3c6e 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -122,27 +122,29 @@
                                 {{ limit.spent|formatAmount }}
                             
                             {% if limit.spent > 0 %}
-                            
-                                
-                                    {% set overspent = limit.amount + limit.spent < 0 %}
+                                
+                                    
+                                        {% set overspent = limit.amount + limit.spent < 0 %}
 
-                                    {% if overspent %}
-                                        {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} 
-                                        
      
-                                            
      
-                                            
      
-                                        
      
-                                    {% else %}
-                                        {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} 
-                                        
      
-                                            
      
-                                        
      
-                                    {% endif %}
-                                
-                            
+                                        {% if overspent %}
+                                            {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} 
+                                            
      
+                                                
      
+                                                
      
+                                            
      
+                                        {% else %}
+                                            {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} 
+                                            
      
+                                                
      
+                                            
      
+                                        {% endif %}
+                                    
+                                
                             {% endif %}
                         
                     
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index 8f73c9b307..743d72eede 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -6,30 +6,30 @@
 
 {% block content %}
     {% if categories.count > 0 %}
-        
      
-            
      
-                
      
-                    
      
-                        
      {{ 'categories'|_ }}
      
+
      
+    
      
+        
      
+            
      
+                
      {{ 'categories'|_ }}
      
 
 
-                        
      
-                            
      
-                                
-                                
-                            
      
-                        
      
-
-                    
      
-                    
      
-                        {% include 'list/categories' %}
+                
      
+                    
      
+                        
+                        
                     
      
                 
      
+
+            
      
+            
      
+                {% include 'list/categories' %}
             
      
         
      
-    {% else %}
+    
      
+
      
+{% else %}
         {% include 'partials.empty' with {what: 'default', type: 'categories',route: route('categories.create')} %}
     {% endif %}
 {% endblock %}
diff --git a/resources/views/form/location.twig b/resources/views/form/location.twig
index c8201e641f..939bef8ff3 100644
--- a/resources/views/form/location.twig
+++ b/resources/views/form/location.twig
@@ -2,118 +2,120 @@
     
     
      
         {% if env('MAPBOX_API_KEY','') == '' %}
-            
      
-                {{ trans('firefly.mapbox_api_key')|raw }}
-            
      
+        
      
+            {{ trans('firefly.mapbox_api_key')|raw }}
+        
      
         {% else %}
         
      
-        
      
+        
      
         
      
             {{ 'press_tag_location'|_ }}
             {{ 'clear_location'|_ }}
         
      
-            {# latitude #}
-            {% if old(name~'_latitude') %}
-                
-            {% else %}
-                
-            {% endif %}
+        {# latitude #}
+        {% if old(name~'_latitude') %}
+            
+        {% else %}
+            
+        {% endif %}
 
-            {# longitude #}
-            {% if old('tag_position_longitude') %}
-                
-            {% else %}
-                
-            {% endif %}
+        {# longitude #}
+        {% if old('tag_position_longitude') %}
+            
+        {% else %}
+            
+        {% endif %}
 
-            {# zoomlevel #}
-            {% if old('tag_position_zoomlevel') %}
-                
-            {% else %}
-                
-            {% endif %}
-            {% if tag.zoomLevel and tag.longitude and tag.latitude %}
-                
-            {% else %}
-                
-            {% endif %}
+        {# zoomlevel #}
+        {% if old('tag_position_zoomlevel') %}
+            
+        {% else %}
+            
+        {% endif %}
+        {% if tag.zoomLevel and tag.longitude and tag.latitude %}
+            
+        {% else %}
+            
+        {% endif %}
         {% include 'form/feedback' %}
         {% endif %}
     
      
 
      
 
 {% if env('MAPBOX_API_KEY','') != '' %}
-{% set latitudevar = name~'_latitude' %}
-{% set longitudevar = name~'_longitude' %}
-{% set zoomlevelvar = name~'_zoomlevel' %}
-{% set hastagvar = name~'_has_tag' %}
-{% set settagvar = name~'_set_tag' %}
-{% set clearvar = name~'_clear_location' %}
+    {% set latitudevar = name~'_latitude' %}
+    {% set longitudevar = name~'_longitude' %}
+    {% set zoomlevelvar = name~'_zoomlevel' %}
+    {% set hastagvar = name~'_has_tag' %}
+    {% set settagvar = name~'_set_tag' %}
+    {% set clearvar = name~'_clear_location' %}
 
-
+        if (typeof mapboxToken === 'undefined') {
+            var mapboxToken = 'invalid';
+        }
+        //
+        document.getElementById('{{ clearvar }}').addEventListener('click', function () {
+            if (typeof marker !== 'undefined') {
+                marker.remove();
+                $('input[name="{{ hastagvar }}"]').val('false');
+            }
+            return false;
+        });
+
+        // set location thing:
+        function setTagLocation(e) {
+            $('input[name="{{ latitudevar }}"]').val(e.latlng.lat);
+            $('input[name="{{ longitudevar }}"]').val(e.latlng.lng);
+            $('input[name="{{ zoomlevelvar }}"]').val(mymap.getZoom());
+            $('input[name="{{ hastagvar }}"]').val('true');
+
+            // remove existing marker:
+            if (typeof marker !== 'undefined') {
+                marker.remove();
+            }
+            // new marker
+            marker = L.marker([e.latlng.lat, e.latlng.lng]).addTo(mymap);
+        }
+
+
+        console.log({{ longitudevar }});
+
+        document.addEventListener("DOMContentLoaded", function () {
+            "use strict";
+
+            // make map:
+            mymap = L.map('{{ name }}_map').setView([{{ latitudevar }}, {{ longitudevar }}], {{ zoomlevelvar }});
+
+            L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', {
+                attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox',
+                maxZoom: 18,
+                id: 'mapbox.streets',
+                accessToken: mapboxToken
+            }).addTo(mymap);
+
+            mymap.on('contextmenu', setTagLocation);
+
+            // add marker
+            if (typeof {{ settagvar }} !== 'undefined' && {{ settagvar }} === true) {
+                marker = L.marker([{{ latitudevar }}, {{ longitudevar }}]).addTo(mymap);
+            }
+
+        });
+    
 {% endif %}
diff --git a/resources/views/form/number.twig b/resources/views/form/number.twig
index efffb5b8a0..6951b19328 100644
--- a/resources/views/form/number.twig
+++ b/resources/views/form/number.twig
@@ -2,7 +2,7 @@
     
 
     
      
-            {{ Form.input('number', name, value, options) }}
+        {{ Form.input('number', name, value, options) }}
         {% include 'form/feedback' %}
     
      
 
      
diff --git a/resources/views/import/bank/form.twig b/resources/views/import/bank/form.twig
index 70f99a6790..a7c6507a01 100644
--- a/resources/views/import/bank/form.twig
+++ b/resources/views/import/bank/form.twig
@@ -34,13 +34,13 @@
                                     {% for remoteAccount in remoteAccounts %}
                                         
                                             
-                                                
+                                                
                                             
                                             
                                                 
                                                     {{ remoteAccount.name }}
                                                 
-                                                
      {{ remoteAccount.number }}
+                                                
      {{ remoteAccount.number }}
                                             
                                             
                                                 {{ remoteAccount.currency }}
diff --git a/resources/views/import/file/initial.twig b/resources/views/import/file/initial.twig
index fa2e6121ec..cff85df421 100644
--- a/resources/views/import/file/initial.twig
+++ b/resources/views/import/file/initial.twig
@@ -79,7 +79,7 @@
                                         
      
                                             
      
                                             
      
diff --git a/resources/views/import/file/map.twig b/resources/views/import/file/map.twig
index a2ad9d0010..3a347f8905 100644
--- a/resources/views/import/file/map.twig
+++ b/resources/views/import/file/map.twig
@@ -48,8 +48,8 @@
                                         
                                         
                                             {{ Form.select('mapping['~field.index~']['~option~']',
-                                            field.options,
-                                            job.configuration['column-mapping-config'][field.index][option], {class: 'form-control'}) }}
+                                                field.options,
+                                                job.configuration['column-mapping-config'][field.index][option], {class: 'form-control'}) }}
                                         
                                     
                                 {% endfor %}
diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig
index 650c224fac..ac042e5dd6 100644
--- a/resources/views/import/status.twig
+++ b/resources/views/import/status.twig
@@ -63,22 +63,22 @@
                     
      
                     
      
                         {% if job.configuration['has-config-file'] != false %}
-                        
      
-                             {{ trans('import.status_ready_config') }}
-                        
      
+                            
      
+                                 {{ trans('import.status_ready_config') }}
+                            
      
                         {% endif %}
                         
      
                             
                         
      
                     
      
                     {% if job.configuration['has-config-file'] != false %}
-                    
      
-                         
-                    
      
-                    
      
-                        {{ trans('import.status_ready_share')|raw }}
-                    
      
+                        
      
+                             
+                        
      
+                        
      
+                            {{ trans('import.status_ready_share')|raw }}
+                        
      
                     {% endif %}
                 
      
             
      
diff --git a/resources/views/index.twig b/resources/views/index.twig
index bab812d8b9..c763197739 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -112,7 +112,8 @@
             {# EXPENSE ACCOUNTS #}
             
      
                 
      
-                    
      {{ 'expense_accounts'|_ }}
      
+                    
      {{ 'expense_accounts'|_ }}
+                    
      
 
                 
      
                 
      
@@ -123,7 +124,8 @@
             {% if showDeps %}
                 
      
                     
      
-                        
      {{ 'revenue_accounts'|_ }}
      
+                        
      {{ 'revenue_accounts'|_ }}
      
 
                     
      
                     
      
@@ -146,9 +148,9 @@
 
         
         {% if start.lte(today) and end.gte(today) %}
-            var today = {{ today.diffInDays(start) + 1 }};
+        var today = {{ today.diffInDays(start) + 1 }};
         {% else %}
-            var today = -1;
+        var today = -1;
         {% endif %}
     
 
diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig
index 0da9d3eadf..1bd44157cc 100644
--- a/resources/views/javascript/variables.twig
+++ b/resources/views/javascript/variables.twig
@@ -1,4 +1,3 @@
-
 // date ranges
 var ranges = {}
 {% for title, range in dateRangeConfig.ranges %}
@@ -7,22 +6,22 @@ var ranges = {}
 
 // date range meta configuration
 var dateRangeMeta = {
-    title: "{{ dateRangeTitle }}",
-    uri: "{{ route('daterange') }}",
-    labels: {
-        apply: "{{ 'apply'|_ }}",
-        cancel: "{{ 'cancel'|_ }}",
-        from: "{{ 'from'|_ }}",
-        to: "{{ 'to'|_ }}",
-        customRange: "{{ 'customRange'|_ }}"
-    }
+title: "{{ dateRangeTitle }}",
+uri: "{{ route('daterange') }}",
+labels: {
+apply: "{{ 'apply'|_ }}",
+cancel: "{{ 'cancel'|_ }}",
+from: "{{ 'from'|_ }}",
+to: "{{ 'to'|_ }}",
+customRange: "{{ 'customRange'|_ }}"
+}
 };
 
 // date range actual configuration:
 var dateRangeConfig = {
-    startDate: moment("{{ dateRangeConfig.start }}"),
-    endDate: moment("{{ dateRangeConfig.end }}"),
-    ranges: ranges
+startDate: moment("{{ dateRangeConfig.start }}"),
+endDate: moment("{{ dateRangeConfig.end }}"),
+ranges: ranges
 
 };
 
diff --git a/resources/views/json/piggy-banks.twig b/resources/views/json/piggy-banks.twig
index d8cc226c5e..478ba1d95b 100644
--- a/resources/views/json/piggy-banks.twig
+++ b/resources/views/json/piggy-banks.twig
@@ -5,9 +5,10 @@
     
      
     
      
         {% for entry in info %}
-            {{ entry.name }}
      
+            {{ entry.name }}
      
             
      
-                
      
+                
      
                     {% if entry.percentage >=20 %}{{ entry.amount|formatAmountPlain }}{% endif %}
                 
      
                 {% if entry.percentage < 20 %} {{ entry.amount|formatAmountPlain }}{% endif %}
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index d01ab308c0..f39e95761a 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -185,7 +185,8 @@
 
 
 
-
+
 
 
 {% if not shownDemo %}
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index 90a031efbb..90c69be280 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -21,7 +21,14 @@
     {% for account in accounts %}
         
             
-                
      {% if what == 'asset' %}{% endif %}
      
+                
      {% if what == 'asset' %}{% endif %}
      
             
             {{ account.name }}
             {% if what == "asset" %}
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index e7bb11c980..e4e8f6afc8 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -19,7 +19,9 @@
     {% for entry in bills %}
         
             
-                
      
+                
      
             
             
                 {{ entry.name }}
diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig
index 0e3f4ff036..e0e25e9383 100644
--- a/resources/views/list/journals.twig
+++ b/resources/views/list/journals.twig
@@ -46,12 +46,14 @@
         
      
              {{ 'select_transactions'|_ }}
             
+                > {{ 'stop_selection'|_ }}
             {% if showReconcile == true %}
                 {% if moment == 'all' %}
-                     {{ 'reconcile_this_account'|_ }}
+                     {{ 'reconcile_this_account'|_ }}
                 {% else %}
-                     {{ 'reconcile_this_account'|_ }}
+                     {{ 'reconcile_this_account'|_ }}
                 {% endif %}
             {% endif %}
         
      
diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig
index 89b20f1710..43c815b54a 100644
--- a/resources/views/list/piggy-bank-events.twig
+++ b/resources/views/list/piggy-bank-events.twig
@@ -1,7 +1,7 @@
 
         {% if showPiggyBank %}
-            
+            
         {% endif %}
         
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index b73ae95836..205a887c99 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -159,7 +159,8 @@
                             class="fa fa-gear fa-fw"> {{ 'preferences'|_ }}
    1. 
-                 {{ 'currencies'|_ }}
+                 {{ 'currencies'|_ }}
+                
             
      2. 
             {% if Auth.user.hasRole('owner') %}
diff --git a/resources/views/partials/transaction-row.twig b/resources/views/partials/transaction-row.twig
index e969a07888..2b54a0bad0 100644
--- a/resources/views/partials/transaction-row.twig
+++ b/resources/views/partials/transaction-row.twig
@@ -1,11 +1,11 @@
-
 
     {# input buttons #}
     
diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twig
index 992570d1dc..d1cc577e1d 100644
--- a/resources/views/reports/partials/exp-budgets.twig
+++ b/resources/views/reports/partials/exp-budgets.twig
@@ -1,7 +1,7 @@
 
      
     
      {{  trans('list.piggy_bank') }}{{ trans('list.piggy_bank') }}{{ trans('list.date') }}
         {{ trans('list.amount') }}
             
             
             
      
                     
                         {{ line.getBill.name }}
-                        
      
+                        
      
                             {{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }}
                               
                     
      
-        
+        
@@ -20,7 +20,7 @@
                     {{ '0'|formatAmount }}
                 {% else %}
                     {% for expense in entry.spent.per_currency %}
-                        {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
+                        {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
                     {% endfor %}
                 {% endif %}
             
diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twig
index e700cf4268..1ff99b927d 100644
--- a/resources/views/reports/partials/exp-categories.twig
+++ b/resources/views/reports/partials/exp-categories.twig
@@ -1,7 +1,7 @@
 
      
     
     
      {{ 'category'|_ }}{{ 'category'|_ }}
         {{ 'spent'|_ }}
     
      
     
      
-        
+        
@@ -22,7 +22,7 @@
                     {{ '0'|formatAmount }}
                 {% else %}
                     {% for expense in entry.spent.per_currency %}
-                        {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
+                        {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
                     {% endfor %}
                 {% endif %}
             
@@ -31,7 +31,7 @@
                     {{ '0'|formatAmount }}
                 {% else %}
                     {% for income in entry.earned.per_currency %}
-                        {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}
      
+                        {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}
      
                     {% endfor %}
                 {% endif %}
             
diff --git a/resources/views/reports/partials/exp-not-grouped.twig b/resources/views/reports/partials/exp-not-grouped.twig
index 85a5a667c8..ab4250937c 100644
--- a/resources/views/reports/partials/exp-not-grouped.twig
+++ b/resources/views/reports/partials/exp-not-grouped.twig
@@ -1,4 +1,3 @@
-
 
      
     
     
      {{ 'category'|_ }}{{ 'category'|_ }}
         {{ 'spent'|_ }}
         {{ 'earned'|_ }}
     
      
@@ -12,19 +11,19 @@
         
diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twig
index e068286fd1..67e9c080a2 100644
--- a/resources/views/reports/partials/top-transactions.twig
+++ b/resources/views/reports/partials/top-transactions.twig
@@ -17,7 +17,8 @@
             
-            
+            
     {% endfor %}
     
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 3a8f16d1ce..58a749477f 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -107,7 +107,9 @@
                                         
      
     
     
      
             {{ name }}
             
-                {% if amounts.spent.per_currency|length == 0%}
+                {% if amounts.spent.per_currency|length == 0 %}
                     {{ '0'|formatAmount }}
                 {% endif %}
                 {% for expense in amounts.spent.per_currency %}
-                    {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
+                    {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}
      
                 {% endfor %}
                   		
             
-                {% if amounts.earned.per_currency|length == 0%}
+                {% if amounts.earned.per_currency|length == 0 %}
                     {{ '0'|formatAmount }}
                 {% endif %}
                 {% for income in amounts.earned.per_currency %}
-                    {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}
      
+                    {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}
      
                 {% endfor %}
                   		
         
      
                 {{ transaction.date.formatLocalized(monthAndDayFormat) }}
             {{ transaction|transactionAmount }}{{ transaction|transactionAmount }}
         
      
                                             
      
                                                 {# show which transactions would match #}
-                                                
+                                                
 
                                                 {# actually execute rule #}
                                                 
 {% endblock %}
 {% block styles %}
-    
+    
     
     
 {% endblock %}
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 5eed6ff416..41d032f2d6 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -95,7 +95,7 @@
     
 {% endblock %}
 {% block styles %}
-    
+    
     
     
 {% endblock %}
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 08d8c4156e..e611b43801 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -10,25 +10,26 @@
     {% else %}
         {% for period,entries in clouds %}
             {% if entries|length > 0 %}
-            
      
-                
      
-                    
      
-                        
      
-                            
      
-                                {% if period == 'no-date' %}{{ 'without_date'|_ }}{% else %}{{ period }}{% endif %}
-                            
      
-                        
      
-                        
      
-                            
      
-                                {% for tagInfo in entries %}
-                                     {{ tagInfo.tag.tag }}
-                                {% endfor %}
-                            
      
+                
      
+                    
      
+                        
      
+                            
      
+                                
      
+                                    {% if period == 'no-date' %}{{ 'without_date'|_ }}{% else %}{{ period }}{% endif %}
+                                
      
+                            
      
+                            
      
+                                
      
+                                    {% for tagInfo in entries %}
+                                         {{ tagInfo.tag.tag }}
+                                    {% endfor %}
+                                
      
+                            
      
                         
      
                     
      
                 
      
-            
      
-                {% endif %}
+            {% endif %}
         {% endfor %}
         {#
 
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 3f5a81478d..c7820c6beb 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -29,22 +29,22 @@
                 
      
                     
                         {% if tag.description %}
-                        
-                            
-                            
-                        
+                            
+                                
+                                
+                            
                         {% endif %}
                         {% if tag.date %}
-                        
-                            
-                            
-                        
+                            
+                                
+                                
+                            
                         {% endif %}
                         
@@ -196,7 +196,7 @@
 
 {% endblock %}
 {% block styles %}
-    
+    
 {% endblock %}
 {% block scripts %}
     
      
-                                {{ trans('list.description') }}
-                            {{ tag.description }}
      
+                                    {{ trans('list.description') }}
+                                {{ tag.description }}
      
-                                {{ trans('list.date') }}
-                            
-                                {{ tag.date.formatLocalized(monthAndDayFormat) }}
-                            
      
+                                    {{ trans('list.date') }}
+                                
+                                    {{ tag.date.formatLocalized(monthAndDayFormat) }}
+                                
      
                             {{ trans('list.sum') }}