Code clean up [skip ci]

app/Exceptions/Handler.php

@@ -81,7 +81,7 @@ class Handler extends ExceptionHandler
                 'id'    => 0,
                 'email' => 'unknown@example.com',
             ];
-            if (Auth::check()) {
+            if (auth()->check()) {
                 $userData['id']    = Auth::user()->id;
                 $userData['email'] = Auth::user()->email;
             }

app/Http/Controllers/Auth/AuthController.php

@@ -11,22 +11,10 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
-use Auth;
-use Config;
-use FireflyIII\Events\UserRegistration;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Http\Request;
-use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Lang;
-use Log;
-use Mail;
-use Session;
-use Swift_TransportException;
 use Validator;
 
 
@@ -57,7 +45,6 @@ class AuthController extends Controller
     }
 
 
-
     /**
      * Create a new user instance after a valid registration.
      *
@@ -76,11 +63,6 @@ class AuthController extends Controller
     }
 
 
-
-
-
-
-
     /**
      * Get a validator for an incoming registration request.
      *

app/Http/Controllers/BudgetController.php

@@ -252,7 +252,8 @@ class BudgetController extends Controller
         $count    = $journals->count();
         $journals = $journals->slice($offset, $pageSize);
         $list     = new LengthAwarePaginator($journals, $count, $pageSize);
-        $subTitle = trans('firefly.without_budget_between',
+        $subTitle = trans(
+            'firefly.without_budget_between',
             ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
         );
         $list->setPath('/budgets/list/noBudget');

app/Http/Controllers/Controller.php

@@ -11,15 +11,11 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers;
 
-use App;
-use Auth;
 use Carbon\Carbon;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use NumberFormatter;
-use Preferences;
 use View;
 
 /**

app/Http/Controllers/Popup/ReportController.php

@@ -112,6 +112,7 @@ class ReportController extends Controller
                         if ($tags === 0) {
                             return true;
                         }
+
                         return false;
                     }
                 );
@@ -194,6 +195,7 @@ class ReportController extends Controller
                 if ($journal->destination_account_id === $account->id) {
                     return true;
                 }
+
                 return false;
             }
         );
@@ -229,6 +231,7 @@ class ReportController extends Controller
                 ) {
                     return true;
                 }
+
                 return false;
             }
         );

app/Http/Requests/AccountFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use FireflyIII\Models\Account;
 use Input;
 
@@ -29,7 +28,7 @@ class AccountFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/AttachmentFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class AttachmentFormRequest
  *
@@ -27,7 +25,7 @@ class AttachmentFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/BillFormRequest.php

@@ -29,7 +29,7 @@ class BillFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/BudgetFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use FireflyIII\Models\Budget;
 use Input;
 
@@ -29,7 +28,7 @@ class BudgetFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/CategoryFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use FireflyIII\Models\Category;
 use Input;
 
@@ -29,7 +28,7 @@ class CategoryFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/ConfigurationRequest.php

@@ -27,7 +27,7 @@ class ConfigurationRequest extends Request
     public function authorize()
     {
         // Only allow logged in users and admins
-        return Auth::check() && Auth::user()->hasRole('owner');
+        return auth()->check() && Auth::user()->hasRole('owner');
     }
 
     /**

app/Http/Requests/CurrencyFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Input;
 
 /**
@@ -28,7 +27,7 @@ class CurrencyFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/DeleteAccountFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class DeleteAccountFormRequest
  *
@@ -27,7 +25,7 @@ class DeleteAccountFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/ExportFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Carbon\Carbon;
 
 /**
@@ -28,7 +27,7 @@ class ExportFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/ImportUploadRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class ImportUploadRequest
  *
@@ -27,7 +25,7 @@ class ImportUploadRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/JournalFormRequest.php

@@ -32,7 +32,7 @@ class JournalFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/MassDeleteJournalRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class MassDeleteJournalRequest
  *
@@ -27,7 +25,7 @@ class MassDeleteJournalRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/MassEditJournalRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class MassEditJournalRequest
  *
@@ -27,7 +25,7 @@ class MassEditJournalRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/NewUserFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class NewUserFormRequest
  *
@@ -27,7 +25,7 @@ class NewUserFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/PiggyBankFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Input;
 
 /**
@@ -28,7 +27,7 @@ class PiggyBankFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/ProfileFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class ProfileFormRequest
  *
@@ -27,7 +25,7 @@ class ProfileFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/RuleFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use FireflyIII\Models\RuleGroup;
 use Input;
 
@@ -29,7 +28,7 @@ class RuleFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/RuleGroupFormRequest.php

@@ -18,7 +18,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use FireflyIII\Models\RuleGroup;
 use Input;
 
@@ -36,7 +35,7 @@ class RuleGroupFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/SelectTransactionsRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Carbon\Carbon;
 
 /**
@@ -28,7 +27,7 @@ class SelectTransactionsRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/SplitJournalFormRequest.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Carbon\Carbon;
 
 
@@ -28,7 +27,7 @@ class SplitJournalFormRequest extends Request
     public function authorize(): bool
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/TagFormRequest.php

@@ -10,7 +10,6 @@
 declare(strict_types = 1);
 namespace FireflyIII\Http\Requests;
 
-use Auth;
 use Carbon\Carbon;
 use FireflyIII\Models\Tag;
 use Input;
@@ -29,7 +28,7 @@ class TagFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/TestRuleFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class RuleFormRequest
  *
@@ -27,7 +25,7 @@ class TestRuleFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Http/Requests/TokenFormRequest.php

@@ -11,8 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Requests;
 
-use Auth;
-
 /**
  * Class TokenFormRequest
  *
@@ -27,7 +25,7 @@ class TokenFormRequest extends Request
     public function authorize()
     {
         // Only allow logged in users
-        return Auth::check();
+        return auth()->check();
     }
 
     /**

app/Models/Account.php

@@ -153,7 +153,7 @@ class Account extends Model
     public static function routeBinder(Account $value)
     {
 
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/Attachment.php

@@ -69,7 +69,7 @@ class Attachment extends Model
      */
     public static function routeBinder(Attachment $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
 
             if ($value->user_id == Auth::user()->id) {
                 return $value;

app/Models/Bill.php

@@ -81,7 +81,7 @@ class Bill extends Model
      */
     public static function routeBinder(Bill $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/Budget.php

@@ -94,7 +94,7 @@ class Budget extends Model
      */
     public static function routeBinder(Budget $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/Category.php

@@ -89,7 +89,7 @@ class Category extends Model
      */
     public static function routeBinder(Category $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/ExportJob.php

@@ -44,7 +44,7 @@ class ExportJob extends Model
      */
     public static function routeBinder($value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $model = self::where('key', $value)->where('user_id', Auth::user()->id)->first();
             if (!is_null($model)) {
                 return $model;

app/Models/ImportJob.php

@@ -62,7 +62,7 @@ class ImportJob extends Model
      */
     public static function routeBinder($value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $model = self::where('key', $value)->where('user_id', Auth::user()->id)->first();
             if (!is_null($model)) {
                 return $model;

app/Models/LimitRepetition.php

@@ -54,7 +54,7 @@ class LimitRepetition extends Model
      */
     public static function routeBinder($value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $object = LimitRepetition::where('limit_repetitions.id', $value)
                                      ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
                                      ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')

app/Models/PiggyBank.php

@@ -70,7 +70,7 @@ class PiggyBank extends Model
      */
     public static function routeBinder(PiggyBank $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->account->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/Rule.php

@@ -59,7 +59,7 @@ class Rule extends Model
      */
     public static function routeBinder(Rule $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/RuleGroup.php

@@ -55,7 +55,7 @@ class RuleGroup extends Model
      */
     public static function routeBinder(RuleGroup $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/Tag.php

@@ -96,7 +96,7 @@ class Tag extends TagSupport
      */
     public static function routeBinder(Tag $value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             if ($value->user_id == Auth::user()->id) {
                 return $value;
             }

app/Models/TransactionCurrency.php

@@ -11,7 +11,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Models;
 
-use Auth;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -53,7 +52,7 @@ class TransactionCurrency extends Model
      */
     public static function routeBinder(TransactionCurrency $currency)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             return $currency;
         }
         throw new NotFoundHttpException;

app/Models/TransactionJournal.php

@@ -128,7 +128,7 @@ class TransactionJournal extends TransactionJournalSupport
      */
     public static function routeBinder($value)
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $validTypes = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER];
             $object     = TransactionJournal::where('transaction_journals.id', $value)
                                             ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
@@ -380,7 +380,8 @@ class TransactionJournal extends TransactionJournalSupport
                 'transaction_journals.completed',
                 'transaction_types.type',
                 'transaction_currencies.code',
-            ]);
+            ]
+        );
         $query->with(['categories', 'budgets', 'attachments', 'bill', 'transactions']);
     }
 

app/Providers/BroadcastServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace FireflyIII\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {
@@ -19,8 +19,10 @@ class BroadcastServiceProvider extends ServiceProvider
         /*
          * Authenticate the user's personal channel...
          */
-        Broadcast::channel('App.User.*', function ($user, $userId) {
+        Broadcast::channel(
+            'App.User.*', function ($user, $userId) {
             return (int)$user->id === (int)$userId;
-        });
+        }
+        );
     }
 }

app/Providers/RouteServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace FireflyIII\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -42,23 +42,6 @@ class RouteServiceProvider extends ServiceProvider
         //
     }
 
-    /**
-     * Define the "web" routes for the application.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace' => $this->namespace,
-        ], function ($router) {
-            require base_path('routes/web.php');
-        });
-    }
-
     /**
      * Define the "api" routes for the application.
      *
@@ -68,12 +51,33 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::group([
+        Route::group(
+            [
                 'middleware' => 'api',
                 'namespace'  => $this->namespace,
                 'prefix'     => 'api',
             ], function ($router) {
             require base_path('routes/api.php');
-        });
+        }
+        );
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::group(
+            [
+                'middleware' => 'web',
+                'namespace'  => $this->namespace,
+            ], function ($router) {
+            require base_path('routes/web.php');
+        }
+        );
     }
 }

app/Repositories/Account/AccountRepository.php

@@ -431,10 +431,12 @@ class AccountRepository implements AccountRepositoryInterface
         $fields[] = 'destination.account_id as destination_account_id';
         $fields[] = 'destination.amount as destination_amount';
 
-        $query->groupBy(['source.account_id',
+        $query->groupBy(
+            ['source.account_id',
              'source.amount',
              'destination.account_id',
-                'destination.amount',]);
+             'destination.amount',]
+        );
 
         $complete = $query->get($fields);
 

app/Rules/Triggers/AbstractTrigger.php

@@ -115,6 +115,4 @@ class AbstractTrigger
     }
 
 
-
-
 }

app/Support/Binder/AccountList.php

@@ -34,7 +34,7 @@ class AccountList implements BinderInterface
     public static function routeBinder($value, $route): Collection
     {
 
-        if (Auth::check()) {
+        if (auth()->check()) {
 
             $ids = explode(',', $value);
             // filter ids:

app/Support/Binder/BudgetList.php

@@ -33,7 +33,7 @@ class BudgetList implements BinderInterface
      */
     public static function routeBinder($value, $route): Collection
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $ids = explode(',', $value);
             /** @var \Illuminate\Support\Collection $object */
             $object = Budget::where('active', 1)

app/Support/Binder/CategoryList.php

@@ -32,7 +32,7 @@ class CategoryList implements BinderInterface
      */
     public static function routeBinder($value, $route): Collection
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $ids = explode(',', $value);
             /** @var \Illuminate\Support\Collection $object */
             $object = Category::whereIn('id', $ids)

app/Support/Binder/JournalList.php

@@ -32,7 +32,7 @@ class JournalList implements BinderInterface
      */
     public static function routeBinder($value, $route): Collection
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $ids = explode(',', $value);
             /** @var \Illuminate\Support\Collection $object */
             $object = TransactionJournal::whereIn('transaction_journals.id', $ids)

app/Support/Binder/UnfinishedJournal.php

@@ -32,7 +32,7 @@ class UnfinishedJournal implements BinderInterface
      */
     public static function routeBinder($value, $route): TransactionJournal
     {
-        if (Auth::check()) {
+        if (auth()->check()) {
             $object = TransactionJournal::where('transaction_journals.id', $value)
                                         ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                                         ->where('completed', 0)

app/Support/CacheProperties.php

@@ -38,7 +38,7 @@ class CacheProperties
     public function __construct()
     {
         $this->properties = new Collection;
-        if (Auth::check()) {
+        if (auth()->check()) {
             $this->addProperty(Auth::user()->id);
             $this->addProperty(Prefs::lastActivity());
         }

app/Validation/FireflyValidator.php

@@ -224,7 +224,7 @@ class FireflyValidator extends Validator
     public function validateUniqueAccountForUser($attribute, $value, $parameters): bool
     {
         // because a user does not have to be logged in (tests and what-not).
-        if (!Auth::check()) {
+        if (!auth()->check()) {
             return $this->validateAccountAnonymously();
         }