Skip to content

Firefly III: a personal finances manager

Fix a bunch of phpstan issues.

James Cole28ff0a84235f
diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon
index d36293328b..72dd142e93 100644
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -39,7 +39,6 @@ parameters:
- identifier: cast.useless
- identifier: argument.type
- identifier: assign.propertyType
- - identifier: return.unusedType
# all errors below I will (probably) never fix.
- identifier: property.unusedType # one false positive
- identifier: varTag.nativeType # dont even know what im supposed to fix.
diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php
index 12b5911e92..08c74626ad 100644
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -126,15 +126,7 @@ final class CreateController extends Controller
]);
}
- /**
- * Store the new account.
- *
- * @return Redirector|RedirectResponse
- *
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
- */
- public function store(AccountFormRequest $request)
+ public function store(AccountFormRequest $request): RedirectResponse
{
$data = $request->getAccountData();
$account = $this->repository->store($data);
diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php
index da31d136b8..78b02d4687 100644
--- a/app/Http/Controllers/Account/DeleteController.php
+++ b/app/Http/Controllers/Account/DeleteController.php
@@ -63,7 +63,7 @@ final class DeleteController extends Controller
/**
* Delete account screen.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function delete(Account $account): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -86,7 +86,7 @@ final class DeleteController extends Controller
/**
* Delete the account.
*/
- public function destroy(Request $request, Account $account): Redirector|RedirectResponse
+ public function destroy(Request $request, Account $account): RedirectResponse
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php
index 035d24c2e6..5f614799a8 100644
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -74,7 +74,7 @@ final class EditController extends Controller
*
* @SuppressWarnings("PHPMD.NPathComplexity")
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function edit(
Request $request,
@@ -181,7 +181,7 @@ final class EditController extends Controller
/**
* Update the account.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function update(AccountFormRequest $request, Account $account)
{
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index d97836c5a8..a9cf2a027b 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -74,7 +74,7 @@ final class ReconcileController extends Controller
/**
* Reconciliation overview.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws FireflyException
* */
@@ -166,7 +166,7 @@ final class ReconcileController extends Controller
*
* @throws DuplicateTransactionException
*/
- public function submit(ReconciliationStoreRequest $request, Account $account, Carbon $start, Carbon $end): Redirector|RedirectResponse
+ public function submit(ReconciliationStoreRequest $request, Account $account, Carbon $start, Carbon $end): RedirectResponse
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index 53aa10c1c1..87aa2a1cf4 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -77,7 +77,7 @@ final class ShowController extends Controller
/**
* Show an account.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws ContainerExceptionInterface
* @throws FireflyException
@@ -197,7 +197,7 @@ final class ShowController extends Controller
/**
* Show an account.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 2f6f87673c..c1d8736738 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -83,7 +83,7 @@ final class LinkController extends Controller
/**
* Delete a link form.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function delete(Request $request, LinkType $linkType): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -116,7 +116,7 @@ final class LinkController extends Controller
/**
* Actually destroy the link.
*/
- public function destroy(Request $request, LinkType $linkType): Redirector|RedirectResponse
+ public function destroy(Request $request, LinkType $linkType): RedirectResponse
{
Log::channel('audit')->info(sprintf('User destroyed link type #%d', $linkType->id));
$name = $linkType->name;
@@ -132,7 +132,7 @@ final class LinkController extends Controller
/**
* Edit a link form.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function edit(Request $request, LinkType $linkType): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -198,7 +198,7 @@ final class LinkController extends Controller
/**
* Store the new link.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function store(LinkTypeFormRequest $request)
{
@@ -227,7 +227,7 @@ final class LinkController extends Controller
/**
* Update an existing link.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function update(LinkTypeFormRequest $request, LinkType $linkType)
{
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 00011f769f..6f6d4829db 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -94,7 +94,7 @@ final class UpdateController extends Controller
/**
* Post new settings.
*/
- public function post(Request $request): Redirector|RedirectResponse
+ public function post(Request $request): RedirectResponse
{
$checkForUpdates = (int) $request->get('check_for_updates');
$channel = $request->get('update_channel');
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 32d5bc4ae6..ee295dffae 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -102,7 +102,7 @@ final class UserController extends Controller
/**
* Destroy a user.
*/
- public function destroy(User $user): Redirector|RedirectResponse
+ public function destroy(User $user): RedirectResponse
{
if ($this->externalIdentity) {
request()->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -230,7 +230,7 @@ final class UserController extends Controller
/**
* Update single user.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function update(UserFormRequest $request, User $user)
{
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 5bc1ae2ff2..fe3f1be502 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -77,7 +77,7 @@ final class AttachmentController extends Controller
/**
* Destroy attachment.
*/
- public function destroy(Request $request, Attachment $attachment): Redirector|RedirectResponse
+ public function destroy(Request $request, Attachment $attachment): RedirectResponse
{
$name = $attachment->filename;
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7e49032b46..cc1cefc42e 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -153,7 +153,7 @@ final class LoginController extends Controller
/**
* Log the user out of the application.
*/
- public function logout(Request $request): Redirector|RedirectResponse|Response
+ public function logout(Request $request): RedirectResponse|Response
{
$authGuard = config('firefly.authentication_guard');
$logoutUrl = config('firefly.custom_logout_url');
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 6c52e02385..3aec4b2b67 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -75,7 +75,7 @@ final class RegisterController extends Controller
}
}
- public function register(Request $request): Redirector|RedirectResponse
+ public function register(Request $request): RedirectResponse
{
$allowRegistration = $this->allowedToRegister();
$inviteCode = (string) $request->get('invite_code');
diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php
index 8c074382c3..032ea7cdf9 100644
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -63,7 +63,7 @@ final class TwoFactorController extends Controller
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
- public function submitMFA(Request $request): Redirector|RedirectResponse
+ public function submitMFA(Request $request): RedirectResponse
{
/** @var array $mfaHistory */
$mfaHistory = Preferences::get('mfa_history', [])->data;
diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php
index 059788943d..43a95ee92c 100644
--- a/app/Http/Controllers/Bill/DeleteController.php
+++ b/app/Http/Controllers/Bill/DeleteController.php
@@ -76,7 +76,7 @@ final class DeleteController extends Controller
/**
* Destroy a bill.
*/
- public function destroy(Request $request, Bill $bill): Redirector|RedirectResponse
+ public function destroy(Request $request, Bill $bill): RedirectResponse
{
$name = $bill->name;
$this->repository->destroy($bill);
diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php
index b312771430..e8e3f1be28 100644
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -77,7 +77,7 @@ final class ShowController extends Controller
/**
* Rescan bills for transactions.
*/
- public function rescan(Request $request, Bill $bill): Redirector|RedirectResponse
+ public function rescan(Request $request, Bill $bill): RedirectResponse
{
$total = 0;
if (false === $bill->active) {
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 9aac6714db..92f809c6ea 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -103,7 +103,7 @@ final class BudgetLimitController extends Controller
return view('budgets.budget-limits.create', ['start' => $start, 'end' => $end, 'currencies' => $currencies, 'budget' => $budget]);
}
- public function delete(BudgetLimit $budgetLimit): Redirector|RedirectResponse
+ public function delete(BudgetLimit $budgetLimit): RedirectResponse
{
$this->blRepository->destroyBudgetLimit($budgetLimit);
session()->flash('success', trans('firefly.deleted_bl'));
diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php
index 5a6403eb9c..f8d7d198da 100644
--- a/app/Http/Controllers/Budget/DeleteController.php
+++ b/app/Http/Controllers/Budget/DeleteController.php
@@ -76,7 +76,7 @@ final class DeleteController extends Controller
/**
* Destroys a budget.
*/
- public function destroy(Request $request, Budget $budget): Redirector|RedirectResponse
+ public function destroy(Request $request, Budget $budget): RedirectResponse
{
$name = $budget->name;
$this->repository->destroy($budget);
diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php
index 6243cc5729..3d4b01570b 100644
--- a/app/Http/Controllers/Category/CreateController.php
+++ b/app/Http/Controllers/Category/CreateController.php
@@ -81,7 +81,7 @@ final class CreateController extends Controller
/**
* Store new category.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*
* @throws FireflyException
*/
diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php
index 095ccdfc24..1e337f849c 100644
--- a/app/Http/Controllers/Category/DeleteController.php
+++ b/app/Http/Controllers/Category/DeleteController.php
@@ -76,7 +76,7 @@ final class DeleteController extends Controller
/**
* Destroy a category.
*/
- public function destroy(Request $request, Category $category): Redirector|RedirectResponse
+ public function destroy(Request $request, Category $category): RedirectResponse
{
$name = $category->name;
$this->repository->destroy($category);
diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php
index 295443fe1d..490a1b097c 100644
--- a/app/Http/Controllers/Category/EditController.php
+++ b/app/Http/Controllers/Category/EditController.php
@@ -85,7 +85,7 @@ final class EditController extends Controller
/**
* Update category.
*/
- public function update(CategoryFormRequest $request, Category $category): Redirector|RedirectResponse
+ public function update(CategoryFormRequest $request, Category $category): RedirectResponse
{
$data = $request->getCategoryData();
$this->repository->update($category, $data);
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index 6c8b317340..fcff7d4bf4 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -104,7 +104,7 @@ final class DebugController extends Controller
*
* @throws FireflyException
*/
- public function flush(Request $request): Redirector|RedirectResponse
+ public function flush(Request $request): RedirectResponse
{
Preferences::mark();
$request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range', 'temp-mfa-secret', 'temp-mfa-codes']);
@@ -267,7 +267,7 @@ final class DebugController extends Controller
/**
* Flash all types of messages.
*/
- public function testFlash(Request $request): Redirector|RedirectResponse
+ public function testFlash(Request $request): RedirectResponse
{
$request->session()->flash('success', 'This is a success message.');
$request->session()->flash('info', 'This is an info message.');
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 351c7b76c7..652a3a4b25 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -61,7 +61,7 @@ final class NewUserController extends Controller
/**
* Form the user gets when he has no data in the system.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function index(): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -83,7 +83,7 @@ final class NewUserController extends Controller
/**
* Store his new settings.
*/
- public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository): Redirector|RedirectResponse
+ public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository): RedirectResponse
{
$language = $request->convertString('language');
if (!array_key_exists($language, config('firefly.languages'))) {
diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php
index 4204e90808..05f2a99b7a 100644
--- a/app/Http/Controllers/ObjectGroup/EditController.php
+++ b/app/Http/Controllers/ObjectGroup/EditController.php
@@ -79,7 +79,7 @@ final class EditController extends Controller
* Update a piggy bank.
*
*/
- public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup): Redirector|RedirectResponse
+ public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup): RedirectResponse
{
$data = $request->getObjectGroupData();
$piggyBank = $this->repository->update($objectGroup, $data);
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php
index ee3378a5ea..03e908e816 100644
--- a/app/Http/Controllers/PiggyBank/CreateController.php
+++ b/app/Http/Controllers/PiggyBank/CreateController.php
@@ -90,7 +90,7 @@ final class CreateController extends Controller
/**
* Store a new piggy bank.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*
* @throws FireflyException
*/
diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php
index 3e3b419620..6bba3f3bd6 100644
--- a/app/Http/Controllers/PiggyBank/EditController.php
+++ b/app/Http/Controllers/PiggyBank/EditController.php
@@ -120,7 +120,7 @@ final class EditController extends Controller
/**
* Update a piggy bank.
*/
- public function update(PiggyBankUpdateRequest $request, PiggyBank $piggyBank): Redirector|RedirectResponse
+ public function update(PiggyBankUpdateRequest $request, PiggyBank $piggyBank): RedirectResponse
{
$data = $request->getPiggyBankData();
$piggyBank = $this->piggyRepos->update($piggyBank, $data);
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index ab54e5731a..1e29905f47 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -227,7 +227,7 @@ final class PreferencesController extends Controller
* @SuppressWarnings("PHPMD.ExcessiveMethodLength")
* @SuppressWarnings("PHPMD.NPathComplexity")
*/
- public function postIndex(PreferencesRequest $request): Redirector|RedirectResponse
+ public function postIndex(PreferencesRequest $request): RedirectResponse
{
Log::debug('postIndex for preferences.');
// front page accounts
diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php
index f9acb164ae..613f690515 100644
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -99,7 +99,7 @@ final class MfaController extends Controller
return view('profile.mfa.backup-codes-intro');
}
- public function backupCodesPost(ExistingTokenFormRequest $request): Redirector|RedirectResponse|View
+ public function backupCodesPost(ExistingTokenFormRequest $request): RedirectResponse|View
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -150,7 +150,7 @@ final class MfaController extends Controller
/**
* Delete 2FA routine.
*/
- public function disableMFAPost(ExistingTokenFormRequest $request): Redirector|RedirectResponse
+ public function disableMFAPost(ExistingTokenFormRequest $request): RedirectResponse
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -186,7 +186,7 @@ final class MfaController extends Controller
/**
* Enable 2FA screen.
*/
- public function enableMFA(Request $request): Redirector|RedirectResponse|View
+ public function enableMFA(Request $request): RedirectResponse|View
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -221,7 +221,7 @@ final class MfaController extends Controller
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
- public function enableMFAPost(TokenFormRequest $request): Redirector|RedirectResponse
+ public function enableMFAPost(TokenFormRequest $request): RedirectResponse
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 76670a6c2a..7c20a92da7 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -107,7 +107,7 @@ final class ProfileController extends Controller
/**
* Change your password.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function changePassword(Request $request): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -129,7 +129,7 @@ final class ProfileController extends Controller
*
* @throws FireflyException
*/
- public function confirmEmailChange(UserRepositoryInterface $repository, #[SensitiveParameter] string $token): Redirector|RedirectResponse
+ public function confirmEmailChange(UserRepositoryInterface $repository, #[SensitiveParameter] string $token): RedirectResponse
{
if (!$this->internalAuth) {
throw new FireflyException(trans('firefly.external_user_mgt_disabled'));
@@ -284,7 +284,7 @@ final class ProfileController extends Controller
/**
* Submit change password form.
*/
- public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository): Redirector|RedirectResponse
+ public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository): RedirectResponse
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -316,7 +316,7 @@ final class ProfileController extends Controller
/**
* Submit delete account.
*/
- public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request): Redirector|RedirectResponse
+ public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request): RedirectResponse
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -345,7 +345,7 @@ final class ProfileController extends Controller
*
* @throws AuthenticationException
*/
- public function postLogoutOtherSessions(Request $request): Redirector|RedirectResponse
+ public function postLogoutOtherSessions(Request $request): RedirectResponse
{
if (!$this->internalAuth) {
session()->flash('info', (string) trans('firefly.external_auth_disabled'));
@@ -369,7 +369,7 @@ final class ProfileController extends Controller
*
* @throws Exception
*/
- public function regenerate(Request $request): Redirector|RedirectResponse
+ public function regenerate(Request $request): RedirectResponse
{
if (!$this->internalAuth) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -391,7 +391,7 @@ final class ProfileController extends Controller
*
* @throws FireflyException
*/
- public function undoEmailChange(UserRepositoryInterface $repository, #[SensitiveParameter] string $token, string $hash): Redirector|RedirectResponse
+ public function undoEmailChange(UserRepositoryInterface $repository, #[SensitiveParameter] string $token, string $hash): RedirectResponse
{
if (!$this->internalAuth) {
throw new FireflyException(trans('firefly.external_user_mgt_disabled'));
diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php
index c220ee6f5e..56d1781f97 100644
--- a/app/Http/Controllers/Recurring/CreateController.php
+++ b/app/Http/Controllers/Recurring/CreateController.php
@@ -222,7 +222,7 @@ final class CreateController extends Controller
/**
* Store a recurring transaction.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*
* @throws FireflyException
*/
diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php
index 26b3e585fe..da06d2a63f 100644
--- a/app/Http/Controllers/Recurring/DeleteController.php
+++ b/app/Http/Controllers/Recurring/DeleteController.php
@@ -78,7 +78,7 @@ final class DeleteController extends Controller
/**
* Destroy the recurring transaction.
*/
- public function destroy(RecurringRepositoryInterface $repository, Request $request, Recurrence $recurrence): Redirector|RedirectResponse
+ public function destroy(RecurringRepositoryInterface $repository, Request $request, Recurrence $recurrence): RedirectResponse
{
$repository->destroy($recurrence);
$request->session()->flash('success', (string) trans('firefly.recurrence_deleted', ['title' => $recurrence->title]));
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 625e802286..f62b70d291 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -176,7 +176,7 @@ final class EditController extends Controller
/**
* Update the recurring transaction.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*
* @throws FireflyException
*/
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index be2ae16b8d..0181ab2eb3 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -289,7 +289,7 @@ final class ReportController extends Controller
*
* @throws FireflyException
*/
- public function postIndex(ReportFormRequest $request): Redirector|RedirectResponse|View
+ public function postIndex(ReportFormRequest $request): RedirectResponse|View
{
// report type:
$reportType = $request->get('report_type');
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index a0d77f7765..bdcedba501 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -268,7 +268,7 @@ final class CreateController extends Controller
/**
* Store the new rule.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function store(RuleFormRequest $request)
{
diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php
index 18fc2be5ad..6426e031ab 100644
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -154,7 +154,7 @@ final class EditController extends Controller
/**
* Update the rule.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function update(RuleFormRequest $request, Rule $rule)
{
diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php
index 030a0279c4..0de5cf5a2e 100644
--- a/app/Http/Controllers/RuleGroup/CreateController.php
+++ b/app/Http/Controllers/RuleGroup/CreateController.php
@@ -80,7 +80,7 @@ final class CreateController extends Controller
/**
* Store the rule group.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function store(RuleGroupFormRequest $request)
{
diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php
index 2a10388da0..1dca508078 100644
--- a/app/Http/Controllers/RuleGroup/DeleteController.php
+++ b/app/Http/Controllers/RuleGroup/DeleteController.php
@@ -77,7 +77,7 @@ final class DeleteController extends Controller
/**
* Actually destroy the rule group.
*/
- public function destroy(Request $request, RuleGroup $ruleGroup): Redirector|RedirectResponse
+ public function destroy(Request $request, RuleGroup $ruleGroup): RedirectResponse
{
$title = $ruleGroup->title;
diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php
index 018183191c..28c973b564 100644
--- a/app/Http/Controllers/RuleGroup/EditController.php
+++ b/app/Http/Controllers/RuleGroup/EditController.php
@@ -113,7 +113,7 @@ final class EditController extends Controller
/**
* Update the rule group.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function update(RuleGroupFormRequest $request, RuleGroup $ruleGroup)
{
diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php
index 029a697533..dbd8a2e02e 100644
--- a/app/Http/Controllers/Transaction/BulkController.php
+++ b/app/Http/Controllers/Transaction/BulkController.php
@@ -91,7 +91,7 @@ final class BulkController extends Controller
/**
* Update all journals.
*/
- public function update(BulkEditJournalRequest $request): Redirector|RedirectResponse
+ public function update(BulkEditJournalRequest $request): RedirectResponse
{
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 53f1ed5438..266f2256b6 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -84,7 +84,7 @@ final class ConvertController extends Controller
/**
* Show overview of a to be converted transaction.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws Exception
*/
@@ -141,7 +141,7 @@ final class ConvertController extends Controller
/**
* Do the conversion.
*
- * @return Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function postIndex(Request $request, TransactionType $destinationType, TransactionGroup $group)
{
diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php
index 26f60809be..36618791b6 100644
--- a/app/Http/Controllers/Transaction/DeleteController.php
+++ b/app/Http/Controllers/Transaction/DeleteController.php
@@ -95,7 +95,7 @@ final class DeleteController extends Controller
/**
* Actually destroys the journal.
*/
- public function destroy(TransactionGroup $group): Redirector|RedirectResponse
+ public function destroy(TransactionGroup $group): RedirectResponse
{
Log::debug(sprintf('Now in %s(#%d).', __METHOD__, $group->id));
if (!$this->isEditableGroup($group)) {
diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php
index f9feb24a58..85002b9229 100644
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -68,7 +68,7 @@ final class EditController extends Controller
}
/**
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 08f9409fd2..2e42cce48b 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -81,7 +81,7 @@ final class LinkController extends Controller
/**
* Actually destroy it.
*/
- public function destroy(TransactionJournalLink $link): Redirector|RedirectResponse
+ public function destroy(TransactionJournalLink $link): RedirectResponse
{
$this->repository->destroyLink($link);
@@ -104,7 +104,7 @@ final class LinkController extends Controller
/**
* Store a new link.
*/
- public function store(JournalLinkRequest $request, TransactionJournal $journal): Redirector|RedirectResponse
+ public function store(JournalLinkRequest $request, TransactionJournal $journal): RedirectResponse
{
$linkInfo = $request->getLinkInfo();
@@ -139,7 +139,7 @@ final class LinkController extends Controller
/**
* Switch link from A <> B to B <> A.
*/
- public function switchLink(Request $request): Redirector|RedirectResponse
+ public function switchLink(Request $request): RedirectResponse
{
$linkId = (int) $request->get('id');
$this->repository->switchLinkById($linkId);
diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index eafc6e973e..2bd51a051c 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -85,7 +85,7 @@ final class MassController extends Controller
return view('transactions.mass.delete', ['journals' => $journals, 'subTitle' => $subTitle]);
}
- public function destroy(MassDeleteJournalRequest $request): Redirector | RedirectResponse
+ public function destroy(MassDeleteJournalRequest $request): RedirectResponse
{
Log::debug(sprintf('Now in %s', __METHOD__));
$ids = $request->input('confirm_mass_delete');
@@ -171,7 +171,7 @@ final class MassController extends Controller
*
* @throws FireflyException
*/
- public function update(MassEditJournalRequest $request): Redirector | RedirectResponse
+ public function update(MassEditJournalRequest $request): RedirectResponse
{
$journalIds = $request->get('journals');
if (!is_array($journalIds)) {
diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.php
index 542fc18f11..321b58a6c0 100644
--- a/app/Http/Controllers/TransactionCurrency/CreateController.php
+++ b/app/Http/Controllers/TransactionCurrency/CreateController.php
@@ -66,7 +66,7 @@ final class CreateController extends Controller
/**
* Create a currency.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function create(Request $request): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -95,7 +95,7 @@ final class CreateController extends Controller
/**
* Store new currency.
*
- * @return $this|Redirector|RedirectResponse
+ * @return RedirectResponse
*/
public function store(CurrencyFormRequest $request)
{
diff --git a/app/Http/Controllers/TransactionCurrency/DeleteController.php b/app/Http/Controllers/TransactionCurrency/DeleteController.php
index b489d87048..02369fa1df 100644
--- a/app/Http/Controllers/TransactionCurrency/DeleteController.php
+++ b/app/Http/Controllers/TransactionCurrency/DeleteController.php
@@ -65,7 +65,7 @@ final class DeleteController extends Controller
/**
* Deletes a currency.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*
* @throws FireflyException
*/
@@ -102,7 +102,7 @@ final class DeleteController extends Controller
*
* @throws FireflyException
*/
- public function destroy(Request $request, TransactionCurrency $currency): Redirector|RedirectResponse
+ public function destroy(Request $request, TransactionCurrency $currency): RedirectResponse
{
/** @var User $user */
$user = auth()->user();
diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.php
index 3d3fbe7852..26c62bf1d1 100644
--- a/app/Http/Controllers/TransactionCurrency/EditController.php
+++ b/app/Http/Controllers/TransactionCurrency/EditController.php
@@ -64,7 +64,7 @@ final class EditController extends Controller
/**
* Edit a currency.
*
- * @return Factory|Redirector|RedirectResponse|View
+ * @return Factory|RedirectResponse|View
*/
public function edit(Request $request, TransactionCurrency $currency): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
{
@@ -110,7 +110,7 @@ final class EditController extends Controller
*
* @throws FireflyException
*/
- public function update(CurrencyFormRequest $request, TransactionCurrency $currency): Redirector|RedirectResponse
+ public function update(CurrencyFormRequest $request, TransactionCurrency $currency): RedirectResponse
{
/** @var User $user */
$user = auth()->user();
diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php
index cbf621a514..6c51c16792 100644
--- a/app/Support/Twig/Translation.php
+++ b/app/Support/Twig/Translation.php
@@ -50,9 +50,9 @@ class Translation extends AbstractExtension
{
return new TwigFunction(
'journalLinkTranslation',
- static function (string $direction, string $original): array|string|Translator {
+ static function (string $direction, string $original): string {
$key = sprintf('firefly.%s_%s', $original, $direction);
- $translation = trans($key);
+ $translation = (string) trans($key);
if ($key === $translation) {
return $original;
}
@@ -65,8 +65,8 @@ class Translation extends AbstractExtension
public function laravelTranslation(): TwigFunction
{
- return new TwigFunction('__', static function (string $key): array|string|Translator {
- $translation = trans($key);
+ return new TwigFunction('__', static function (string $key): string {
+ $translation = (string) trans($key);
if ($key === $translation) {
return $key;
}
diff --git a/app/User.php b/app/User.php
index 0e32d1a835..0d59c9030f 100644
--- a/app/User.php
+++ b/app/User.php
@@ -73,6 +73,9 @@ use NotificationChannels\Pushover\PushoverReceiver;
use SensitiveParameter;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+/**
+ * @property UserGroup|null $userGroup
+ */
class User extends Authenticatable
{
use HasApiTokens;