Various code cleanup.

2025-10-12 15:35:15 +00:00 · 2017-12-29 09:05:35 +01:00
parent cf66ae61e1
commit 3815f9836f
135 changed files with 1021 additions and 973 deletions
--- 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()
+                )
            );
        }

--- 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;
    }
--- 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;
--- 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, '');
    }
 }
--- 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
    {
--- 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();

--- 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;

 /**
--- 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]);
--- 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!
--- 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]);

--- 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)
    {
--- 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'));
--- 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]);

--- 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]);

--- 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...');
--- 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
     */
--- 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);
    }
 }
--- 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;

 /**
--- 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)) {
--- 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) {
--- 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;
--- 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;
--- 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
     */
--- 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
    {
--- 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.');
--- 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);
        }
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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;
            }
--- 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)
--- 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
--- 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)
--- 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();

--- 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
     */
--- 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
     *
--- 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
     */
--- 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 = '';
--- 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
    {
--- 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;
--- 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
    {
--- 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
    {
--- 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
--- 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.
     *
--- 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;