kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix code quality with rector [skip ci]

Browse Source
This commit is contained in:
James Cole
2025-11-09 09:07:14 +01:00
parent 38691d6fdf
commit d2610be790
262 changed files with 873 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Admin/UserController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use Illuminate\Support\Facades\Log;
use FireflyIII\Events\Admin\InvitationCreated;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
@@ -72,7 +73,7 @@ class UserController extends Controller
/**
* @return Application|Factory|Redirector|RedirectResponse|View
*/
public function delete(User $user)
public function delete(User $user): Redirector|RedirectResponse|Factory|\Illuminate\Contracts\View\View
{
if ($this->externalIdentity) {
request()->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -82,19 +83,19 @@ class UserController extends Controller
$subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]);
return view('settings.users.delete', compact('user', 'subTitle'));
return view('settings.users.delete', ['user' => $user, 'subTitle' => $subTitle]);
}
public function deleteInvite(InvitedUser $invitedUser): JsonResponse
{
app('log')->debug('Will now delete invitation');
Log::debug('Will now delete invitation');
if (true === $invitedUser->redeemed) {
app('log')->debug('Is already redeemed.');
Log::debug('Is already redeemed.');
session()->flash('error', trans('firefly.invite_is_already_redeemed', ['address' => $invitedUser->email]));
return response()->json(['success' => false]);
}
app('log')->debug('Delete!');
Log::debug('Delete!');
session()->flash('success', trans('firefly.invite_is_deleted', ['address' => $invitedUser->email]));
$this->repository->deleteInvite($invitedUser);
@@ -103,10 +104,8 @@ class UserController extends Controller
/**
* Destroy a user.
*
* @return Redirector|RedirectResponse
*/
public function destroy(User $user)
public function destroy(User $user): Redirector|RedirectResponse
{
if ($this->externalIdentity) {
request()->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
@@ -124,7 +123,7 @@ class UserController extends Controller
*
* @return Factory|View
*/
public function edit(User $user)
public function edit(User $user): Factory|\Illuminate\Contracts\View\View
{
$canEditDetails = true;
if ($this->externalIdentity) {
@@ -147,7 +146,7 @@ class UserController extends Controller
'email_changed' => (string) trans('firefly.block_code_email_changed'),
];
return view('settings.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
return view('settings.users.edit', ['user' => $user, 'canEditDetails' => $canEditDetails, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'codes' => $codes, 'currentUser' => $currentUser, 'isAdmin' => $isAdmin]);
}
/**
@@ -159,7 +158,7 @@ class UserController extends Controller
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function index()
public function index(): Factory|\Illuminate\Contracts\View\View
{
$subTitle = (string) trans('firefly.user_administration');
$subTitleIcon = 'fa-users';
@@ -181,7 +180,7 @@ class UserController extends Controller
}
);
return view('settings.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers'));
return view('settings.users.index', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'users' => $users, 'allowInvites' => $allowInvites, 'invitedUsers' => $invitedUsers]);
}
public function invite(InviteUserFormRequest $request): RedirectResponse
@@ -201,7 +200,7 @@ class UserController extends Controller
*
* @return Factory|View
*/
public function show(User $user)
public function show(User $user): Factory|\Illuminate\Contracts\View\View
{
$title = (string) trans('firefly.system_settings');
$mainTitleIcon = 'fa-hand-spock-o';
@@ -211,14 +210,7 @@ class UserController extends Controller
return view(
'settings.users.show',
compact(
'title',
'mainTitleIcon',
'subTitle',
'subTitleIcon',
'information',
'user'
)
['title' => $title, 'mainTitleIcon' => $mainTitleIcon, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'information' => $information, 'user' => $user]
);
}
@@ -229,7 +221,7 @@ class UserController extends Controller
*/
public function update(UserFormRequest $request, User $user)
{
app('log')->debug('Actually here');
Log::debug('Actually here');
$data = $request->getUserData();
// var_dump($data);