Some code cleanup

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

app/Export/Collector/BasicCollector.php

@@ -21,11 +21,10 @@ use Illuminate\Support\Collection;
  */
 class BasicCollector
 {
-    /** @var Collection */
-    private $files;
-
     /** @var ExportJob */
     protected $job;
+    /** @var Collection */
+    private $files;
 
     /**
      * BasicCollector constructor.

app/Export/Collector/CollectorInterface.php

@@ -9,6 +9,7 @@ declare(strict_types = 1);
  */
 
 namespace FireflyIII\Export\Collector;
+
 use Illuminate\Support\Collection;
 
 /**
@@ -18,16 +19,16 @@ use Illuminate\Support\Collection;
  */
 interface CollectorInterface
 {
-    /**
-     * @return bool
-     */
-    public function run();
-
     /**
      * @return Collection
      */
     public function getFiles();
 
+    /**
+     * @return bool
+     */
+    public function run();
+
     /**
      * @param Collection $files
      *

app/Export/Exporter/BasicExporter.php

@@ -21,10 +21,9 @@ use Illuminate\Support\Collection;
  */
 class BasicExporter
 {
-    private $entries;
-
     /** @var  ExportJob */
     protected $job;
+    private $entries;
 
     /**
      * BasicExporter constructor.
@@ -54,5 +53,4 @@ class BasicExporter
     }
 
 
-
 }

app/Export/Exporter/ExporterInterface.php

@@ -9,6 +9,7 @@ declare(strict_types = 1);
  */
 
 namespace FireflyIII\Export\Exporter;
+
 use Illuminate\Support\Collection;
 
 /**
@@ -23,6 +24,11 @@ interface ExporterInterface
      */
     public function getEntries();
 
+    /**
+     * @return string
+     */
+    public function getFileName();
+
     /**
      *
      */
@@ -34,9 +40,4 @@ interface ExporterInterface
      */
     public function setEntries(Collection $entries);
 
-    /**
-     * @return string
-     */
-    public function getFileName();
-
 }

app/Handlers/Events/FireRulesForStore.php

@@ -63,6 +63,7 @@ class FireRulesForStore
 
             }
         }
+
         return true;
     }
 }

app/Handlers/Events/FireRulesForUpdate.php

@@ -62,6 +62,7 @@ class FireRulesForUpdate
 
             }
         }
+
         return true;
     }
 }

app/Handlers/Events/ScanForBillsAfterStore.php

@@ -33,6 +33,7 @@ class ScanForBillsAfterStore
     {
         $journal = $event->journal;
         BillScanner::scan($journal);
+
         return true;
     }
 

app/Handlers/Events/ScanForBillsAfterUpdate.php

@@ -32,6 +32,7 @@ class ScanForBillsAfterUpdate
     {
         $journal = $event->journal;
         BillScanner::scan($journal);
+
         return true;
     }
 

app/Helpers/Report/BalanceReportHelper.php

@@ -15,8 +15,8 @@ use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\BalanceEntry;
 use FireflyIII\Helpers\Collection\BalanceHeader;
 use FireflyIII\Helpers\Collection\BalanceLine;
-use FireflyIII\Models\Budget as BudgetModel;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\Budget as BudgetModel;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;

app/Http/Controllers/NewUserController.php

@@ -4,7 +4,6 @@ use Auth;
 use Carbon\Carbon;
 use Config;
 use FireflyIII\Http\Requests\NewUserFormRequest;
-use FireflyIII\Models\AccountMeta;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use Preferences;
 use Session;

app/Http/Middleware/Authenticate.php

@@ -7,6 +7,7 @@ use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Session;
+
 /**
  * Class Authenticate
  *

app/Http/Requests/TokenFormRequest.php

@@ -4,7 +4,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use Input;
 
 /**
  * Class TokenFormRequest

app/Providers/FireflyServiceProvider.php

@@ -19,7 +19,6 @@ use Illuminate\Support\ServiceProvider;
 use Twig;
 use TwigBridge\Extension\Loader\Functions;
 use Validator;
-use Auth;
 
 /**
  * Class FireflyServiceProvider

app/Rules/Triggers/AbstractTrigger.php

@@ -51,6 +51,7 @@ class AbstractTrigger
         $self                 = new static;
         $self->triggerValue   = $triggerValue;
         $self->stopProcessing = $stopProcessing;
+
         return $self;
     }
 

app/Support/Steam.php

@@ -40,9 +40,11 @@ class Steam
 
         bcscale(2);
 
-        $balance = strval($account->transactions()->leftJoin(
+        $balance = strval(
+            $account->transactions()->leftJoin(
                 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
-        )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount'));
+            )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount')
+        );
 
         if (!$ignoreVirtualBalance) {
             $balance = bcadd($balance, $account->virtual_balance);

app/Validation/FireflyValidator.php

@@ -16,13 +16,11 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Rules\Triggers\TriggerInterface;
 use FireflyIII\User;
-use Input;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Validation\Validator;
+use Input;
 use Log;
-use PragmaRX\Google2FA\Contracts\Google2FA;
 use Symfony\Component\Translation\TranslatorInterface;
-use Session;
 
 /**
  * Class FireflyValidator