Various code clean up. [skip ci]

.gitignore

@@ -6,4 +6,4 @@ _development
 result.html
 test-import.sh
 test-import-report.txt
-public/google*.html
+public/google*.html

app/Console/Commands/Import.php

@@ -92,6 +92,7 @@ class Import extends Command
                 $this->error($error);
             }
         }
+
         return;
     }
 

app/Handlers/Events/ConnectTransactionToPiggyBank.php

@@ -37,7 +37,7 @@ class ConnectTransactionToPiggyBank
         $repository  = app(PiggyBankRepositoryInterface::class);
         $transaction = $event->transaction;
 
-        $piggyBank   = $repository->find($transaction['piggy_bank_id']);
+        $piggyBank = $repository->find($transaction['piggy_bank_id']);
 
         // valid piggy:
         if (is_null($piggyBank->id)) {

app/Handlers/Events/UserSaveIpAddress.php

@@ -13,7 +13,6 @@ namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\UserIsConfirmed;
 use FireflyIII\Events\UserRegistration;
-use FireflyIII\User;
 use Preferences;
 
 /**
@@ -32,20 +31,6 @@ class UserSaveIpAddress
         //
     }
 
-    /**
-     * Handle the event.
-     *
-     * @param  UserRegistration $event
-     *
-     * @return bool
-     */
-    public function saveFromRegistration(UserRegistration $event): bool
-    {
-        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
-
-        return true;
-    }
-
     /**
      * Handle the event.
      *
@@ -59,4 +44,18 @@ class UserSaveIpAddress
 
         return true;
     }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserRegistration $event
+     *
+     * @return bool
+     */
+    public function saveFromRegistration(UserRegistration $event): bool
+    {
+        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
+
+        return true;
+    }
 }

app/Helpers/Collection/BalanceLine.php

@@ -32,14 +32,12 @@ class BalanceLine
 
     /** @var BudgetModel */
     protected $budget;
-
-    /** @var  Carbon */
-    protected $startDate;
     /** @var  Carbon */
     protected $endDate;
-
     /** @var int */
     protected $role = self::ROLE_DEFAULTROLE;
+    /** @var  Carbon */
+    protected $startDate;
 
     /**
      *
@@ -90,6 +88,22 @@ class BalanceLine
         $this->budget = $budget;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * @param Carbon $endDate
+     */
+    public function setEndDate($endDate)
+    {
+        $this->endDate = $endDate;
+    }
+
     /**
      * @return int
      */
@@ -106,6 +120,22 @@ class BalanceLine
         $this->role = $role;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getStartDate()
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * @param Carbon $startDate
+     */
+    public function setStartDate($startDate)
+    {
+        $this->startDate = $startDate;
+    }
+
     /**
      * @return string
      */
@@ -127,39 +157,6 @@ class BalanceLine
         return '';
     }
 
-    /**
-     * @return Carbon
-     */
-    public function getStartDate()
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * @param Carbon $startDate
-     */
-    public function setStartDate($startDate)
-    {
-        $this->startDate = $startDate;
-    }
-
-    /**
-     * @return Carbon
-     */
-    public function getEndDate()
-    {
-        return $this->endDate;
-    }
-
-    /**
-     * @param Carbon $endDate
-     */
-    public function setEndDate($endDate)
-    {
-        $this->endDate = $endDate;
-    }
-
-
     /**
      * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
      * should have a "spent" value, which is the amount of money that has been spent

app/Helpers/Collection/Budget.php

@@ -47,6 +47,7 @@ class Budget
     public function addBudgetLine(BudgetLine $budgetLine): Budget
     {
         $this->budgetLines->push($budgetLine);
+
         return $this;
     }
 
@@ -59,6 +60,7 @@ class Budget
     {
         $add            = strval(round($add, 2));
         $this->budgeted = bcadd($this->budgeted, $add);
+
         return $this;
     }
 
@@ -71,6 +73,7 @@ class Budget
     {
         $add        = strval(round($add, 2));
         $this->left = bcadd($this->left, $add);
+
         return $this;
     }
 
@@ -83,6 +86,7 @@ class Budget
     {
         $add             = strval(round($add, 2));
         $this->overspent = bcadd($this->overspent, $add);
+
         return $this;
     }
 
@@ -95,6 +99,7 @@ class Budget
     {
         $add         = strval(round($add, 2));
         $this->spent = bcadd($this->spent, $add);
+
         return $this;
     }
 

app/Helpers/Collection/BudgetLine.php

@@ -51,6 +51,7 @@ class BudgetLine
     public function setBudget(BudgetModel $budget): BudgetLine
     {
         $this->budget = $budget;
+
         return $this;
     }
 
@@ -70,6 +71,7 @@ class BudgetLine
     public function setBudgeted(string $budgeted): BudgetLine
     {
         $this->budgeted = $budgeted;
+
         return $this;
     }
 
@@ -89,6 +91,7 @@ class BudgetLine
     public function setLeft(string $left): BudgetLine
     {
         $this->left = $left;
+
         return $this;
     }
 
@@ -108,6 +111,7 @@ class BudgetLine
     public function setOverspent(string $overspent): BudgetLine
     {
         $this->overspent = $overspent;
+
         return $this;
     }
 
@@ -127,6 +131,7 @@ class BudgetLine
     public function setRepetition(LimitRepetition $repetition): BudgetLine
     {
         $this->repetition = $repetition;
+
         return $this;
     }
 
@@ -146,6 +151,7 @@ class BudgetLine
     public function setSpent(string $spent): BudgetLine
     {
         $this->spent = $spent;
+
         return $this;
     }
 

app/Helpers/Csv/Importer.php

@@ -151,8 +151,8 @@ class Importer
 
         $transactionType = $this->getTransactionType(); // defaults to deposit
         $errors          = new MessageBag;
-        
+
-        $journal         = TransactionJournal::create(
+        $journal = TransactionJournal::create(
             [
                 'user_id'                 => Auth::user()->id,
                 'transaction_type_id'     => $transactionType->id,

app/Helpers/Report/BalanceReportHelper.php

@@ -262,6 +262,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     /**
      * @param Balance $balance
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     *
      * @return Balance
      */
     private function removeUnusedBudgets(Balance $balance): Balance

app/Http/Controllers/AttachmentController.php

@@ -93,10 +93,10 @@ class AttachmentController extends Controller
 
         if ($disk->exists($file)) {
 
-            $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
             $content = Crypt::decrypt($disk->get($file));
 
-            Log::debug('Send file to user', ['file' =>  $quoted, 'size' => strlen($content)]);
+            Log::debug('Send file to user', ['file' => $quoted, 'size' => strlen($content)]);
 
             return response($content, 200)
                 ->header('Content-Description', 'File Transfer')

app/Http/Controllers/ExportController.php

@@ -10,7 +10,6 @@
 declare(strict_types = 1);
 
 
-
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
@@ -18,7 +17,6 @@ use ExpandedForm;
 use FireflyIII\Crud\Account\AccountCrudInterface;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Export\Processor;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\ExportFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\ExportJob;

app/Http/Controllers/TransactionController.php

@@ -273,7 +273,7 @@ class TransactionController extends Controller
 
         // store the journal only, flash the rest.
         if ($doSplit) {
-            $journal = $repository->storeJournal($journalData);
+            $journal            = $repository->storeJournal($journalData);
             $journal->completed = false;
             $journal->save();
 

app/Import/Converter/BillName.php

@@ -36,6 +36,7 @@ class BillName extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Bill;
         }
 
@@ -48,6 +49,7 @@ class BillName extends BasicConverter implements ConverterInterface
             if (!is_null($bill->id)) {
                 Log::debug('Found bill by ID', ['id' => $bill->id]);
                 $this->setCertainty(100);
+
                 return $bill;
             }
         }
@@ -57,6 +59,7 @@ class BillName extends BasicConverter implements ConverterInterface
         if (!is_null($bill->id)) {
             Log::debug('Found bill by name ', ['id' => $bill->id]);
             $this->setCertainty(100);
+
             return $bill;
         }
 
@@ -66,7 +69,7 @@ class BillName extends BasicConverter implements ConverterInterface
                 'name'        => $value,
                 'match'       => $value,
                 'amount_min'  => 1,
-                'user'     => $this->user->id,
+                'user'        => $this->user->id,
                 'amount_max'  => 10,
                 'date'        => date('Ymd'),
                 'repeat_freq' => 'monthly',

app/Import/Converter/BudgetId.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Log;
@@ -36,6 +35,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
 
         if ($value === 0) {
             $this->setCertainty(0);
+
             return new Budget;
         }
 
@@ -58,6 +58,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
         if (!is_null($budget->id)) {
             Log::debug('Found budget by ID ', ['id' => $budget->id]);
             $this->setCertainty(100);
+
             return $budget;
         }
 

app/Import/Converter/BudgetName.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Log;
@@ -36,6 +35,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Budget;
         }
 
@@ -48,6 +48,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
             if (!is_null($budget->id)) {
                 Log::debug('Found budget by ID', ['id' => $budget->id]);
                 $this->setCertainty(100);
+
                 return $budget;
             }
         }
@@ -57,14 +58,15 @@ class BudgetName extends BasicConverter implements ConverterInterface
         if (!is_null($budget->id)) {
             Log::debug('Found budget by name ', ['id' => $budget->id]);
             $this->setCertainty(100);
+
             return $budget;
         }
 
         // create new budget. Use a lot of made up values.
         $budget = $repository->store(
             [
-                'name'        => $value,
+                'name' => $value,
-                'user'     => $this->user->id,
+                'user' => $this->user->id,
             ]
         );
         $this->setCertainty(100);

app/Import/Converter/CategoryId.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Log;
@@ -36,6 +35,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
 
         if ($value === 0) {
             $this->setCertainty(0);
+
             return new Category;
         }
 
@@ -48,6 +48,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
             if (!is_null($category->id)) {
                 Log::debug('Found category by ID', ['id' => $category->id]);
                 $this->setCertainty(100);
+
                 return $category;
             }
         }
@@ -57,6 +58,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
         if (!is_null($category->id)) {
             Log::debug('Found category by ID ', ['id' => $category->id]);
             $this->setCertainty(100);
+
             return $category;
         }
 

app/Import/Converter/CategoryName.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Log;
@@ -36,6 +35,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Category;
         }
 
@@ -48,6 +48,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
             if (!is_null($category->id)) {
                 Log::debug('Found category by ID', ['id' => $category->id]);
                 $this->setCertainty(100);
+
                 return $category;
             }
         }
@@ -57,13 +58,14 @@ class CategoryName extends BasicConverter implements ConverterInterface
         if (!is_null($category->id)) {
             Log::debug('Found category by name ', ['id' => $category->id]);
             $this->setCertainty(100);
+
             return $category;
         }
 
         // create new category. Use a lot of made up values.
         $category = $repository->store(
             [
-                'name'    => $value,
+                'name' => $value,
                 'user' => $this->user->id,
             ]
         );

app/Import/Converter/ConverterInterface.php

@@ -26,16 +26,16 @@ interface ConverterInterface
      */
     public function convert($value);
 
-    /**
-     * @param array $config
-     */
-    public function setConfig(array $config);
-
     /**
      * @return int
      */
     public function getCertainty(): int;
 
+    /**
+     * @param array $config
+     */
+    public function setConfig(array $config);
+
     /**
      * @param bool $doMap
      */

app/Import/Converter/CurrencyCode.php

@@ -41,6 +41,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
             if (!is_null($currency->id)) {
                 Log::debug('Found currency by ID', ['id' => $currency->id]);
                 $this->setCertainty(100);
+
                 return $currency;
             }
         }
@@ -50,6 +51,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
         if (!is_null($currency->id)) {
             Log::debug('Found currency by code', ['id' => $currency->id]);
             $this->setCertainty(100);
+
             return $currency;
         }
         $currency = $repository->store(

app/Import/Converter/CurrencyId.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Log;
@@ -36,6 +35,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
 
         if ($value === 0) {
             $this->setCertainty(0);
+
             return new TransactionCurrency;
         }
 
@@ -48,6 +48,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
             if (!is_null($currency->id)) {
                 Log::debug('Found currency by ID', ['id' => $currency->id]);
                 $this->setCertainty(100);
+
                 return $currency;
             }
         }
@@ -57,6 +58,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
         if (!is_null($currency->id)) {
             Log::debug('Found currency by ID ', ['id' => $currency->id]);
             $this->setCertainty(100);
+
             return $currency;
         }
         $this->setCertainty(0);

app/Import/Converter/CurrencyName.php

@@ -35,6 +35,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new TransactionCurrency;
         }
 
@@ -47,6 +48,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
             if (!is_null($currency->id)) {
                 Log::debug('Found currency by ID', ['id' => $currency->id]);
                 $this->setCertainty(100);
+
                 return $currency;
             }
         }
@@ -56,6 +58,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
         if (!is_null($currency->id)) {
             Log::debug('Found currency by name ', ['id' => $currency->id]);
             $this->setCertainty(100);
+
             return $currency;
         }
 

app/Import/Converter/CurrencySymbol.php

@@ -35,6 +35,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new TransactionCurrency;
         }
 
@@ -47,6 +48,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
             if (!is_null($currency->id)) {
                 Log::debug('Found currency by ID', ['id' => $currency->id]);
                 $this->setCertainty(100);
+
                 return $currency;
             }
         }
@@ -56,6 +58,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
         if (!is_null($currency->id)) {
             Log::debug('Found currency by symbol ', ['id' => $currency->id]);
             $this->setCertainty(100);
+
             return $currency;
         }
 

app/Import/Converter/Date.php

@@ -40,10 +40,12 @@ class Date extends BasicConverter implements ConverterInterface
             Log::info($e->getMessage());
             Log::info('Cannot convert this string using the given format.', ['value' => $value, 'format' => $this->config['date-format']]);
             $this->setCertainty(0);
+
             return new Carbon;
         }
         Log::debug('Converted date', ['converted' => $date->toAtomString()]);
         $this->setCertainty(100);
+
         return $date;
     }
 }

app/Import/Converter/INGDebetCredit.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Converter;
 
-use FireflyIII\Exceptions\FireflyException;
 use Log;
 
 /**
@@ -34,11 +33,13 @@ class INGDebetCredit extends BasicConverter implements ConverterInterface
         if ($value === 'Af') {
             Log::debug('Return -1');
             $this->setCertainty(100);
+
             return -1;
         }
 
         $this->setCertainty(100);
         Log::debug('Return 1');
+
         return 1;
 
     }

app/Import/Converter/OpposingAccountIban.php

@@ -35,6 +35,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Account;
         }
 
@@ -48,6 +49,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
             if (!is_null($account->id)) {
                 Log::debug('Found account by ID', ['id' => $account->id]);
                 $this->setCertainty(100);
+
                 return $account;
             }
         }

app/Import/Converter/OpposingAccountName.php

@@ -35,6 +35,7 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Account;
         }
 

app/Import/Converter/OpposingAccountNumber.php

@@ -12,7 +12,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Import\Converter;
 
 use FireflyIII\Crud\Account\AccountCrudInterface;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use Log;
@@ -37,6 +36,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
 
         if (strlen($value) === 0) {
             $this->setCertainty(0);
+
             return new Account;
         }
 
@@ -50,6 +50,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
             if (!is_null($account->id)) {
                 Log::debug('Found account by ID', ['id' => $account->id]);
                 $this->setCertainty(100);
+
                 return $account;
             }
         }
@@ -59,6 +60,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
         if (!is_null($account->id)) {
             Log::debug('Found account by number', ['id' => $account->id]);
             $this->setCertainty(50);
+
             return $account;
         }
 
@@ -79,6 +81,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
              'virtualBalance' => 0, 'accountNumber' => $value, 'active' => true]
         );
         $this->setCertainty(100);
+
         return $account;
 
     }

app/Import/ImportProcedure.php

@@ -77,4 +77,4 @@ class ImportProcedure
         return $result;
     }
 
-}
+}

app/Import/ImportStorage.php

@@ -330,8 +330,8 @@ class ImportStorage
     {
         if ($entry->valid === false) {
             Log::warning(sprintf('Cannot import row %d, because the entry is not valid.', $index));
-            $errors    = join(', ', $entry->errors->all());
+            $errors                     = join(', ', $entry->errors->all());
-            $errorText = sprintf('Row #%d: ' . $errors, $index);
+            $errorText                  = sprintf('Row #%d: ' . $errors, $index);
             $extendedStatus             = $this->job->extended_status;
             $extendedStatus['errors'][] = $errorText;
             $this->job->extended_status = $extendedStatus;
@@ -342,7 +342,7 @@ class ImportStorage
         $alreadyImported = $this->alreadyImported($entry->hash);
         if (!is_null($alreadyImported->id)) {
             Log::warning(sprintf('Cannot import row %d, because it has already been imported (journal #%d).', $index, $alreadyImported->id));
-            $errorText = trans(
+            $errorText                  = trans(
                 'firefly.import_double',
                 ['row' => $index, 'link' => route('transactions.show', [$alreadyImported->id]), 'description' => $alreadyImported->description]
             );

app/Import/ImportValidator.php

@@ -29,6 +29,8 @@ use Log;
  */
 class ImportValidator
 {
+    /** @var  ImportJob */
+    public $job;
     /** @var  Account */
     protected $defaultImportAccount;
     /** @var Collection */
@@ -36,19 +38,6 @@ class ImportValidator
     /** @var  User */
     protected $user;
 
-    /** @var  ImportJob */
-    public $job;
-
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job)
-    {
-        $this->job = $job;
-    }
-
-
-
     /**
      * ImportValidator constructor.
      *
@@ -100,6 +89,14 @@ class ImportValidator
         $this->defaultImportAccount = $defaultImportAccount;
     }
 
+    /**
+     * @param ImportJob $job
+     */
+    public function setJob(ImportJob $job)
+    {
+        $this->job = $job;
+    }
+
     /**
      * @param User $user
      */

app/Import/Importer/ImporterInterface.php

@@ -10,6 +10,7 @@
 declare(strict_types = 1);
 
 namespace FireflyIII\Import\Importer;
+
 use FireflyIII\Models\ImportJob;
 use Illuminate\Support\Collection;
 

app/Import/Mapper/OpposingAccountIbans.php

@@ -29,13 +29,14 @@ class OpposingAccountIbans implements MapperInterface
     public function getMap(): array
     {
         /** @var AccountCrudInterface $crud */
-        $crud = app(AccountCrudInterface::class);
+        $crud    = app(AccountCrudInterface::class);
-        $set  = $crud->getAccountsByType(
+        $set     = $crud->getAccountsByType(
             [
                 AccountType::DEFAULT, AccountType::ASSET,
                 AccountType::EXPENSE, AccountType::BENEFICIARY,
-                AccountType::REVENUE
+                AccountType::REVENUE,
-            ]);
+            ]
+        );
         $topList = [];
         $list    = [];
 

app/Import/Mapper/OpposingAccounts.php

@@ -34,8 +34,9 @@ class OpposingAccounts implements MapperInterface
             [
                 AccountType::DEFAULT, AccountType::ASSET,
                 AccountType::EXPENSE, AccountType::BENEFICIARY,
-                AccountType::REVENUE
+                AccountType::REVENUE,
-            ]);
+            ]
+        );
         $list = [];
 
         /** @var Account $account */

app/Import/Setup/SetupInterface.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import\Setup;
 
-use FireflyIII\Import\Role\Map;
 use FireflyIII\Models\ImportJob;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\FileBag;
@@ -46,14 +45,6 @@ interface SetupInterface
      */
     public function getDataForSettings(): array;
 
-    /**
-     * Store the settings filled in by the user, if applicable.
-     * 
-     * @param Request $request
-     *
-     */
-    public function storeSettings(Request $request);
-
     /**
      * This method returns the name of the view that will be shown to the user to further configure
      * the import job.
@@ -82,4 +73,12 @@ interface SetupInterface
      *
      */
     public function setJob(ImportJob $job);
+
+    /**
+     * Store the settings filled in by the user, if applicable.
+     *
+     * @param Request $request
+     *
+     */
+    public function storeSettings(Request $request);
 }

app/Import/Specifics/AbnAmroDescription.php

@@ -133,7 +133,7 @@ class AbnAmroDescription implements SpecificInterface
                             break;
                         case 'NAAM':
                             $this->row[8] = $value;
-                            $name                                = $value;
+                            $name         = $value;
                             break;
                         case 'KENMERK':
                             $reference = $value;

app/Import/Specifics/SpecificInterface.php

@@ -21,12 +21,12 @@ interface SpecificInterface
     /**
      * @return string
      */
-    public static function getName(): string;
+    public static function getDescription(): string;
 
     /**
      * @return string
      */
-    public static function getDescription(): string;
+    public static function getName(): string;
 
     /**
      * @param array $row

app/Models/TransactionJournalMeta.php

@@ -34,6 +34,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @mixin \Eloquent
  * @property string                                     $hash
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereHash($value)
+ * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
  */
 class TransactionJournalMeta extends Model
 {

app/Providers/CrudServiceProvider.php

@@ -12,10 +12,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Providers;
 
 use FireflyIII\Exceptions\FireflyException;
-use Illuminate\Auth\AuthManager;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
-use Log;
 
 /**
  * Class CrudServiceProvider
@@ -58,6 +56,7 @@ class CrudServiceProvider extends ServiceProvider
                 if (!isset($arguments[0]) && !$app->auth->check()) {
                     throw new FireflyException('There is no user present.');
                 }
+
                 return app('FireflyIII\Crud\Account\AccountCrud', $arguments);
             }
         );

app/Repositories/Account/AccountRepository.php

@@ -144,7 +144,6 @@ class AccountRepository implements AccountRepositoryInterface
         $ids                                   = $query->get(['transaction_journals.id'])->pluck('id')->toArray();
 
 
-
         // that should do it:
         $sum = $this->user->transactions()
                           ->whereIn('transaction_journal_id', $ids)

app/Repositories/Tag/TagRepositoryInterface.php

@@ -42,13 +42,6 @@ interface TagRepositoryInterface
      */
     public function destroy(Tag $tag): bool;
 
-    /**
-     * @param string $tag
-     *
-     * @return Tag
-     */
-    public function findByTag(string $tag) : Tag;
-
     /**
      * @param int $tagId
      *
@@ -56,6 +49,13 @@ interface TagRepositoryInterface
      */
     public function find(int $tagId) : Tag;
 
+    /**
+     * @param string $tag
+     *
+     * @return Tag
+     */
+    public function findByTag(string $tag) : Tag;
+
     /**
      * This method returns all the user's tags.
      *

app/Rules/Actions/AddTag.php

@@ -12,7 +12,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Rules\Actions;
 
 
-use Auth;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;

app/Rules/Actions/RemoveTag.php

@@ -12,7 +12,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Rules\Actions;
 
 
-use Auth;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;

app/Rules/Actions/SetCategory.php

@@ -12,7 +12,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Rules\Actions;
 
 
-use Auth;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;

app/Support/Twig/Rule.php

@@ -23,6 +23,26 @@ use Twig_SimpleFunction;
 class Rule extends Twig_Extension
 {
 
+    /**
+     * @return Twig_SimpleFunction
+     */
+    public function allActionTriggers(): Twig_SimpleFunction
+    {
+        return new Twig_SimpleFunction(
+            'allRuleActions', function () {
+            // array of valid values for actions
+            $ruleActions     = array_keys(Config::get('firefly.rule-actions'));
+            $possibleActions = [];
+            foreach ($ruleActions as $key) {
+                $possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
+            }
+            unset($key, $ruleActions);
+
+            return $possibleActions;
+        }
+        );
+    }
+
     /**
      * @return Twig_SimpleFunction
      */
@@ -61,26 +81,6 @@ class Rule extends Twig_Extension
 
     }
 
-    /**
-     * @return Twig_SimpleFunction
-     */
-    public function allActionTriggers(): Twig_SimpleFunction
-    {
-        return new Twig_SimpleFunction(
-            'allRuleActions', function () {
-            // array of valid values for actions
-            $ruleActions     = array_keys(Config::get('firefly.rule-actions'));
-            $possibleActions = [];
-            foreach ($ruleActions as $key) {
-                $possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
-            }
-            unset($key, $ruleActions);
-
-            return $possibleActions;
-        }
-        );
-    }
-
     /**
      * @return array
      */

app/User.php

@@ -54,9 +54,9 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlocked($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlockedCode($value)
  * @mixin \Eloquent
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\ImportJob[] $importjobs
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\ImportJob[]          $importjobs
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[]          $piggyBanks
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[]        $transactions
  */
 class User extends Authenticatable
 {
@@ -148,14 +148,6 @@ class User extends Authenticatable
         return $this->hasMany('FireflyIII\Models\ExportJob');
     }
 
-    /**
-     * @return HasMany
-     */
-    public function importjobs(): HasMany
-    {
-        return $this->hasMany('FireflyIII\Models\ImportJob');
-    }
-
     /**
      * Checks if the user has a role by its name.
      *
@@ -177,6 +169,14 @@ class User extends Authenticatable
         return false;
     }
 
+    /**
+     * @return HasMany
+     */
+    public function importjobs(): HasMany
+    {
+        return $this->hasMany('FireflyIII\Models\ImportJob');
+    }
+
     /**
      * @return HasManyThrough
      */

config/auth.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     'allow_register' => true,

config/broadcasting.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*
@@ -32,17 +31,17 @@ return [
     'connections' => [
 
         'pusher' => [
-            'driver' => 'pusher',
+            'driver'  => 'pusher',
-            'key' => env('PUSHER_KEY'),
+            'key'     => env('PUSHER_KEY'),
-            'secret' => env('PUSHER_SECRET'),
+            'secret'  => env('PUSHER_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
+            'app_id'  => env('PUSHER_APP_ID'),
             'options' => [
                 //
             ],
         ],
 
         'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
             'connection' => 'default',
         ],
 

config/cache.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*
@@ -40,8 +39,8 @@ return [
         ],
 
         'database' => [
-            'driver' => 'database',
+            'driver'     => 'database',
-            'table'  => 'cache',
+            'table'      => 'cache',
             'connection' => null,
         ],
 
@@ -60,7 +59,7 @@ return [
         ],
 
         'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
             'connection' => 'default',
         ],
 

config/database.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*

config/entrust.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 /**
  * This file is part of Entrust,
  * a role & permission management solution for Laravel.

config/filesystems.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*

config/mail.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*

config/session.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*

config/twigbridge.php

@@ -2,9 +2,8 @@
 declare(strict_types = 1);
 
 
-
 return [
-    'twig'       => [
+    'twig' => [
         /*
         |--------------------------------------------------------------------------
         | Extension
@@ -135,8 +134,8 @@ return [
         'facades'   => [
             'Breadcrumbs'  => [
                 'is_safe' => [
-                    'renderIfExists'
+                    'renderIfExists',
-                ]
+                ],
             ],
             'Session',
             'Route',
@@ -148,13 +147,13 @@ return [
             'ExpandedForm' => [
                 'is_safe' => [
                     'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location',
-                    'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 
+                    'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall',
-                ]
+                ],
             ],
             'Form'         => [
                 'is_safe' => [
-                    'input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file'
+                    'input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file',
-                ]
+                ],
             ],
         ],
 
@@ -190,7 +189,7 @@ return [
             'elixir',
             'head',
             'last',
-            'old'
+            'old',
         ],
 
         /*
@@ -222,5 +221,5 @@ return [
         |
         */
         'filters'   => [],
-    ]
+    ],
 ];

config/upgrade.php

@@ -27,6 +27,6 @@ return [
                      'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
         '3.8.0'   => 'This version of Firefly III requires PHP 7.0.',
         '3.8.1'   => 'This version of Firefly III requires PHP 7.0.',
-        '3.10' => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10'
+        '3.10'    => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10',
     ],
 ];

config/view.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 
 
-
 return [
 
     /*