Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix a bunch of rector issues.
James Cole7c04c4c2bc75
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.phpindex 14c480577a..4a4ef9eb69 100644--- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php+++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;+use Exception;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\RuleGroup\TestRequest;use FireflyIII\Api\V1\Requests\Models\RuleGroup\TriggerRequest;@@ -128,7 +129,7 @@ class TriggerController extends Controller** Execute the given rule group on a set of existing transactions.*- * @throws \Exception+ * @throws Exception*/public function triggerGroup(TriggerRequest $request, RuleGroup $group): JsonResponse{diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.phpindex 2b36ee7775..1878812a27 100644--- a/app/Api/V1/Controllers/Summary/BasicController.php+++ b/app/Api/V1/Controllers/Summary/BasicController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Summary;+use Exception;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\DateRequest;@@ -91,7 +92,7 @@ class BasicController extends Controller* This endpoint is documented at:* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/summary/getBasicSummary*- * @throws \Exception+ * @throws Exception*/public function basic(DateRequest $request): JsonResponse{@@ -467,7 +468,7 @@ class BasicController extends Controller}/**- * @throws \Exception+ * @throws Exception*/private function getLeftToSpendInfo(Carbon $start, Carbon $end): array{diff --git a/app/Api/V1/Middleware/ApiDemoUser.php b/app/Api/V1/Middleware/ApiDemoUser.phpindex e031bfa039..cd85e94879 100644--- a/app/Api/V1/Middleware/ApiDemoUser.php+++ b/app/Api/V1/Middleware/ApiDemoUser.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Middleware;+use Closure;use FireflyIII\User;use Illuminate\Http\Request;@@ -36,7 +37,7 @@ class ApiDemoUser** @return mixed*/- public function handle(Request $request, \Closure $next)+ public function handle(Request $request, Closure $next){/** @var null|User $user */$user = $request->user();diff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.phpindex b9319e0240..da2bfb3d7c 100644--- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php+++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Data\Bulk;+use JsonException;use FireflyIII\Enums\ClauseType;use FireflyIII\Rules\IsValidBulkClause;use FireflyIII\Support\Request\ChecksLogin;@@ -52,7 +53,7 @@ class TransactionRequest extends FormRequest$data = ['query' => json_decode($this->get('query'), true, 8, JSON_THROW_ON_ERROR),];- } catch (\JsonException $e) {+ } catch (JsonException $e) {// dont really care. the validation should catch invalid json.app('log')->error($e->getMessage());}diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.phpindex 40194a33f4..e773942ca3 100644--- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php@@ -24,6 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Bill;+use ValueError;+use TypeError;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;@@ -109,7 +111,7 @@ class StoreRequest extends FormRequesttry {$result = bccomp($min, $max);- } catch (\ValueError $e) {+ } catch (ValueError $e) {Log::error($e->getMessage());$validator->errors()->add('amount_min', (string) trans('validation.generic_invalid'));$validator->errors()->add('amount_max', (string) trans('validation.generic_invalid'));@@ -124,7 +126,7 @@ class StoreRequest extends FormRequesttry {$failed = $validator->fails();- } catch (\TypeError $e) {+ } catch (TypeError $e) {Log::error($e->getMessage());$failed = false;}diff --git a/app/Api/V2/Controllers/Summary/BasicController.php b/app/Api/V2/Controllers/Summary/BasicController.phpindex e9402880d2..feb3798cef 100644--- a/app/Api/V2/Controllers/Summary/BasicController.php+++ b/app/Api/V2/Controllers/Summary/BasicController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V2\Controllers\Summary;+use Exception;use Carbon\Carbon;use FireflyIII\Api\V2\Controllers\Controller;use FireflyIII\Api\V2\Request\Generic\DateRequest;@@ -92,7 +93,7 @@ class BasicController extends Controller* This endpoint is documented at:* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/summary/getBasicSummary*- * @throws \Exception+ * @throws Exception** @SuppressWarnings("PHPMD.UnusedFormalParameter")*/diff --git a/app/Api/V2/Request/Model/Transaction/UpdateRequest.php b/app/Api/V2/Request/Model/Transaction/UpdateRequest.phpindex c4d8140c79..3aeda0e3c3 100644--- a/app/Api/V2/Request/Model/Transaction/UpdateRequest.php+++ b/app/Api/V2/Request/Model/Transaction/UpdateRequest.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V2\Request\Model\Transaction;+use Override;use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionGroup;@@ -64,7 +65,7 @@ class UpdateRequest extends Request** @throws FireflyException*/- #[\Override]+ #[Override]public function getAll(): array{app('log')->debug(sprintf('Now in %s', __METHOD__));@@ -248,7 +249,7 @@ class UpdateRequest extends Request/*** The rules that the incoming request must be matched against.*/- #[\Override]+ #[Override]public function rules(): array{app('log')->debug(sprintf('Now in %s', __METHOD__));@@ -332,7 +333,7 @@ class UpdateRequest extends Request/*** Configure the validator instance.*/- #[\Override]+ #[Override]public function withValidator(Validator $validator): void{app('log')->debug('Now in withValidator');diff --git a/app/Api/V2/Response/Sum/AutoSum.php b/app/Api/V2/Response/Sum/AutoSum.phpindex c4ca249fbb..0f1d601f7c 100644--- a/app/Api/V2/Response/Sum/AutoSum.php+++ b/app/Api/V2/Response/Sum/AutoSum.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V2\Response\Sum;+use Closure;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionCurrency;use Illuminate\Database\Eloquent\Model;@@ -39,7 +40,7 @@ class AutoSum/*** @throws FireflyException*/- public function autoSum(Collection $objects, \Closure $getCurrency, \Closure $getSum): array+ public function autoSum(Collection $objects, Closure $getCurrency, Closure $getSum): array{$return = [];diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.phpindex 761070bd46..dd570b63a9 100644--- a/app/Http/Controllers/DebugController.php+++ b/app/Http/Controllers/DebugController.php@@ -111,7 +111,7 @@ class DebugController extends Controllertry {Artisan::call('twig:clean');- } catch (\Exception $e) { // intentional generic exception+ } catch (Exception $e) { // intentional generic exceptionthrow new FireflyException($e->getMessage(), 0, $e);}@@ -203,7 +203,7 @@ class DebugController extends Controller$return['build'] = trim((string) file_get_contents('/var/www/counter-main.txt'));app('log')->debug(sprintf('build is now "%s"', $return['build']));}- } catch (\Exception $e) {+ } catch (Exception $e) {app('log')->debug('Could not check build counter, but thats ok.');app('log')->warning($e->getMessage());}@@ -212,7 +212,7 @@ class DebugController extends Controllerif (file_exists('/var/www/build-date-main.txt')) {$return['build_date'] = trim((string) file_get_contents('/var/www/build-date-main.txt'));}- } catch (\Exception $e) {+ } catch (Exception $e) {app('log')->debug('Could not check build date, but thats ok.');app('log')->warning($e->getMessage());}diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.phpindex 4f300d8924..b829724308 100644--- a/app/Http/Controllers/HomeController.php+++ b/app/Http/Controllers/HomeController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;+use Exception;use Carbon\Carbon;use Carbon\Exceptions\InvalidFormatException;use FireflyIII\Enums\AccountTypeEnum;@@ -57,7 +58,7 @@ class HomeController extends Controller/*** Change index date range.*- * @throws \Exception+ * @throws Exception*/public function dateRange(Request $request): JsonResponse{diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.phpindex 08ed98cd53..f508c66763 100644--- a/app/Http/Controllers/Json/FrontpageController.php+++ b/app/Http/Controllers/Json/FrontpageController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;+use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\PiggyBank;@@ -89,7 +90,7 @@ class FrontpageController extends Controllerif (0 !== count($info)) {try {$html = view('json.piggy-banks', compact('info', 'convertToNative', 'native'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$html = 'Could not render view.';diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.phpindex f2122dc310..db7642cfe8 100644--- a/app/Http/Controllers/Json/ReconcileController.php+++ b/app/Http/Controllers/Json/ReconcileController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;+use Throwable;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -130,7 +131,7 @@ class ReconcileController extends Controllertry {$view = view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared', 'reconSum', 'selectedIds'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('View error: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());@@ -228,7 +229,7 @@ class ReconcileController extends Controller'accounts.reconcile.transactions',compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.phpindex c91fb1c1e3..a555015150 100644--- a/app/Http/Controllers/Json/RuleController.php+++ b/app/Http/Controllers/Json/RuleController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;+use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use Illuminate\Http\JsonResponse;@@ -50,7 +51,7 @@ class RuleController extends Controllertry {$view = view('rules.partials.action', compact('actions', 'count'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$view = 'Could not render view.';@@ -80,7 +81,7 @@ class RuleController extends Controllertry {$view = view('rules.partials.trigger', compact('triggers', 'count'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$view = 'Could not render view.';diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.phpindex 4f2526083c..3031037624 100644--- a/app/Http/Controllers/PreferencesController.php+++ b/app/Http/Controllers/PreferencesController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;+use JsonException;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Events\Preferences\UserGroupChangedDefaultCurrency;@@ -155,7 +156,7 @@ class PreferencesController extends Controllertry {$locales = json_decode((string) file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);- } catch (\JsonException $e) {+ } catch (JsonException $e) {app('log')->error($e->getMessage());$locales = [];}diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 031b09a785..e784c4fb7a 100644--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;+use Exception;use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\Hash;use FireflyIII\Events\UserChangedEmail;@@ -362,7 +363,7 @@ class ProfileController extends Controller** @return Redirector|RedirectResponse*- * @throws \Exception+ * @throws Exception*/public function regenerate(Request $request){diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.phpindex d99ec61237..dcd9464ce3 100644--- a/app/Http/Controllers/Report/AccountController.php+++ b/app/Http/Controllers/Report/AccountController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -58,7 +59,7 @@ class AccountController extends Controllertry {$result = view('reports.partials.accounts', compact('accountReport'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.phpindex 914f12061c..41b3010a4a 100644--- a/app/Http/Controllers/Report/BalanceController.php+++ b/app/Http/Controllers/Report/BalanceController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -140,7 +141,7 @@ class BalanceController extends Controllertry {$result = view('reports.partials.balance', compact('report'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.phpindex afbb68362c..1fd70e3c48 100644--- a/app/Http/Controllers/Report/BillController.php+++ b/app/Http/Controllers/Report/BillController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Report\ReportHelperInterface;@@ -58,7 +59,7 @@ class BillController extends Controllertry {$result = view('reports.partials.bills', compact('report'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.phpindex 67c316891d..f24dd2b551 100644--- a/app/Http/Controllers/Report/BudgetController.php+++ b/app/Http/Controllers/Report/BudgetController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -176,7 +177,7 @@ class BudgetController extends Controllertry {$result = view('reports.budget.partials.avg-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());app('log')->error($e->getTraceAsString());@@ -326,7 +327,7 @@ class BudgetController extends Controllertry {$result = view('reports.partials.budget-period', compact('report', 'periods'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';@@ -377,7 +378,7 @@ class BudgetController extends Controllertry {$result = view('reports.budget.partials.top-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.phpindex 0168fdd75e..fc8d17421a 100644--- a/app/Http/Controllers/Report/CategoryController.php+++ b/app/Http/Controllers/Report/CategoryController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -295,7 +296,7 @@ class CategoryController extends Controllertry {$result = view('reports.category.partials.avg-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -345,7 +346,7 @@ class CategoryController extends Controllertry {$result = view('reports.category.partials.avg-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -527,7 +528,7 @@ class CategoryController extends Controllertry {$result = view('reports.partials.category-period', compact('report', 'periods'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());@@ -599,7 +600,7 @@ class CategoryController extends Controllertry {$result = view('reports.partials.category-period', compact('report', 'periods'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());@@ -639,7 +640,7 @@ class CategoryController extends Controllertry {$result = view('reports.partials.categories', compact('report'))->render();$cache->store($result);- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());@@ -687,7 +688,7 @@ class CategoryController extends Controllertry {$result = view('reports.category.partials.top-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -735,7 +736,7 @@ class CategoryController extends Controllertry {$result = view('reports.category.partials.top-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.phpindex 79d9d5fc1e..32a1736844 100644--- a/app/Http/Controllers/Report/DoubleController.php+++ b/app/Http/Controllers/Report/DoubleController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -102,7 +103,7 @@ class DoubleController extends Controllertry {$result = view('reports.double.partials.avg-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -152,7 +153,7 @@ class DoubleController extends Controllertry {$result = view('reports.double.partials.avg-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -429,7 +430,7 @@ class DoubleController extends Controllertry {$result = view('reports.double.partials.top-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -477,7 +478,7 @@ class DoubleController extends Controllertry {$result = view('reports.double.partials.top-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.phpindex de27b13d04..d2aaeaa3dd 100644--- a/app/Http/Controllers/Report/OperationsController.php+++ b/app/Http/Controllers/Report/OperationsController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -78,7 +79,7 @@ class OperationsController extends Controllertry {$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';@@ -112,7 +113,7 @@ class OperationsController extends Controllertry {$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';@@ -167,7 +168,7 @@ class OperationsController extends Controllertry {$result = view('reports.partials.operations', compact('sums'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$result = 'Could not render view.';diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.phpindex 0b8f8cde7b..22bca3fd99 100644--- a/app/Http/Controllers/Report/TagController.php+++ b/app/Http/Controllers/Report/TagController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -292,7 +293,7 @@ class TagController extends Controllertry {$result = view('reports.tag.partials.avg-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -342,7 +343,7 @@ class TagController extends Controllertry {$result = view('reports.tag.partials.avg-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -490,7 +491,7 @@ class TagController extends Controllertry {$result = view('reports.tag.partials.top-expenses', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());@@ -538,7 +539,7 @@ class TagController extends Controllertry {$result = view('reports.tag.partials.top-income', compact('result'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.phpindex c6f50d48ec..848fa259a3 100644--- a/app/Http/Controllers/Rule/EditController.php+++ b/app/Http/Controllers/Rule/EditController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Rule;+use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\RuleFormRequest;@@ -177,7 +178,7 @@ class EditController extends Controller'triggers' => $triggers,])->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {$message = sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage());app('log')->debug($message);app('log')->error($e->getTraceAsString());diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.phpindex d6dae9d5fa..24c7dc0860 100644--- a/app/Http/Controllers/Rule/SelectController.php+++ b/app/Http/Controllers/Rule/SelectController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Rule;+use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -174,7 +175,7 @@ class SelectController extends Controllertry {$view = view('list.journals-array-tiny', ['groups' => $collection])->render();- } catch (\Throwable $exception) {+ } catch (Throwable $exception) {app('log')->error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));app('log')->error($exception->getTraceAsString());$view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());@@ -216,7 +217,7 @@ class SelectController extends Controllertry {$view = view('list.journals-array-tiny', ['groups' => $collection])->render();- } catch (\Throwable $exception) {+ } catch (Throwable $exception) {$message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());app('log')->error($message);app('log')->error($exception->getTraceAsString());diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.phpindex 542d38d0a7..40419e9656 100644--- a/app/Http/Controllers/RuleGroup/ExecutionController.php+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\RuleGroup;+use Exception;use Carbon\Carbon;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\SelectTransactionsRequest;@@ -64,7 +65,7 @@ class ExecutionController extends Controller/*** Execute the given rulegroup on a set of existing transactions.*- * @throws \Exception+ * @throws Exception*/public function execute(SelectTransactionsRequest $request, RuleGroup $ruleGroup): RedirectResponse{diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.phpindex ceab9169c5..b30d1eefad 100644--- a/app/Http/Controllers/SearchController.php+++ b/app/Http/Controllers/SearchController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;+use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;use FireflyIII\Support\Search\SearchInterface;@@ -118,7 +119,7 @@ class SearchController extends Controllertry {$html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();- } catch (\Throwable $e) {+ } catch (Throwable $e) {app('log')->error(sprintf('Cannot render search.search: %s', $e->getMessage()));app('log')->error($e->getTraceAsString());$html = 'Could not render view.';diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.phpindex 8f59b12f46..e2acfb680f 100644--- a/app/Http/Controllers/System/InstallController.php+++ b/app/Http/Controllers/System/InstallController.php@@ -146,7 +146,7 @@ class InstallController extends ControllerArtisan::call($command, $args);app('log')->debug(Artisan::output());}- } catch (\Exception $e) { // intentional generic exception+ } catch (Exception $e) { // intentional generic exceptionthrow new FireflyException($e->getMessage(), 0, $e);}// clear cache as well.diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.phpindex 929d46ede7..d3b00a5738 100644--- a/app/Http/Controllers/Transaction/ConvertController.php+++ b/app/Http/Controllers/Transaction/ConvertController.php@@ -82,7 +82,7 @@ class ConvertController extends Controller** @return Factory|Redirector|RedirectResponse|View*- * @throws \Exception+ * @throws Exception*/public function index(TransactionType $destinationType, TransactionGroup $group){@@ -214,7 +214,7 @@ class ConvertController extends Controller}/**- * @throws \Exception+ * @throws Exception*/private function getLiabilities(): array{@@ -238,7 +238,7 @@ class ConvertController extends Controller}/**- * @throws \Exception+ * @throws Exception*/private function getAssetAccounts(): array{diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.phpindex aa44005821..bac580dc76 100644--- a/app/Http/Controllers/Transaction/MassController.php+++ b/app/Http/Controllers/Transaction/MassController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Transaction;+use InvalidArgumentException;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;@@ -231,7 +232,7 @@ class MassController extends Controllertry {$carbon = Carbon::parse($value[$journalId]);- } catch (\InvalidArgumentException $e) {+ } catch (InvalidArgumentException $e) {Log::warning(sprintf('Could not parse "%s" but dont mind', $value[$journalId]));Log::warning($e->getMessage());diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.phpindex a4de77717e..7f11d50cba 100644--- a/app/Http/Middleware/Authenticate.php+++ b/app/Http/Middleware/Authenticate.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Exceptions\FireflyException;use FireflyIII\User;use Illuminate\Auth\AuthenticationException;@@ -56,7 +57,7 @@ class Authenticate* @throws FireflyException* @throws AuthenticationException*/- public function handle($request, \Closure $next, ...$guards)+ public function handle($request, Closure $next, ...$guards){$this->authenticate($request, $guards);diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.phpindex 9f4413a06d..7b03830ba5 100644--- a/app/Http/Middleware/Binder.php+++ b/app/Http/Middleware/Binder.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Support\Domain;use Illuminate\Contracts\Auth\Factory as Auth;use Illuminate\Http\Request;@@ -63,7 +64,7 @@ class Binder** @return mixed*/- public function handle($request, \Closure $next)+ public function handle($request, Closure $next){foreach ($request->route()->parameters() as $key => $value) {if (array_key_exists($key, $this->binders)) {diff --git a/app/Http/Middleware/InstallationId.php b/app/Http/Middleware/InstallationId.phpindex 79ac8daedc..6c8aff7dab 100644--- a/app/Http/Middleware/InstallationId.php+++ b/app/Http/Middleware/InstallationId.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Support\System\GeneratesInstallationId;use Illuminate\Http\Request;@@ -41,7 +42,7 @@ class InstallationId** @return mixed*/- public function handle($request, \Closure $next)+ public function handle($request, Closure $next){$this->generateInstallationId();diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.phpindex 1954f226bd..f7d38232ca 100644--- a/app/Http/Middleware/Installer.php+++ b/app/Http/Middleware/Installer.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Support\System\OAuthKeys;use Illuminate\Database\QueryException;@@ -45,7 +46,7 @@ class Installer** @throws FireflyException*/- public function handle($request, \Closure $next)+ public function handle($request, Closure $next){// Log::debug(sprintf('Installer middleware for URL %s', $request->url()));// ignore installer in test environment.diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.phpindex 49e013d5ed..30c9b65e68 100644--- a/app/Http/Middleware/InterestingMessage.php+++ b/app/Http/Middleware/InterestingMessage.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Models\Account;use FireflyIII\Models\Bill;use FireflyIII\Models\GroupMembership;@@ -45,7 +46,7 @@ class InterestingMessage** @return mixed*/- public function handle(Request $request, \Closure $next)+ public function handle(Request $request, Closure $next){if ($this->testing()) {return $next($request);diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.phpindex c992713911..2412e607b7 100644--- a/app/Http/Middleware/IsAdmin.php+++ b/app/Http/Middleware/IsAdmin.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;use Illuminate\Http\Request;@@ -40,7 +41,7 @@ class IsAdmin** @return mixed*/- public function handle(Request $request, \Closure $next, $guard = null)+ public function handle(Request $request, Closure $next, $guard = null){if (Auth::guard($guard)->guest()) {if ($request->ajax()) {diff --git a/app/Http/Middleware/IsDemoUser.php b/app/Http/Middleware/IsDemoUser.phpindex c984e947a5..e792003b9a 100644--- a/app/Http/Middleware/IsDemoUser.php+++ b/app/Http/Middleware/IsDemoUser.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;use Illuminate\Http\Request;@@ -37,7 +38,7 @@ class IsDemoUser** @return mixed*/- public function handle(Request $request, \Closure $next)+ public function handle(Request $request, Closure $next){/** @var null|User $user */$user = $request->user();diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.phpindex d0e151d331..4699a454c0 100644--- a/app/Http/Middleware/Range.php+++ b/app/Http/Middleware/Range.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use Illuminate\Support\Facades\App;use Carbon\Carbon;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;@@ -43,7 +44,7 @@ class Range** @return mixed*/- public function handle(Request $request, \Closure $next)+ public function handle(Request $request, Closure $next){if (null !== $request->user()) {// set start, end and finish:diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.phpindex 5bffbb7146..01cda1a816 100644--- a/app/Http/Middleware/RedirectIfAuthenticated.php+++ b/app/Http/Middleware/RedirectIfAuthenticated.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;@@ -39,7 +40,7 @@ class RedirectIfAuthenticated** @return mixed*/- public function handle($request, \Closure $next, $guard = null)+ public function handle($request, Closure $next, $guard = null){if (Auth::guard($guard)->check()) {return response()->redirectTo(route('index'));diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.phpindex 4ae071b11f..5f8b104992 100644--- a/app/Http/Middleware/SecureHeaders.php+++ b/app/Http/Middleware/SecureHeaders.php@@ -24,6 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Closure;+use Exception;use Barryvdh\Debugbar\Facades\Debugbar;use Illuminate\Http\Request;use Illuminate\Support\Facades\Vite;@@ -38,9 +40,9 @@ class SecureHeaders** @return mixed*- * @throws \Exception+ * @throws Exception*/- public function handle(Request $request, \Closure $next)+ public function handle(Request $request, Closure $next){// generate and share nonce.$nonce = base64_encode(random_bytes(16));diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.phpindex 03359f735a..922bc3ad8c 100644--- a/app/Http/Middleware/StartFireflySession.php+++ b/app/Http/Middleware/StartFireflySession.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Override;use Illuminate\Contracts\Session\Session;use Illuminate\Http\Request;use Illuminate\Session\Middleware\StartSession;@@ -37,7 +38,7 @@ class StartFireflySession extends StartSession** @param Session $session*/- #[\Override]+ #[Override]protected function storeCurrentUrl(Request $request, $session): void{$url = $request->fullUrl();diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.phpindex 9dcd6a249a..4446201045 100644--- a/app/Http/Middleware/TrustHosts.php+++ b/app/Http/Middleware/TrustHosts.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Override;use Illuminate\Http\Middleware\TrustHosts as Middleware;class TrustHosts extends Middleware@@ -33,7 +34,7 @@ class TrustHosts extends Middleware** @return array<int, null|string>*/- #[\Override]+ #[Override]public function hosts(): array{return [diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.phpindex bf7e4417bb..8c5de287d4 100644--- a/app/Http/Requests/ReportFormRequest.php+++ b/app/Http/Requests/ReportFormRequest.php@@ -149,7 +149,7 @@ class ReportFormRequest extends FormRequestif (false !== $result && 0 !== $result) {try {$date = new Carbon($parts[1]);- } catch (\Exception $e) { // intentional generic exception+ } catch (Exception $e) { // intentional generic exception$error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());app('log')->error($error);app('log')->error($e->getTraceAsString());@@ -187,7 +187,7 @@ class ReportFormRequest extends FormRequestif (false !== $result && 0 !== $result) {try {$date = new Carbon($parts[0]);- } catch (\Exception $e) { // intentional generic exception+ } catch (Exception $e) { // intentional generic exception$error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());app('log')->error($error);app('log')->error($e->getTraceAsString());