From e98284fff5f859a4c582ddcc98bb4b8fdbb7aa11 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 4 Jul 2024 20:48:35 +0100 Subject: [PATCH] Modernized helpers and use statements Signed-off-by: snipe --- .../Accessories/AccessoriesController.php | 12 ++++++------ .../Accessories/AccessoryCheckinController.php | 4 ++-- .../Accessories/AccessoryCheckoutController.php | 4 ++-- .../Controllers/Account/AcceptanceController.php | 8 ++++---- app/Http/Controllers/Api/AccessoriesController.php | 2 +- app/Http/Controllers/Api/AssetFilesController.php | 2 +- app/Http/Controllers/Api/AssetsController.php | 8 ++++---- app/Http/Controllers/Api/ComponentsController.php | 4 ++-- app/Http/Controllers/Api/ConsumablesController.php | 4 ++-- app/Http/Controllers/Api/CustomFieldsController.php | 2 +- .../Controllers/Api/CustomFieldsetsController.php | 4 ++-- app/Http/Controllers/Api/DepartmentsController.php | 2 +- app/Http/Controllers/Api/GroupsController.php | 2 +- app/Http/Controllers/Api/LabelsController.php | 4 ++-- app/Http/Controllers/Api/LicenseSeatsController.php | 2 +- app/Http/Controllers/Api/ManufacturersController.php | 2 +- app/Http/Controllers/Api/ProfileController.php | 10 +++++----- app/Http/Controllers/Api/ReportsController.php | 2 +- app/Http/Controllers/Api/SettingsController.php | 8 ++++---- app/Http/Controllers/Api/UsersController.php | 12 ++++++------ 20 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index 81d5d692c5..f335ccf37a 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -27,7 +27,7 @@ class AccessoriesController extends Controller * @author [A. Gianotto] [] * @see AccessoriesController::getDatatable() method that generates the JSON response * @since [v1.0] - * @return View + * @return \Illuminate\Contracts\View\View * @throws \Illuminate\Auth\Access\AuthorizationException */ public function index() @@ -41,7 +41,7 @@ class AccessoriesController extends Controller * Returns a view with a form to create a new Accessory. * * @author [A. Gianotto] [] - * @return View + * @return \Illuminate\Contracts\View\View * @throws \Illuminate\Auth\Access\AuthorizationException */ public function create() @@ -80,7 +80,7 @@ class AccessoriesController extends Controller $accessory->purchase_date = request('purchase_date'); $accessory->purchase_cost = request('purchase_cost'); $accessory->qty = request('qty'); - $accessory->user_id = Auth::user()->id; + $accessory->user_id = auth()->id(); $accessory->supplier_id = request('supplier_id'); $accessory->notes = request('notes'); @@ -100,7 +100,7 @@ class AccessoriesController extends Controller * * @author [A. Gianotto] [] * @param int $accessoryId - * @return View + * @return \Illuminate\Contracts\View\View * @throws \Illuminate\Auth\Access\AuthorizationException */ public function edit($accessoryId = null) @@ -122,7 +122,7 @@ class AccessoriesController extends Controller * @author [J. Vinsmoke] * @param int $accessoryId * @since [v6.0] - * @return View + * @return \Illuminate\Contracts\View\View */ public function getClone($accessoryId = null) { @@ -243,7 +243,7 @@ class AccessoriesController extends Controller * @param int $accessoryID * @see AccessoriesController::getDataView() method that generates the JSON response * @since [v1.0] - * @return View + * @return \Illuminate\Contracts\View\View * @throws \Illuminate\Auth\Access\AuthorizationException */ public function show($accessoryID = null) diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php index 29c6065057..a1af205945 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php @@ -19,7 +19,7 @@ class AccessoryCheckinController extends Controller * @param Request $request * @param int $accessoryUserId * @param string $backto - * @return View + * @return \Illuminate\Contracts\View\View * @internal param int $accessoryId * @throws \Illuminate\Auth\Access\AuthorizationException */ @@ -70,7 +70,7 @@ class AccessoryCheckinController extends Controller if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) { $return_to = e($accessory_user->assigned_to); - event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note'), $checkin_at)); + event(new CheckoutableCheckedIn($accessory, User::find($return_to), auth()->user(), $request->input('note'), $checkin_at)); return redirect()->route('accessories.show', $accessory->id)->with('success', trans('admin/accessories/message.checkin.success')); } diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php index 679b8d4251..c980e29efd 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php @@ -19,7 +19,7 @@ class AccessoryCheckoutController extends Controller * * @author [A. Gianotto] [] * @param int $id - * @return View + * @return \Illuminate\Contracts\View\View * @throws \Illuminate\Auth\Access\AuthorizationException */ public function create($id) @@ -95,7 +95,7 @@ class AccessoryCheckoutController extends Controller DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first(); - event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note'))); + event(new CheckoutableCheckedOut($accessory, $user, auth()->user(), $request->input('note'))); // Redirect to the new accessory page return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success')); diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index fafb6aeda5..6ea00fd9d0 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -36,11 +36,11 @@ class AcceptanceController extends Controller /** * Show a listing of pending checkout acceptances for the current user * - * @return View + * @return \Illuminate\Contracts\View\View */ public function index() { - $acceptances = CheckoutAcceptance::forUser(Auth::user())->pending()->get(); + $acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get(); return view('account/accept.index', compact('acceptances')); } @@ -64,7 +64,7 @@ class AcceptanceController extends Controller return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted')); } - if (! $acceptance->isCheckedOutTo(Auth::user())) { + if (! $acceptance->isCheckedOutTo(auth()->user())) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } @@ -94,7 +94,7 @@ class AcceptanceController extends Controller return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted')); } - if (! $acceptance->isCheckedOutTo(Auth::user())) { + if (! $acceptance->isCheckedOutTo(auth()->user())) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index eb74a9e0f0..ad8995e4dd 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -303,7 +303,7 @@ class AccessoriesController extends Controller 'note' => $request->get('note'), ]); - event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note'))); + event(new CheckoutableCheckedOut($accessory, $user, auth()->user(), $request->input('note'))); return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success'))); } diff --git a/app/Http/Controllers/Api/AssetFilesController.php b/app/Http/Controllers/Api/AssetFilesController.php index d8bc5e3841..500c241f9f 100644 --- a/app/Http/Controllers/Api/AssetFilesController.php +++ b/app/Http/Controllers/Api/AssetFilesController.php @@ -15,7 +15,7 @@ use App\Models\AssetModel; use App\Models\Actionlog; use \Illuminate\Support\Facades\Auth; use Carbon\Carbon; -use DB; +use Illuminate\Support\Facades\DB; use Illuminate\Http\Request; use App\Http\Requests\UploadFileRequest; use Illuminate\Support\Facades\Log; diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index dc20588b75..41f2e9bf2b 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -638,7 +638,7 @@ class AssetsController extends Controller $target = Location::find(request('assigned_location')); } if (isset($target)) { - $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name'))); + $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name'))); } if ($asset->image) { @@ -729,7 +729,7 @@ class AssetsController extends Controller } if (isset($target)) { - $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location); + $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location); } if ($asset->image) { @@ -895,7 +895,7 @@ class AssetsController extends Controller // $asset->location_id = $target->rtd_location_id; // } - if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) { + if ($asset->checkOut($target, auth()->user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) { return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success'))); } @@ -976,7 +976,7 @@ class AssetsController extends Controller }); if ($asset->save()) { - event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues)); + event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues)); return response()->json(Helper::formatStandardApiResponse('success', [ 'asset_tag'=> e($asset->asset_tag), diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index 4cf8173eac..fc2ad9cfca 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -277,7 +277,7 @@ class ComponentsController extends Controller 'component_id' => $component->id, 'created_at' => \Carbon::now(), 'assigned_qty' => $request->get('assigned_qty', 1), - 'user_id' => \Auth::id(), + 'user_id' => auth()->id(), 'asset_id' => $request->get('assigned_to'), 'note' => $request->get('note'), ]); @@ -346,7 +346,7 @@ class ComponentsController extends Controller $asset = Asset::find($component_assets->asset_id); - event(new CheckoutableCheckedIn($component, $asset, \Auth::user(), $request->input('note'), \Carbon::now())); + event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), \Carbon::now())); return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkin.success'))); diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php index 956a176580..65033e0002 100644 --- a/app/Http/Controllers/Api/ConsumablesController.php +++ b/app/Http/Controllers/Api/ConsumablesController.php @@ -252,7 +252,7 @@ class ConsumablesController extends Controller * @author [A. Gutierrez] [] * @param int $id * @since [v4.9.5] - * @return JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function checkout(Request $request, $id) { @@ -293,7 +293,7 @@ class ConsumablesController extends Controller ] ); - event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note'))); + event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note'))); return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success'))); diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.php index 470d672ccc..ca00d00077 100644 --- a/app/Http/Controllers/Api/CustomFieldsController.php +++ b/app/Http/Controllers/Api/CustomFieldsController.php @@ -33,7 +33,7 @@ class CustomFieldsController extends Controller * @author [V. Cordes] [] * @param int $id * @since [v4.1.10] - * @return View + * @return \Illuminate\Contracts\View\View */ public function show($id) { diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php index 2fa22f5491..0034ec0386 100644 --- a/app/Http/Controllers/Api/CustomFieldsetsController.php +++ b/app/Http/Controllers/Api/CustomFieldsetsController.php @@ -30,7 +30,7 @@ class CustomFieldsetsController extends Controller * @author [Josh Gibson] * @param int $id * @since [v1.8] - * @return View + * @return \Illuminate\Contracts\View\View */ public function index() { @@ -46,7 +46,7 @@ class CustomFieldsetsController extends Controller * @author [Josh Gibson] * @param int $id * @since [v1.8] - * @return View + * @return \Illuminate\Contracts\View\View */ public function show($id) { diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index 485e614b25..662051439a 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -100,7 +100,7 @@ class DepartmentsController extends Controller $department->fill($request->all()); $department = $request->handleImages($department); - $department->user_id = Auth::user()->id; + $department->user_id = auth()->id(); $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null); if ($department->save()) { diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index f1eafd49dc..9b5e822b3f 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -67,7 +67,7 @@ class GroupsController extends Controller $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions); $group->name = $request->input('name'); - $group->created_by = Auth::user()->id; + $group->created_by = auth()->id(); $group->permissions = json_encode($request->input('permissions', $groupPermissions)); if ($group->save()) { diff --git a/app/Http/Controllers/Api/LabelsController.php b/app/Http/Controllers/Api/LabelsController.php index 126fe99438..9366161c8e 100644 --- a/app/Http/Controllers/Api/LabelsController.php +++ b/app/Http/Controllers/Api/LabelsController.php @@ -16,7 +16,7 @@ class LabelsController extends Controller * Returns JSON listing of all labels. * * @author Grant Le Roux - * @return JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function index(Request $request) { @@ -50,7 +50,7 @@ class LabelsController extends Controller * * @author Grant Le Roux * @param string $labelName - * @return JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function show(string $labelName) { diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 317b098768..f15792cdcd 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -110,7 +110,7 @@ class LicenseSeatsController extends Controller // attempt to update the license seat $licenseSeat->fill($request->all()); - $licenseSeat->user_id = Auth::user()->id; + $licenseSeat->user_id = auth()->id(); // check if this update is a checkin operation // 1. are relevant fields touched at all? diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index 6b5a130229..36fbe5354c 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -186,7 +186,7 @@ class ManufacturersController extends Controller $logaction->item_type = Manufacturer::class; $logaction->item_id = $manufacturer->id; $logaction->created_at = date('Y-m-d H:i:s'); - $logaction->user_id = Auth::user()->id; + $logaction->user_id = auth()->id(); $logaction->logaction('restore'); return response()->json(Helper::formatStandardApiResponse('success', trans('admin/manufacturers/message.restore.success')), 200); diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php index b6752dd1ed..41adbd5845 100644 --- a/app/Http/Controllers/Api/ProfileController.php +++ b/app/Http/Controllers/Api/ProfileController.php @@ -47,7 +47,7 @@ class ProfileController extends Controller */ public function requestedAssets() { - $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get(); + $checkoutRequests = CheckoutRequest::where('user_id', '=', auth()->id())->get(); $results = array(); $show_field = array(); @@ -106,10 +106,10 @@ class ProfileController extends Controller $accessTokenName = $request->input('name', 'Auth Token'); - if ($accessToken = Auth::user()->createToken($accessTokenName)->accessToken) { + if ($accessToken = auth()->user()->createToken($accessTokenName)->accessToken) { // Get the ID so we can return that with the payload - $token = DB::table('oauth_access_tokens')->where('user_id', '=', Auth::user()->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first(); + $token = DB::table('oauth_access_tokens')->where('user_id', '=', auth()->id())->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first(); $accessTokenData['id'] = $token->id; $accessTokenData['token'] = $accessToken; $accessTokenData['name'] = $accessTokenName; @@ -135,7 +135,7 @@ class ProfileController extends Controller } $token = $this->tokenRepository->findForUser( - $tokenId, Auth::user()->getAuthIdentifier() + $tokenId, auth()->user()->getAuthIdentifier() ); if (is_null($token)) { @@ -163,7 +163,7 @@ class ProfileController extends Controller abort(403); } - $tokens = $this->tokenRepository->forUser(Auth::user()->getAuthIdentifier()); + $tokens = $this->tokenRepository->forUser(auth()->user()->getAuthIdentifier()); $token_values = $tokens->load('client')->filter(function ($token) { return $token->client->personal_access_client && ! $token->revoked; })->values(); diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index 8761c9442b..61e777febc 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -14,7 +14,7 @@ class ReportsController extends Controller * * @author [A. Gianotto] [] * @since [v4.0] - * @return View + * @return \Illuminate\Contracts\View\View */ public function index(Request $request) { diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index d9059988f2..5be5a72afb 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -148,7 +148,7 @@ class SettingsController extends Controller * * @author [A. Gianotto] [] * @since [v3.0] - * @return JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function ajaxTestEmail() { @@ -170,7 +170,7 @@ class SettingsController extends Controller * * @author [A. Gianotto] [] * @since [v5.0.0] - * @return JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function purgeBarcodes() { @@ -276,7 +276,7 @@ class SettingsController extends Controller * exhausts memory on larger files. * * @author [A. Gianotto] - * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse */ public function downloadBackup($file) { @@ -296,7 +296,7 @@ class SettingsController extends Controller * * @author [A. Gianotto] * @since [v6.3.1] - * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse */ public function downloadLatestBackup() { diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 6a96fb7282..2f60f84826 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -365,13 +365,13 @@ class UsersController extends Controller $user = new User; $user->fill($request->all()); - $user->created_by = Auth::user()->id; + $user->created_by = auth()->id(); if ($request->has('permissions')) { $permissions_array = $request->input('permissions'); // Strip out the superuser permission if the API user isn't a superadmin - if (! Auth::user()->isSuperUser()) { + if (! auth()->user()->isSuperUser()) { unset($permissions_array['superuser']); } $user->permissions = $permissions_array; @@ -468,7 +468,7 @@ class UsersController extends Controller $permissions_array = $request->input('permissions'); // Strip out the individual superuser permission if the API user isn't a superadmin - if (!Auth::user()->isSuperUser()) { + if (!auth()->user()->isSuperUser()) { unset($permissions_array['superuser']); } @@ -486,7 +486,7 @@ class UsersController extends Controller if ($user->save()) { // Check if the request has groups passed and has a value, AND that the user us a superuser - if (($request->has('groups')) && (Auth::user()->isSuperUser())) { + if (($request->has('groups')) && (auth()->user()->isSuperUser())) { $validator = Validator::make($request->only('groups'), [ 'groups.*' => 'integer|exists:permission_groups,id', @@ -710,7 +710,7 @@ class UsersController extends Controller $logaction->item_type = User::class; $logaction->item_id = $user->id; $logaction->created_at = date('Y-m-d H:i:s'); - $logaction->user_id = Auth::user()->id; + $logaction->user_id = auth()->id(); $logaction->logaction('2FA reset'); return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200); @@ -762,7 +762,7 @@ class UsersController extends Controller $logaction->item_type = User::class; $logaction->item_id = $user->id; $logaction->created_at = date('Y-m-d H:i:s'); - $logaction->user_id = Auth::user()->id; + $logaction->user_id = auth()->id(); $logaction->logaction('restore'); return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.restored')), 200);