Various code cleanup [skip ci]

app/Api/V1/Controllers/BillController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\BillRequest;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Transformers\BillTransformer;

app/Api/V1/Controllers/Controller.php

@@ -34,6 +34,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class Controller.
+ *
  * @codeCoverageIgnore
  */
 class Controller extends BaseController
@@ -70,7 +71,7 @@ class Controller extends BaseController
         $return = '?';
         $params = [];
         foreach ($this->parameters as $key => $value) {
-            if($key === 'page') {
+            if ($key === 'page') {
                 continue;
             }
             if ($value instanceof Carbon) {

app/Api/V1/Controllers/TransactionController.php

@@ -37,7 +37,6 @@ use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 use Preferences;

app/Api/V1/Requests/Request.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
+
 /**
  * Class Request.
  */

app/Exceptions/FireflyException.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Exceptions;
 
 use Exception;
+
 /**
  * Class FireflyException.
  */

app/Handlers/Events/StoredJournalEventHandler.php

@@ -30,7 +30,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
 use FireflyIII\Support\Events\BillScanner;
 use FireflyIII\TransactionRules\Processor;
-use Log;
 
 /**
  * @codeCoverageIgnore

app/Helpers/Chart/MetaPieChart.php

@@ -282,6 +282,7 @@ class MetaPieChart implements MetaPieChartInterface
             $collector->withCategoryInformation();
             $collector->withBudgetInformation();
         }
+
         // @codeCoverageIgnoreEnd
 
         return $collector->getJournals();

app/Helpers/Collector/JournalCollectorInterface.php

@@ -42,13 +42,6 @@ interface JournalCollectorInterface
      */
     public function addFilter(string $filter): JournalCollectorInterface;
 
-    /**
-     * @param Collection $journals
-     *
-     * @return JournalCollectorInterface
-     */
-    public function setJournals(Collection $journals): JournalCollectorInterface;
-
     /**
      * @param string $amount
      *
@@ -153,6 +146,13 @@ interface JournalCollectorInterface
      */
     public function setCategory(Category $category): JournalCollectorInterface;
 
+    /**
+     * @param Collection $journals
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setJournals(Collection $journals): JournalCollectorInterface;
+
     /**
      * @param int $limit
      *

app/Http/Controllers/DebugController.php

@@ -109,7 +109,7 @@ class DebugController extends Controller
             'debug',
             compact(
                 'phpVersion',
-                'extensions','localeAttempts',
+                'extensions', 'localeAttempts',
                 'carbon',
                 'appEnv',
                 'appDebug',

app/Http/Controllers/ProfileController.php

@@ -94,21 +94,9 @@ class ProfileController extends Controller
         return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
-    /**
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function deleteCode()
-    {
-        Preferences::delete('twoFactorAuthEnabled');
-        Preferences::delete('twoFactorAuthSecret');
-        Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled')));
-        Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it')));
-
-        return redirect(route('profile.index'));
-    }
-
     /**
      * View that generates a 2FA code for the user.
+     *
      * @return View
      */
     public function code()
@@ -121,23 +109,6 @@ class ProfileController extends Controller
         return view('profile.code', compact('image'));
     }
 
-    /**
-     * @param TokenFormRequest $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
-     */
-    public function postCode(TokenFormRequest $request)
-    {
-        Preferences::set('twoFactorAuthEnabled', 1);
-        Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret'));
-
-        Session::flash('success', strval(trans('firefly.saved_preferences')));
-        Preferences::mark();
-
-        return redirect(route('profile.index'));
-    }
-
     /**
      * @param UserRepositoryInterface $repository
      * @param string                  $token
@@ -185,6 +156,19 @@ class ProfileController extends Controller
         return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
+    /**
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function deleteCode()
+    {
+        Preferences::delete('twoFactorAuthEnabled');
+        Preferences::delete('twoFactorAuthSecret');
+        Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled')));
+        Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it')));
+
+        return redirect(route('profile.index'));
+    }
+
     /**
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
@@ -296,6 +280,23 @@ class ProfileController extends Controller
         return redirect(route('profile.index'));
     }
 
+    /**
+     * @param TokenFormRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
+     */
+    public function postCode(TokenFormRequest $request)
+    {
+        Preferences::set('twoFactorAuthEnabled', 1);
+        Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret'));
+
+        Session::flash('success', strval(trans('firefly.saved_preferences')));
+        Preferences::mark();
+
+        return redirect(route('profile.index'));
+    }
+
     /**
      * @param UserRepositoryInterface  $repository
      * @param DeleteAccountFormRequest $request

app/Http/Controllers/RuleGroupController.php

@@ -189,6 +189,7 @@ class RuleGroupController extends Controller
     {
         // does the user have shared accounts?
         $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        // todo could be removed?
         $accountList     = ExpandedForm::makeSelectList($accounts);
         $checkedAccounts = array_keys($accountList);
         $first           = session('first')->format('Y-m-d');

app/Http/Controllers/Transaction/BulkController.php

@@ -168,7 +168,7 @@ class BulkController extends Controller
                     }
                     if ($ignoreTags === false) {
                         Log::debug(sprintf('Set tags to %s', $request->string('budget_id')));
-                        $repository->updateTags($journal,['tags' =>  explode(',', $request->string('tags'))]);
+                        $repository->updateTags($journal, ['tags' => explode(',', $request->string('tags'))]);
                     }
                     // update tags if not told to ignore (and is withdrawal)
                 }

app/Http/Kernel.php

@@ -67,7 +67,7 @@ class Kernel extends HttpKernel
             TrimStrings::class,
             ConvertEmptyStringsToNull::class,
             TrustProxies::class,
-            Installer::class
+            Installer::class,
         ];
 
     /**

app/Http/Middleware/Installer.php

@@ -26,13 +26,14 @@ class Installer
      */
     public function handle($request, Closure $next)
     {
-        if(env('APP_ENV') === 'testing') {
+        if (env('APP_ENV') === 'testing') {
             return $next($request);
         }
         $url    = $request->url();
         $strpos = stripos($url, '/install');
         if (!($strpos === false)) {
             Log::debug(sprintf('URL is %s, will NOT run installer middleware', $url));
+
             return $next($request);
         }
         Log::debug(sprintf('URL is %s, will run installer middleware', $url));
@@ -59,13 +60,16 @@ class Installer
         $configVersion = intval(config('firefly.db_version'));
         $dbVersion     = intval(FireflyConfig::getFresh('db_version', 1)->data);
         if ($configVersion > $dbVersion) {
-            Log::warning(sprintf(
+            Log::warning(
+                sprintf(
                     'The current installed version (%d) is older than the required version (%d). Redirect to migrate routine.', $dbVersion, $configVersion
-            ));
+                )
+            );
 
             // redirect to migrate routine:
             return response()->redirectTo(route('installer.index'));
         }
+
         return $next($request);
     }
 

app/Import/Configuration/BunqConfigurator.php

@@ -186,6 +186,7 @@ class BunqConfigurator implements ConfiguratorInterface
                 return false;
             case 'initial':
                 Log::debug('isJobConfigured returns true');
+
                 return true;
                 break;
             default:

app/Models/Account.php

@@ -22,7 +22,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
-use Carbon\Carbon;
 use Crypt;
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Contracts\Encryption\DecryptException;

app/Models/ImportJob.php

@@ -32,6 +32,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ImportJob.
+ *
  * @property User $user
  */
 class ImportJob extends Model

app/Models/PiggyBank.php

@@ -90,6 +90,7 @@ class PiggyBank extends Model
 
     /**
      * Grabs the PiggyBankRepetition that's currently relevant / active.
+     *
      * @deprecated
      * @returns PiggyBankRepetition
      */
@@ -153,6 +154,7 @@ class PiggyBank extends Model
 
     /**
      * @param Carbon $date
+     *
      * @deprecated
      * @return string
      */

app/Models/PiggyBankEvent.php

@@ -26,6 +26,7 @@ use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class PiggyBankEvent.
+ *
  * @property $piggyBank
  */
 class PiggyBankEvent extends Model

app/Models/Preference.php

@@ -31,6 +31,7 @@ use Log;
 
 /**
  * Class Preference.
+ *
  * @property mixed $data
  */
 class Preference extends Model

app/Models/Transaction.php

@@ -91,7 +91,7 @@ class Transaction extends Model
      */
     protected $fillable
         = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier', 'transaction_currency_id', 'foreign_currency_id',
-           'foreign_amount','reconciled'];
+           'foreign_amount', 'reconciled'];
     /**
      * @var array
      */

app/Providers/EventServiceProvider.php

@@ -24,15 +24,10 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedVersionCheckStatus;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Log;
 
 /**
  * Class EventServiceProvider.

app/Providers/FireflyServiceProvider.php

@@ -46,7 +46,6 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepository;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepository;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Services\Password\PwndVerifier;
 use FireflyIII\Services\Password\PwndVerifierV2;
 use FireflyIII\Services\Password\Verifier;
 use FireflyIII\Support\Amount;

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -73,21 +73,13 @@ interface BudgetRepositoryInterface
      * Find a budget.
      *
      * @param int $budgetId
+     *
      * @deprecated
      *
      * @return Budget
      */
     public function find(int $budgetId): Budget;
 
-    /**
-     * Find a budget or return NULL
-     *
-     * @param int $budgetId
-     *
-     * @return Budget|null
-     */
-    public function findNull(int $budgetId): ?Budget;
-
     /**
      * Find a budget.
      *
@@ -97,6 +89,15 @@ interface BudgetRepositoryInterface
      */
     public function findByName(string $name): ?Budget;
 
+    /**
+     * Find a budget or return NULL
+     *
+     * @param int $budgetId
+     *
+     * @return Budget|null
+     */
+    public function findNull(int $budgetId): ?Budget;
+
     /**
      * This method returns the oldest journal or transaction date known to this budget.
      * Will cache result.

app/Repositories/Category/CategoryRepositoryInterface.php

@@ -53,20 +53,12 @@ interface CategoryRepositoryInterface
      * Find a category.
      *
      * @param int $categoryId
+     *
      * @deprecated
      * @return Category
      */
     public function find(int $categoryId): Category;
 
-    /**
-     * Find a category or return NULL
-     *
-     * @param int $categoryId
-     *
-     * @return Category|null
-     */
-    public function findNull(int $categoryId): ?Category;
-
     /**
      * Find a category.
      *
@@ -76,6 +68,15 @@ interface CategoryRepositoryInterface
      */
     public function findByName(string $name): ?Category;
 
+    /**
+     * Find a category or return NULL
+     *
+     * @param int $categoryId
+     *
+     * @return Category|null
+     */
+    public function findNull(int $categoryId): ?Category;
+
     /**
      * @param Category $category
      *

app/Rules/BelongsUser.php

@@ -2,7 +2,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * BelongsUser.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -61,6 +60,7 @@ class BelongsUser implements Rule
     /**
      * Determine if the validation rule passes.
      * TODO use repositories?
+     *
      * @param  string $attribute
      * @param  mixed  $value
      *

app/Rules/ValidTransactions.php

@@ -2,7 +2,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * ValidTransactions.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -75,10 +74,12 @@ class ValidTransactions implements Rule
                                 ->where('accounts.user_id', $userId)->count();
             if ($count === 0) {
                 Log::debug(sprintf('Count for transaction #%d and user #%d is zero! Return FALSE', $transactionId, $userId));
+
                 return false;
             }
         }
         Log::debug('Return true!');
+
         return true;
     }
 }

app/Services/Bunq/Request/DeviceSessionRequest.php

@@ -28,7 +28,6 @@ use FireflyIII\Services\Bunq\Object\UserCompany;
 use FireflyIII\Services\Bunq\Object\UserPerson;
 use FireflyIII\Services\Bunq\Token\InstallationToken;
 use FireflyIII\Services\Bunq\Token\SessionToken;
-use Log;
 
 /**
  * Class DeviceSessionRequest.

app/Services/Internal/Destroy/AccountDestroyService.php

@@ -63,7 +63,7 @@ class AccountDestroyService
         try {
             $account->delete();
         } catch (Exception $e) { // @codeCoverageIgnore
-            Log::error(sprintf('Could not delete account: %s',$e->getMessage())); // @codeCoverageIgnore
+            Log::error(sprintf('Could not delete account: %s', $e->getMessage())); // @codeCoverageIgnore
         }
 
         return true;

app/Services/Internal/Destroy/BillDestroyService.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Services\Internal\Destroy;
 use Exception;
 use FireflyIII\Models\Bill;
 use Log;
+
 /**
  * @codeCoverageIgnore
  * Class BillDestroyService
@@ -40,7 +41,7 @@ class BillDestroyService
         try {
             $bill->delete();
         } catch (Exception $e) { // @codeCoverageIgnore
-            Log::error(sprintf('Could not delete bill: %s',$e->getMessage())); // @codeCoverageIgnore
+            Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore
         }
     }
 

app/Services/Internal/Destroy/JournalDestroyService.php

@@ -56,7 +56,7 @@ class JournalDestroyService
             }
             $journal->delete();
         } catch (Exception $e) {
-            Log::error(sprintf('Could not delete bill: %s',$e->getMessage())); // @codeCoverageIgnore
+            Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore
         }
 
         return;

app/Services/Internal/Support/AccountServiceTrait.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Internal\Support;
 
-use Exception;
 use FireflyIII\Factory\AccountFactory;
 use FireflyIII\Factory\AccountMetaFactory;
 use FireflyIII\Factory\TransactionFactory;
@@ -255,6 +254,7 @@ trait AccountServiceTrait
 
             return true;
         }
+
         return true; // @codeCoverageIgnore
     }
 

app/Services/Internal/Support/BillServiceTrait.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Services\Internal\Support;
+
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Note;
 

app/Services/Internal/Support/TransactionServiceTrait.php

@@ -217,6 +217,7 @@ trait TransactionServiceTrait
     {
         if (is_null($budget)) {
             $transaction->budgets()->sync([]);
+
             return;
         }
         $transaction->budgets()->sync([$budget->id]);
@@ -233,6 +234,7 @@ trait TransactionServiceTrait
     {
         if (is_null($category)) {
             $transaction->categories()->sync([]);
+
             return;
         }
         $transaction->categories()->sync([$category->id]);
@@ -260,6 +262,7 @@ trait TransactionServiceTrait
         if (is_null($currency)) {
             $transaction->foreign_currency_id = null;
             $transaction->save();
+
             return;
         }
         $transaction->foreign_currency_id = $currency->id;

app/Services/Internal/Update/AccountUpdateService.php

@@ -23,14 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Internal\Update;
 
-use Exception;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Factory\AccountMetaFactory;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountMeta;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Services\Internal\Support\AccountServiceTrait;
-use Log;
 
 /**
  * Class AccountUpdateService
@@ -40,7 +34,6 @@ class AccountUpdateService
     use AccountServiceTrait;
 
 
-
     /**
      * Update account data.
      *

app/Support/Twig/Extension/Transaction.php

@@ -225,6 +225,7 @@ class Transaction extends Twig_Extension
 
     /**
      * TODO improve code
+     *
      * @param TransactionModel $transaction
      *
      * @return string

app/Support/Twig/General.php

@@ -24,10 +24,8 @@ namespace FireflyIII\Support\Twig;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\TransactionJournal;
 use League\CommonMark\CommonMarkConverter;
 use Route;
-use Steam;
 use Twig_Extension;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;

app/TransactionRules/Actions/ClearBudget.php

@@ -59,7 +59,7 @@ class ClearBudget implements ActionInterface
 
         // also remove categories from transactions:
         /** @var Transaction $transaction */
-        foreach($journal->transactions as $transaction) {
+        foreach ($journal->transactions as $transaction) {
             $transaction->budgets()->detach();
         }
 

app/TransactionRules/Actions/ClearCategory.php

@@ -59,7 +59,7 @@ class ClearCategory implements ActionInterface
 
         // also remove categories from transactions:
         /** @var Transaction $transaction */
-        foreach($journal->transactions as $transaction) {
+        foreach ($journal->transactions as $transaction) {
             $transaction->categories()->detach();
         }
 

app/Transformers/AccountTransformer.php

@@ -25,7 +25,6 @@ namespace FireflyIII\Transformers;
 
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;

app/Transformers/BillTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Note;

app/Transformers/BudgetTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Budget;
 use Illuminate\Support\Collection;

app/Transformers/CategoryTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Category;
 use Illuminate\Support\Collection;

app/Transformers/JournalMetaTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Support\Collection;

app/Transformers/PiggyBankEventTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;

app/Transformers/TagTransformer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Transformers;
 
 
-use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Tag;
 use League\Fractal\Resource\Collection as FractalCollection;

app/Transformers/TransactionTransformer.php

@@ -171,7 +171,7 @@ class TransactionTransformer extends TransformerAbstract
         /** @var Note $dbNote */
         $dbNote = $transaction->transactionJournal->notes()->first();
         $notes  = null;
-        if(!is_null($dbNote)) {
+        if (!is_null($dbNote)) {
             $notes = $dbNote->text;
         }
 

app/Validation/FireflyValidator.php

@@ -396,7 +396,7 @@ class FireflyValidator extends Validator
     public function validateUniqueAccountNumberForUser($attribute, $value, $parameters): bool
     {
         $accountId = $this->data['id'] ?? 0;
-        if($accountId === 0) {
+        if ($accountId === 0) {
             $accountId = $parameters[0] ?? 0;
         }