Code cleanup.

This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions

View File

@@ -40,8 +40,6 @@ class ConfigurationController extends Controller
{
/**
* ConfigurationController constructor.
*
*/
public function __construct()
{
@@ -62,6 +60,7 @@ class ConfigurationController extends Controller
* Show configuration index.
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -86,10 +85,6 @@ class ConfigurationController extends Controller
/**
* Store new configuration values.
*
* @param ConfigurationRequest $request
*
* @return RedirectResponse
*/
public function postIndex(ConfigurationRequest $request): RedirectResponse
{

View File

@@ -44,8 +44,6 @@ class HomeController extends Controller
{
/**
* ConfigurationController constructor.
*
*/
public function __construct()
{
@@ -57,6 +55,7 @@ class HomeController extends Controller
* Index of the admin.
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -81,11 +80,6 @@ class HomeController extends Controller
return view('admin.index', compact('title', 'mainTitleIcon', 'email', 'notifications', 'slackUrl'));
}
/**
* @param Request $request
*
* @return RedirectResponse
*/
public function notifications(Request $request): RedirectResponse
{
foreach (config('firefly.admin_notifications') as $item) {
@@ -104,17 +98,19 @@ class HomeController extends Controller
}
session()->flash('success', (string)trans('firefly.notification_settings_saved'));
return redirect(route('admin.index'));
}
/**
* Send a test message to the admin.
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function testMessage()
{
Log::channel('audit')->info('User sends test message.');
/** @var User $user */
$user = auth()->user();
app('log')->debug('Now in testMessage() controller.');

View File

@@ -44,8 +44,6 @@ class LinkController extends Controller
/**
* LinkController constructor.
*
*/
public function __construct()
{
@@ -86,10 +84,7 @@ class LinkController extends Controller
/**
* Delete a link form.
*
* @param Request $request
* @param LinkType $linkType
*
* @return Factory|RedirectResponse|Redirector|View
* @return Factory|Redirector|RedirectResponse|View
*/
public function delete(Request $request, LinkType $linkType)
{
@@ -122,10 +117,7 @@ class LinkController extends Controller
/**
* Actually destroy the link.
*
* @param Request $request
* @param LinkType $linkType
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function destroy(Request $request, LinkType $linkType)
{
@@ -143,10 +135,7 @@ class LinkController extends Controller
/**
* Edit a link form.
*
* @param Request $request
* @param LinkType $linkType
*
* @return Factory|RedirectResponse|Redirector|View
* @return Factory|Redirector|RedirectResponse|View
*/
public function edit(Request $request, LinkType $linkType)
{
@@ -193,8 +182,6 @@ class LinkController extends Controller
/**
* Show a single link.
*
* @param LinkType $linkType
*
* @return Factory|View
*/
public function show(LinkType $linkType)
@@ -211,9 +198,7 @@ class LinkController extends Controller
/**
* Store the new link.
*
* @param LinkTypeFormRequest $request
*
* @return $this|RedirectResponse|Redirector
* @return $this|Redirector|RedirectResponse
*/
public function store(LinkTypeFormRequest $request)
{
@@ -242,10 +227,7 @@ class LinkController extends Controller
/**
* Update an existing link.
*
* @param LinkTypeFormRequest $request
* @param LinkType $linkType
*
* @return $this|RedirectResponse|Redirector
* @return $this|Redirector|RedirectResponse
*/
public function update(LinkTypeFormRequest $request, LinkType $linkType)
{

View File

@@ -62,6 +62,7 @@ class UpdateController extends Controller
* Show page with update options.
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -91,9 +92,7 @@ class UpdateController extends Controller
/**
* Post new settings.
*
* @param Request $request
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function post(Request $request)
{

View File

@@ -69,9 +69,7 @@ class UserController extends Controller
}
/**
* @param User $user
*
* @return Application|Factory|RedirectResponse|Redirector|View
* @return Application|Factory|Redirector|RedirectResponse|View
*/
public function delete(User $user)
{
@@ -86,31 +84,26 @@ class UserController extends Controller
return view('admin.users.delete', compact('user', 'subTitle'));
}
/**
* @param InvitedUser $invitedUser
*
* @return JsonResponse
*/
public function deleteInvite(InvitedUser $invitedUser): JsonResponse
{
app('log')->debug('Will now delete invitation');
if ($invitedUser->redeemed) {
app('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!');
session()->flash('success', trans('firefly.invite_is_deleted', ['address' => $invitedUser->email]));
$this->repository->deleteInvite($invitedUser);
return response()->json(['success' => true]);
}
/**
* Destroy a user.
*
* @param User $user
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function destroy(User $user)
{
@@ -128,8 +121,6 @@ class UserController extends Controller
/**
* Edit user form.
*
* @param User $user
*
* @return Factory|View
*/
public function edit(User $user)
@@ -162,6 +153,7 @@ class UserController extends Controller
* Show index of user manager.
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -190,11 +182,6 @@ class UserController extends Controller
return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers'));
}
/**
* @param InviteUserFormRequest $request
*
* @return RedirectResponse
*/
public function invite(InviteUserFormRequest $request): RedirectResponse
{
$address = (string)$request->get('invited_user');
@@ -210,8 +197,6 @@ class UserController extends Controller
/**
* Show single user.
*
* @param User $user
*
* @return Factory|View
*/
public function show(User $user)
@@ -238,17 +223,14 @@ class UserController extends Controller
/**
* Update single user.
*
* @param UserFormRequest $request
* @param User $user
*
* @return $this|RedirectResponse|Redirector
* @return $this|Redirector|RedirectResponse
*/
public function update(UserFormRequest $request, User $user)
{
app('log')->debug('Actually here');
$data = $request->getUserData();
//var_dump($data);
// var_dump($data);
// update password
if (array_key_exists('password', $data) && '' !== $data['password']) {