Various code cleanup.

app/Http/Controllers/Account/EditController.php

@@ -194,6 +194,7 @@ class EditController extends Controller
         $request->session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name]));
 
         // store new attachment(s):
+
         $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
         if (null !== $files && !auth()->user()->hasRole('demo')) {
             $this->attachments->saveAttachmentsForModel($account, $files);

app/Http/Controllers/Admin/ConfigurationController.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\ConfigurationRequest;
@@ -59,7 +60,7 @@ class ConfigurationController extends Controller
      * Show configuration index.
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function index()
     {

app/Http/Controllers/AttachmentController.php

@@ -26,6 +26,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\AttachmentFormRequest;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -216,7 +217,7 @@ class AttachmentController extends Controller
      *
      * @return LaravelResponse
      * @throws FireflyException
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     * @throws BindingResolutionException
      */
     public function view(Request $request, Attachment $attachment): LaravelResponse
     {

app/Http/Controllers/Auth/LoginController.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
 use Adldap;
 use Cookie;
 use DB;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
 use Illuminate\Contracts\View\Factory;
@@ -33,6 +34,7 @@ use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 use Log;
@@ -83,7 +85,7 @@ class LoginController extends Controller
     public function login(Request $request)
     {
         Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get('email')));
-        Log::info(sprintf('User is trying to login.'));
+        Log::info('User is trying to login.');
 
         $guard = config('auth.defaults.guard');
 
@@ -134,7 +136,7 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function logout(Request $request)
     {
@@ -162,7 +164,7 @@ class LoginController extends Controller
         }
 
         return $request->wantsJson()
-            ? new \Illuminate\Http\Response('', 204)
+            ? new Response('', 204)
             : redirect('/');
     }
 
@@ -192,8 +194,8 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return Factory|\Illuminate\Http\Response|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @return Factory|Response|View
+     * @throws FireflyException
      */
     public function showLoginForm(Request $request)
     {

app/Http/Controllers/Auth/RegisterController.php

@@ -32,6 +32,7 @@ use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 use Log;
 
@@ -79,7 +80,7 @@ class RegisterController extends Controller
      *
      * @return Factory|RedirectResponse|Redirector|View
      * @throws FireflyException
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     public function register(Request $request)
     {

app/Http/Controllers/Auth/TwoFactorController.php

@@ -24,6 +24,8 @@ namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
@@ -38,7 +40,7 @@ class TwoFactorController extends Controller
     /**
      * What to do if 2FA lost?
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+     * @return Factory|View
      */
     public function lostTwoFactor()
     {

app/Http/Controllers/Budget/CreateController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Budget;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BudgetFormStoreRequest;
@@ -111,7 +112,7 @@ class CreateController extends Controller
      * @param BudgetFormStoreRequest $request
      *
      * @return RedirectResponse
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function store(BudgetFormStoreRequest $request): RedirectResponse
     {

app/Http/Controllers/Category/CreateController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Category;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\CategoryFormRequest;
@@ -86,7 +87,7 @@ class CreateController extends Controller
      * @param CategoryFormRequest $request
      *
      * @return $this|RedirectResponse|Redirector
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function store(CategoryFormRequest $request)
     {

app/Http/Controllers/Export/IndexController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Export;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -32,6 +33,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\View\View;
 use League\Csv\CannotInsertRecord;
+use League\Csv\Exception;
 
 /**
  * Class IndexController
@@ -66,8 +68,8 @@ class IndexController extends Controller
     /**
      * @return LaravelResponse
      * @throws CannotInsertRecord
-     * @throws \FireflyIII\Exceptions\FireflyException
-     * @throws \League\Csv\Exception
+     * @throws FireflyException
+     * @throws Exception
      */
     public function export(): LaravelResponse
     {

app/Http/Controllers/ObjectGroup/DeleteController.php

@@ -27,6 +27,8 @@ namespace FireflyIII\Http\Controllers\ObjectGroup;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 
 /**
@@ -62,7 +64,7 @@ class DeleteController extends Controller
      *
      * @param ObjectGroup $objectGroup
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+     * @return Factory|View
      */
     public function delete(ObjectGroup $objectGroup)
     {

app/Http/Controllers/ObjectGroup/EditController.php

@@ -28,6 +28,11 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\ObjectGroupFormRequest;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Routing\Redirector;
 
 /**
  * Class EditController
@@ -62,7 +67,7 @@ class EditController extends Controller
      *
      * @param ObjectGroup $objectGroup
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+     * @return Factory|View
      */
     public function edit(ObjectGroup $objectGroup)
     {
@@ -82,7 +87,8 @@ class EditController extends Controller
      *
      * @param ObjectGroupFormRequest $request
      * @param ObjectGroup            $objectGroup
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
+     * @return Application|RedirectResponse|Redirector
      */
     public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup)
     {

app/Http/Controllers/ObjectGroup/IndexController.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Log;
@@ -78,7 +79,7 @@ class IndexController extends Controller
      * @param Request     $request
      * @param ObjectGroup $objectGroup
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function setOrder(Request $request, ObjectGroup $objectGroup)
     {

app/Http/Controllers/PiggyBank/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\PiggyBank;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\PiggyBankStoreRequest;
@@ -88,7 +89,7 @@ class CreateController extends Controller
      * @param PiggyBankStoreRequest $request
      *
      * @return RedirectResponse|Redirector
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function store(PiggyBankStoreRequest $request)
     {

app/Http/Controllers/PiggyBank/EditController.php

@@ -79,12 +79,8 @@ class EditController extends Controller
         $startDate    = null;
         $note         = $piggyBank->notes()->first();
         // Flash some data to fill the form.
-        if (null !== $piggyBank->targetdate) {
-            $targetDate = $piggyBank->targetdate->format('Y-m-d');
-        }
-        if (null !== $piggyBank->startdate) {
-            $startDate = $piggyBank->startdate->format('Y-m-d');
-        }
+        $targetDate = $piggyBank->targetdate?->format('Y-m-d');
+        $startDate  = $piggyBank->startdate?->format('Y-m-d');
 
         $preFilled = ['name'         => $piggyBank->name,
                       'account_id'   => $piggyBank->account_id,

app/Http/Controllers/ProfileController.php

@@ -38,6 +38,7 @@ use FireflyIII\Support\Http\Controllers\CreateStuff;
 use FireflyIII\User;
 use Google2FA;
 use Hash;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
@@ -48,6 +49,9 @@ use Illuminate\Support\Collection;
 use Illuminate\View\View;
 use Laravel\Passport\ClientRepository;
 use Log;
+use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
+use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
+use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
 use PragmaRX\Recovery\Recovery;
 
 /**
@@ -107,7 +111,7 @@ class ProfileController extends Controller
      * @param Request $request
      *
      * @return Application|RedirectResponse|Redirector
-     * @throws \Illuminate\Auth\AuthenticationException
+     * @throws AuthenticationException
      */
     public function postLogoutOtherSessions(Request $request)
     {
@@ -183,9 +187,9 @@ class ProfileController extends Controller
      * @param Request $request
      *
      * @return Factory|View
-     * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
-     * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
-     * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
+     * @throws IncompatibleWithGoogleAuthenticatorException
+     * @throws InvalidCharactersException
+     * @throws SecretKeyTooShortException
      */
     public function code(Request $request)
     {

app/Http/Controllers/Report/BillController.php

@@ -28,6 +28,7 @@ use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use JsonException;
 use Log;
 use Throwable;
 
@@ -42,7 +43,7 @@ class BillController extends Controller
      * @param Carbon     $end
      *
      * @return mixed|string
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function overview(Collection $accounts, Carbon $start, Carbon $end)
     {   // chart properties for cache:

app/Http/Controllers/ReportController.php

@@ -34,6 +34,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\RenderPartialViews;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
@@ -299,7 +300,7 @@ class ReportController extends Controller
      *
      * @param string $reportType
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      *
      */
     public function options(string $reportType)

app/Http/Controllers/System/CronController.php

@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\System;
 
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Http\Response;
 use Log;
 
 /**
@@ -31,7 +34,7 @@ use Log;
 class CronController
 {
     /**
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     * @return Application|ResponseFactory|Response
      */
     public function cron()
     {

app/Http/Controllers/TagController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Requests\TagFormRequest;
@@ -228,7 +229,7 @@ class TagController extends Controller
      * @param Carbon|null $end
      *
      * @return Factory|View
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
      */
     public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null)
     {

app/Http/Controllers/Transaction/BulkController.php

@@ -28,7 +28,10 @@ use FireflyIII\Http\Requests\BulkEditJournalRequest;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Log;
 
@@ -90,7 +93,7 @@ class BulkController extends Controller
      *
      * @param BulkEditJournalRequest $request
      *
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return Application|RedirectResponse|Redirector
      */
     public function update(BulkEditJournalRequest $request)
     {

app/Http/Controllers/Transaction/DeleteController.php

@@ -26,6 +26,8 @@ namespace FireflyIII\Http\Controllers\Transaction;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Log;
@@ -66,7 +68,7 @@ class DeleteController extends Controller
      *
      * @param TransactionGroup $group
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
+     * @return Factory|View|Redirector|RedirectResponse
      */
     public function delete(TransactionGroup $group)
     {

app/Http/Controllers/Transaction/MassController.php

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Update\JournalUpdateService;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View as IlluminateView;
@@ -91,7 +92,7 @@ class MassController extends Controller
      *
      * @param MassDeleteJournalRequest $request
      *
-     * @return \Illuminate\Contracts\Foundation\Application|Redirector|RedirectResponse
+     * @return Application|Redirector|RedirectResponse
      *
      */
     public function destroy(MassDeleteJournalRequest $request)
@@ -229,14 +230,14 @@ class MassController extends Controller
     /**
      * @param MassEditJournalRequest $request
      * @param int                    $journalId
-     * @param string                 $string
+     * @param string                 $key
      *
      * @return Carbon|null
      * @codeCoverageIgnore
      */
-    private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?Carbon
+    private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon
     {
-        $value = $request->get($string);
+        $value = $request->get($key);
         if (!is_array($value)) {
             return null;
         }