A free open source IT asset/license management system
Apply pint to API controllers
snipe1e5d426e70dc
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.phpindex 745a4f68eb..7e88833eb6 100644--- a/app/Http/Controllers/Api/AccessoriesController.php+++ b/app/Http/Controllers/Api/AccessoriesController.php@@ -7,19 +7,17 @@ use App\Helpers\Helper;use App\Http\Controllers\CheckInOutRequest;use App\Http\Controllers\Controller;use App\Http\Requests\AccessoryCheckoutRequest;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\StoreAccessoryRequest;use App\Http\Transformers\AccessoriesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Accessory;-use App\Models\Company;+use App\Models\AccessoryCheckout;use App\Models\User;-use Illuminate\Http\JsonResponse;-use Illuminate\Support\Facades\Auth;use Carbon\Carbon;-use Illuminate\Support\Facades\DB;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;-use App\Models\AccessoryCheckout;+use Illuminate\Http\Response;class AccessoriesController extends Controller{@@ -29,8 +27,10 @@ class AccessoriesController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @return \Illuminate\Http\Response+ *+ * @return Response*/public function index(Request $request){@@ -38,10 +38,9 @@ class AccessoriesController extends Controller$this->authorize('view', Accessory::class);}-// This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations// Relations will be handled in query scopes a little further down.- $allowed_columns =+ $allowed_columns =['id','name',@@ -66,7 +65,6 @@ class AccessoriesController extends Controller'manufacturer',];-$accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')->withCount('checkouts as checkouts_count');@@ -87,7 +85,6 @@ class AccessoriesController extends Controller$accessories->TextSearch($request->input('search'));}-if ($request->filled('company_id')) {$accessories->where('accessories.company_id', '=', $request->input('company_id'));}@@ -109,11 +106,11 @@ class AccessoriesController extends Controller}if ($request->filled('location_id')) {- $accessories->where('location_id','=',$request->input('location_id'));+ $accessories->where('location_id', '=', $request->input('location_id'));}if ($request->filled('notes')) {- $accessories->where('notes','=',$request->input('notes'));+ $accessories->where('notes', '=', $request->input('notes'));}// Make sure the offset and limit are actually integers and do not exceed system limits@@ -121,7 +118,7 @@ class AccessoriesController extends Controller$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -136,7 +133,7 @@ class AccessoriesController extends Controllerbreak;case 'manufacturer':$accessories = $accessories->OrderManufacturer($order);- break;+ break;case 'supplier':$accessories = $accessories->OrderSupplier($order);break;@@ -147,20 +144,21 @@ class AccessoriesController extends Controller$accessories = $accessories->orderBy($column_sort, $order);break;}-+$total = $accessories->count();$accessories = $accessories->skip($offset)->take($limit)->get();return (new AccessoriesTransformer)->transformAccessories($accessories, $total);}-/*** Store a newly created resource in storage.*- * @param \App\Http\Requests\ImageUploadRequest $request- * @return \Illuminate\Http\JsonResponse+ * @param ImageUploadRequest $request+ * @return JsonResponse+ ** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/public function store(StoreAccessoryRequest $request)@@ -182,7 +180,9 @@ class AccessoriesController extends Controller** @param int $id* @return array+ ** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/public function show($id)@@ -193,13 +193,14 @@ class AccessoriesController extends Controllerreturn (new AccessoriesTransformer)->transformAccessory($accessory);}-/*** Display the specified resource.** @param int $id* @return array+ ** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/public function accessory_detail($id)@@ -210,14 +211,15 @@ class AccessoriesController extends Controllerreturn (new AccessoriesTransformer)->transformAccessory($accessory);}-/*** Get the list of checkouts for a specific accessory** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id- * @return | array+ * @return | array*/public function checkedout(Request $request, $id){@@ -241,15 +243,15 @@ class AccessoriesController extends Controllerreturn (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_checkouts, $total);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id- * @return \Illuminate\Http\JsonResponse+ * @return JsonResponse*/public function update(ImageUploadRequest $request, $id){@@ -269,9 +271,11 @@ class AccessoriesController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id- * @return \Illuminate\Http\JsonResponse+ * @return JsonResponse*/public function destroy($id){@@ -288,7 +292,6 @@ class AccessoriesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.delete.success')));}-/*** Save the Accessory checkout information.*@@ -296,7 +299,8 @@ class AccessoriesController extends Controller* trigger a Slack message and send an email.** @param int $accessoryId- * @return \Illuminate\Http\JsonResponse+ * @return JsonResponse+ ** @author [A. Gianotto] [<[email protected]>]*/public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory)@@ -315,7 +319,6 @@ class AccessoriesController extends Controller'note' => $request->input('note'),]);-$accessory_checkout->created_by = auth()->id();$accessory_checkout->save();@@ -346,12 +349,14 @@ class AccessoriesController extends Controller/*** Check in the item so that it can be checked out again to someone else*- * @param Request $request- * @param int $accessoryUserId- * @param string $backto+ * @param int $accessoryUserId+ * @param string $backto* @return JsonResponse+ ** @uses Accessory::checkin_email() to determine if an email can and should be sent+ ** @author [A. Gianotto] [<[email protected]>]+ ** @internal param int $accessoryId*/public function checkin(Request $request, $accessoryUserId = null)@@ -378,20 +383,18 @@ class AccessoriesController extends Controller'pivot' => $accessory_checkout->id,];- return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/accessories/message.checkin.success')));+ return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/accessories/message.checkin.success')));}return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkin.error')));}-/**- * Gets a paginated collection for the select2 menus- *- * @see \App\Http\Transformers\SelectlistTransformer- *- */+ * Gets a paginated collection for the select2 menus+ *+ * @see SelectlistTransformer+ */public function selectlist(Request $request){@@ -408,5 +411,4 @@ class AccessoriesController extends Controllerreturn (new SelectlistTransformer)->transformSelectlist($accessories);}-}diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.phpindex 34db09c7b7..6abb3bb4d3 100644--- a/app/Http/Controllers/Api/AssetModelsController.php+++ b/app/Http/Controllers/Api/AssetModelsController.php@@ -4,22 +4,26 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\StoreAssetModelRequest;use App\Http\Transformers\AssetModelsTransformer;use App\Http\Transformers\AssetsTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Asset;use App\Models\AssetModel;+use App\Models\Setting;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Storage;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Log;-use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Storage;/*** This class controls all actions related to asset models for* the Snipe-IT Asset Management application.** @version v4.0+ ** @author [A. Gianotto] [<[email protected]>]*/class AssetModelsController extends Controller@@ -28,9 +32,10 @@ class AssetModelsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', AssetModel::class);$allowed_columns =@@ -79,8 +84,8 @@ class AssetModelsController extends Controller'models.fieldset_id','models.deleted_at','models.updated_at',- 'models.require_serial'- ])+ 'models.require_serial',+ ])->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')->withCount('assets as assets_count')->withCount('availableAssets as remaining')@@ -104,8 +109,7 @@ class AssetModelsController extends Controller$assetmodels->TextSearch($request->input('search'));}-- if ($request->input('status')=='deleted') {+ if ($request->input('status') == 'deleted') {$assetmodels->onlyTrashed();}@@ -121,7 +125,7 @@ class AssetModelsController extends Controller$assetmodels = $assetmodels->where('models.requestable', '=', '1');} elseif ($request->input('requestable') == 'false') {$assetmodels = $assetmodels->where('models.requestable', '=', '0');- }+ }if ($request->filled('notes')) {$assetmodels = $assetmodels->where('models.notes', '=', $request->input('notes'));@@ -170,15 +174,14 @@ class AssetModelsController extends Controllerreturn (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\StoreAssetModelRequest $request*/- public function store(StoreAssetModelRequest $request) : JsonResponse+ public function store(StoreAssetModelRequest $request): JsonResponse{$this->authorize('create', AssetModel::class);$assetmodel = new AssetModel;@@ -188,8 +191,8 @@ class AssetModelsController extends Controllerif ($assetmodel->save()) {return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.create.success')));}- return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));+ return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));}@@ -197,10 +200,12 @@ class AssetModelsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', AssetModel::class);$assetmodel = AssetModel::withCount('assets as assets_count')->findOrFail($id);@@ -212,10 +217,12 @@ class AssetModelsController extends Controller* Display the specified resource's assets** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function assets($id) : array+ public function assets($id): array{$this->authorize('view', AssetModel::class);$assets = Asset::where('model_id', '=', $id)->get();@@ -223,17 +230,18 @@ class AssetModelsController extends Controllerreturn (new AssetsTransformer)->transformAssets($assets, $assets->count());}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ *+ * @param ImageUploadRequest $request* @param int $id- * @return \Illuminate\Http\Response+ * @return Response*/- public function update(StoreAssetModelRequest $request, $id) : JsonResponse+ public function update(StoreAssetModelRequest $request, $id): JsonResponse{$this->authorize('update', AssetModel::class);$assetmodel = AssetModel::findOrFail($id);@@ -252,7 +260,6 @@ class AssetModelsController extends Controller$assetmodel->fieldset_id = $request->input('custom_fieldset_id');}-if ($assetmodel->save()) {return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.update.success')));}@@ -264,10 +271,12 @@ class AssetModelsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', AssetModel::class);$assetmodel = AssetModel::findOrFail($id);@@ -294,10 +303,11 @@ class AssetModelsController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');@@ -310,7 +320,7 @@ class AssetModelsController extends Controller'models.category_id',])->with('manufacturer', 'category');- $settings = \App\Models\Setting::getSettings();+ $settings = Setting::getSettings();if ($request->filled('search')) {$assetmodels = $assetmodels->SearchByManufacturerOrCat($request->input('search'));diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 3ec4655035..1eee645f7a 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -7,6 +7,7 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\AssetCheckoutRequest;use App\Http\Requests\FilterRequest;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\StoreAssetRequest;use App\Http\Requests\UpdateAssetRequest;use App\Http\Traits\MigratesLegacyAssetLocations;@@ -26,6 +27,7 @@ use App\Models\LicenseSeat;use App\Models\Location;use App\Models\Setting;use App\Models\User;+use App\Observers\AssetObserver;use App\View\Label;use Carbon\Carbon;use Illuminate\Database\Eloquent\Builder;@@ -37,14 +39,13 @@ use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Route;use Illuminate\Support\Facades\Storage;-use Illuminate\Support\Facades\Validator;-/*** This class controls all actions related to assets for* the Snipe-IT Asset Management application.** @version v1.0+ ** @author [A. Gianotto] [<[email protected]>]*/class AssetsController extends Controller@@ -55,13 +56,14 @@ class AssetsController extends Controller* Returns JSON listing of all assets** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v4.0]*/- public function index(FilterRequest $request, $action = null, $upcoming_status = null) : JsonResponse | array+ public function index(FilterRequest $request, $action = null, $upcoming_status = null): JsonResponse|array{-// This handles the legacy audit endpoints :(if ($action == 'audit') {$action = 'audits';@@ -69,17 +71,17 @@ class AssetsController extends Controller$filter_non_deprecable_assets = false;/**- * This looks MAD janky (and it is), but the AssetsController@index does a LOT of heavy lifting throughout the- * app. This bit here just makes sure that someone without permission to view assets doesn't- * end up with priv escalations because they asked for a different endpoint.- *- * Since we never gave the specification for which transformer to use before, it should default- * gracefully to just use the AssetTransformer by default, which shouldn't break anything.- *- * It was either this mess, or repeating ALL of the searching and sorting and filtering code,+ * This looks MAD janky (and it is), but the AssetsController@index does a LOT of heavy lifting throughout the+ * app. This bit here just makes sure that someone without permission to view assets doesn't+ * end up with priv escalations because they asked for a different endpoint.+ *+ * Since we never gave the specification for which transformer to use before, it should default+ * gracefully to just use the AssetTransformer by default, which shouldn't break anything.+ *+ * It was either this mess, or repeating ALL of the searching and sorting and filtering code,* which would have been far worse of a mess. *sad face* - snipe (Sept 1, 2021)*/- if (Route::currentRouteName()=='api.depreciation-report.index') {+ if (Route::currentRouteName() == 'api.depreciation-report.index') {$filter_non_deprecable_assets = true;$transformer = 'App\Http\Transformers\DepreciationReportTransformer';$this->authorize('reports.view');@@ -88,7 +90,6 @@ class AssetsController extends Controller$this->authorize('index', Asset::class);}-$settings = Setting::getSettings();$allowed_columns = [@@ -136,7 +137,7 @@ class AssetsController extends Controller];- $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load+ $all_custom_fields = CustomField::all(); // used as a 'cache' of custom fields throughout this page loadforeach ($all_custom_fields as $field) {$allowed_columns[] = $field->db_column_name();@@ -179,14 +180,11 @@ class AssetsController extends Controller'supplier'); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.-if ($filter_non_deprecable_assets) {$non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();$assets->InModelList($non_deprecable_models->toArray());}--// These are used by the API to query against specific ID numbers.// They are also used by the individual searches on detail pages like// locations, etc.@@ -204,12 +202,11 @@ class AssetsController extends Controller$assets->TextSearch($request->input('search'));}-/*** Handle due and overdue audits and checkin dates*/switch ($action) {- // Audit (singular) is left over from earlier legacy APIs+ // Audit (singular) is left over from earlier legacy APIscase 'audits':switch ($upcoming_status) {case 'due':@@ -243,7 +240,6 @@ class AssetsController extends Controller* End handling due and overdue audits and checkin dates*/-// This is used by the sidenav, mostly// We switched from using query scopes here because of a Laravel bug@@ -317,7 +313,6 @@ class AssetsController extends Controller}}-// Leave these under the TextSearch scope, else the fuzziness will override the specific ID (status ID, etc) requestedif ($request->filled('status_id')) {$assets->where('assets.status_id', '=', $request->input('status_id'));@@ -334,7 +329,7 @@ class AssetsController extends Controllerif ($request->input('requestable') == 'true') {$assets->where('assets.requestable', '=', '1');}-+if ($request->filled('model_id')) {// If model_id is already an array, just use it as-isif (is_array($request->input('model_id'))) {@@ -453,7 +448,7 @@ class AssetsController extends Controller// This may not work for all databases, but it works for MySQLif ($numeric_sort) {- $assets->orderByRaw(DB::getTablePrefix() . 'assets.' . $sort_override . ' * 1 ' . $order);+ $assets->orderByRaw(DB::getTablePrefix().'assets.'.$sort_override.' * 1 '.$order);} else {$assets->orderBy($sort_override, $order);}@@ -463,7 +458,6 @@ class AssetsController extends Controllerbreak;}-// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');$limit = app('api_limit_value');@@ -471,7 +465,6 @@ class AssetsController extends Controller$total = $assets->count();$assets = $assets->skip($offset)->take($limit)->get();-/*** Include additional associated relationships*/@@ -484,15 +477,16 @@ class AssetsController extends Controllerreturn (new $transformer)->transformAssets($assets, $total, $request);}-/*** Returns JSON with information about an asset (by tag) for detail view.*- * @param string $tag+ * @param string $tag+ ** @since [v4.2.1]+ ** @author [A. Gianotto] [<[email protected]>]*/- public function showByTag(Request $request, $tag): JsonResponse | array+ public function showByTag(Request $request, $tag): JsonResponse|array{$this->authorize('index', Asset::class);$assets = Asset::where('asset_tag', $tag)->with('assetstatus')->with('assignedTo');@@ -524,11 +518,14 @@ class AssetsController extends Controller* Returns JSON with information about an asset (by serial) for detail view.** @author [A. Gianotto] [<[email protected]>]- * @param string $serial+ *+ * @param string $serial+ ** @since [v4.2.1]- * @return \Illuminate\Http\JsonResponse+ *+ * @return JsonResponse*/- public function showBySerial(Request $request, $serial): JsonResponse | array+ public function showBySerial(Request $request, $serial): JsonResponse|array{$this->authorize('index', Asset::class);$assets = Asset::where('serial', $serial)->with([@@ -567,11 +564,14 @@ class AssetsController extends Controller* Returns JSON with information about an asset for detail view.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v4.0]- * @return \Illuminate\Http\JsonResponse+ *+ * @return JsonResponse*/- public function show(Request $request, $id): JsonResponse | array+ public function show(Request $request, $id): JsonResponse|array{if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()@@ -581,6 +581,7 @@ class AssetsController extends Controllerreturn (new AssetsTransformer)->transformAsset($asset, $request->input('components'));}+return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);}@@ -591,16 +592,16 @@ class AssetsController extends Controller$asset = Asset::where('id', $id)->withTrashed()->firstorfail();$licenses = $asset->licenses()->get();- return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());+ return (new LicensesTransformer)->transformLicenses($licenses, $licenses->count());}-/*** Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/public function selectlist(Request $request): array{@@ -616,7 +617,7 @@ class AssetsController extends Controller])->with('model', 'assetstatus', 'assignedTo')->NotArchived();- if ((Setting::getSettings()->full_multiple_companies_support=='1') && ($request->filled('companyId'))) {+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($request->filled('companyId'))) {$assets->where('assets.company_id', $request->input('companyId'));}@@ -635,16 +636,14 @@ class AssetsController extends Controller// they may not have a ->name value but we want to display something anywayforeach ($assets as $asset) {-$asset->use_text = $asset->present()->fullName;if (($asset->checkedOutToUser()) && ($asset->assigned)) {- $asset->use_text .= ' → ' . $asset->assigned->display_name;+ $asset->use_text .= ' → '.$asset->assigned->display_name;}-if ($asset->assetstatus->getStatuslabelType() == 'pending') {- $asset->use_text .= '(' . $asset->assetstatus->getStatuslabelType() . ')';+ $asset->use_text .= '('.$asset->assetstatus->getStatuslabelType().')';}$asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null;@@ -653,21 +652,22 @@ class AssetsController extends Controllerreturn (new SelectlistTransformer)->transformSelectlist($assets);}-/*** Accepts a POST request to create a new asset** @author [A. Gianotto] [<[email protected]>]- * @param \App\Http\Requests\ImageUploadRequest $request+ *+ * @param ImageUploadRequest $request+ ** @since [v4.0]*/public function store(StoreAssetRequest $request): JsonResponse{- $asset = new Asset();+ $asset = new Asset;$asset->model()->associate(AssetModel::find((int) $request->input('model_id')));$asset->fill($request->validated());- $asset->created_by = auth()->id();+ $asset->created_by = auth()->id();/*** this is here just legacy reasons. Api\AssetController@@ -692,9 +692,9 @@ class AssetsController extends Controller// If input value is null, use custom field's default valueif ($field_val == null) {- Log::debug('Field value for ' . $field->db_column . ' is null');+ Log::debug('Field value for '.$field->db_column.' is null');$field_val = $field->defaultValue($request->input('model_id'));- Log::debug('Use the default fieldset value of ' . $field->defaultValue($request->input('model_id')));+ Log::debug('Use the default fieldset value of '.$field->defaultValue($request->input('model_id')));}// if the field is set to encrypted, make sure we encrypt the value@@ -717,7 +717,6 @@ class AssetsController extends Controller}}-$asset->{$field->db_column} = $field_val;}}@@ -748,11 +747,11 @@ class AssetsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);}-/*** Accepts a POST request to update an asset** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse@@ -765,7 +764,7 @@ class AssetsController extends Controllerif ($request->has('company_id')) {$asset->company_id = Company::getIdForCurrentUser($request->validated()['company_id']);}- if ($request->has('rtd_location_id') && !$request->has('location_id')) {+ if ($request->has('rtd_location_id') && ! $request->has('location_id')) {$asset->location_id = $request->validated()['rtd_location_id'];}if ($request->input('last_audit_date')) {@@ -800,6 +799,7 @@ class AssetsController extends Controller$field_val = Crypt::encrypt($field_val);} else {$problems_updating_encrypted_custom_fields = true;+continue;}}@@ -813,7 +813,7 @@ class AssetsController extends Controller} elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->input('assigned_asset')))) {$location = $target->location_id;- Asset::where('assigned_type', \App\Models\Asset::class)->where('assigned_to', $asset->id)+ Asset::where('assigned_type', Asset::class)->where('assigned_to', $asset->id)->update(['location_id' => $target->location_id]);} elseif (($request->filled('assigned_location')) && ($target = Location::find($request->input('assigned_location')))) {$location = $target->id;@@ -837,18 +837,20 @@ class AssetsController extends Controller} else {return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));// Below is the *correct* return since it uses the transformer, but we have to use the old, flat return for now until we can update Jamf2Snipe and Kanji2Snipe- /// return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));+ // / return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));}}+return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);}-/*** Delete a given asset (mark as deleted).** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v4.0]*/public function destroy($id): JsonResponse@@ -877,13 +879,13 @@ class AssetsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);}--/*** Restore a soft-deleted asset.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v5.1.18]*/public function restore(Request $request, $assetId = null): JsonResponse@@ -911,7 +913,9 @@ class AssetsController extends Controller* Checkout an asset by its tag.** @author [N. Butler]- * @param string $tag+ *+ * @param string $tag+ ** @since [v6.0.5]*/public function checkoutByTag(AssetCheckoutRequest $request, $tag): JsonResponse@@ -919,6 +923,7 @@ class AssetsController extends Controllerif ($asset = Asset::where('asset_tag', $tag)->first()) {return $this->checkout($request, $asset->id);}+return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);}@@ -926,7 +931,9 @@ class AssetsController extends Controller* Checkout an asset** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v4.0]*/public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse@@ -971,7 +978,7 @@ class AssetsController extends Controller}if (! isset($target)) {- return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset ' . e($asset->asset_tag) . ' is invalid - ' . $error_payload['target_type'] . ' does not exist.'));+ return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset '.e($asset->asset_tag).' is invalid - '.$error_payload['target_type'].' does not exist.'));}$checkout_at = request('checkout_at', date('Y-m-d H:i:s'));@@ -982,8 +989,7 @@ class AssetsController extends Controller// Set the location ID to the RTD location id if there is one// Wait, why are we doing this? This overrides the stuff we set further up, which makes no sense.- // TODO: Follow up here. WTF. Commented out for now.-+ // TODO: Follow up here. WTF. Commented out for now.// if ((isset($target->rtd_location_id)) && ($asset->rtd_location_id!='')) {// $asset->location_id = $target->rtd_location_id;@@ -996,12 +1002,13 @@ class AssetsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkout.error')));}-/*** Checkin an asset** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v4.0]*/public function checkin(Request $request, $asset_id): JsonResponse@@ -1014,12 +1021,12 @@ class AssetsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => e($asset->asset_tag),'model' => e($asset->model->name),- 'model_number' => e($asset->model->model_number)+ 'model_number' => e($asset->model->model_number),], trans('admin/hardware/message.checkin.already_checked_in')));}$asset->expected_checkin = null;- //$asset->last_checkout = null;+ // $asset->last_checkout = null;$asset->last_checkin = now();$asset->assignedTo()->disassociate($asset);$asset->accepted = null;@@ -1044,7 +1051,7 @@ class AssetsController extends Controller$asset->status_id = $request->input('status_id');}- $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at') . ' ' . date('H:i:s') : date('Y-m-d H:i:s');+ $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '.date('H:i:s') : date('Y-m-d H:i:s');$originalValues = $asset->getRawOriginal();if (($request->filled('checkin_at')) && ($request->input('checkin_at') != date('Y-m-d'))) {@@ -1075,7 +1082,7 @@ class AssetsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', ['asset_tag' => e($asset->asset_tag),'model' => e($asset->model->name),- 'model_number' => e($asset->model->model_number)+ 'model_number' => e($asset->model->model_number),], trans('admin/hardware/message.checkin.success')));}@@ -1086,12 +1093,13 @@ class AssetsController extends Controller* Checkin an asset by asset tag** @author [A. Janes] [<[email protected]>]+ ** @since [v6.0]*/public function checkinByTag(Request $request, $tag = null): JsonResponse{$this->authorize('checkin', Asset::class);- if (null == $tag && null !== ($request->input('asset_tag'))) {+ if ($tag == null && null !== ($request->input('asset_tag'))) {$tag = $request->input('asset_tag');}$asset = Asset::where('asset_tag', $tag)->first();@@ -1101,20 +1109,20 @@ class AssetsController extends Controller}return response()->json(Helper::formatStandardApiResponse('error', [- 'asset' => e($tag)- ], 'Asset with tag ' . e($tag) . ' not found'));+ 'asset' => e($tag),+ ], 'Asset with tag '.e($tag).' not found'));}-/*** Mark an asset as audited** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.0]*/public function audit(Request $request, Asset $asset): JsonResponse-{$this->authorize('audit', Asset::class);@@ -1154,16 +1162,15 @@ class AssetsController extends Controller'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),];-/*** Update custom fields in the database.* Validation for these fields is handled through the AssetRequest form request* $model = AssetModel::find($request->input('model_id'));- */+ */if (($asset->model) && ($asset->model->fieldset)) {$payload['custom_fields'] = [];foreach ($asset->model->fieldset->fields as $field) {- if (($field->display_audit=='1') && ($request->has($field->db_column))) {+ if (($field->display_audit == '1') && ($request->has($field->db_column))) {if ($field->field_encrypted == '1') {if (Gate::allows('assets.view.encrypted_custom_fields')) {if (is_array($request->input($field->db_column))) {@@ -1179,7 +1186,7 @@ class AssetsController extends Controller$asset->{$field->db_column} = $request->input($field->db_column);}}- $payload['custom_fields'][$field->db_column] = $request->input($field->db_column);+ $payload['custom_fields'][$field->db_column] = $request->input($field->db_column);}}@@ -1190,10 +1197,9 @@ class AssetsController extends Controller// Validate the rest of the data before we turn off the event dispatcherif ($asset->isInvalid()) {- return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => $asset->asset_tag], $asset->getErrors()));+ return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => $asset->asset_tag], $asset->getErrors()));}-/*** Even though we do a save() further down, we don't want to log this as a "normal" asset update,* which would trigger the Asset Observer and would log an asset *update* log entry (because the@@ -1207,12 +1213,10 @@ class AssetsController extends Controller* We handle validation on the save() by checking if the asset is valid via the ->isValid() method,* which manually invokes Watson Validating to make sure the asset's model is valid.*- * @see \App\Observers\AssetObserver::updating()- * @see \App\Models\Asset::save()+ * @see AssetObserver::updating()+ * @see Asset::save()*/-- $asset->unsetEventDispatcher();-+ $asset->unsetEventDispatcher();/*** Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.@@ -1220,26 +1224,25 @@ class AssetsController extends Controller*/if ($asset->isValid() && $asset->save()) {$asset->logAudit(request('note'), request('location_id'), null, $originalValues);+return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/hardware/message.audit.success')));}}-// No matching asset for the asset tag that was passed.- return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);}--/*** Returns JSON listing of all requestable assets** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function requestable(Request $request): JsonResponse | array+ public function requestable(Request $request): JsonResponse|array{$this->authorize('viewRequestable', Asset::class);@@ -1253,7 +1256,7 @@ class AssetsController extends Controller'expected_checkin',];- $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load+ $all_custom_fields = CustomField::all(); // used as a 'cache' of custom fields throughout this page loadforeach ($all_custom_fields as $field) {$allowed_columns[] = $field->db_column_name();@@ -1273,9 +1276,6 @@ class AssetsController extends Controller'requests');---if ($request->filled('search')) {$assets->TextSearch($request->input('search'));}@@ -1321,8 +1321,7 @@ class AssetsController extends Controllerreturn (new AssetsTransformer)->transformRequestedAssets($assets, $total);}-- public function assignedAssets(Request $request, Asset $asset) : JsonResponse | array+ public function assignedAssets(Request $request, Asset $asset): JsonResponse|array{$this->authorize('view', Asset::class);$this->authorize('view', $asset);@@ -1339,7 +1338,7 @@ class AssetsController extends Controllerreturn (new AssetsTransformer)->transformAssets($assets, $total);}- public function assignedAccessories(Request $request, Asset $asset) : JsonResponse | array+ public function assignedAccessories(Request $request, Asset $asset): JsonResponse|array{$this->authorize('view', Asset::class);$this->authorize('view', $asset);@@ -1353,6 +1352,7 @@ class AssetsController extends Controller$total = $accessory_checkouts->count();$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();+return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);}@@ -1364,17 +1364,17 @@ class AssetsController extends Controller$asset->loadCount('components');$total = $asset->components_count;- $components = $asset->load(['components' => fn($query) => $query->applyOffsetAndLimit($total)])->components;+ $components = $asset->load(['components' => fn ($query) => $query->applyOffsetAndLimit($total)])->components;return (new ComponentsTransformer)->transformComponents($components, $total);}/*** Generate asset labels by tag- *+ ** @author [Nebelkreis] [https://github.com/NebelKreis]- *- * @param Request $request Contains asset_tags array of asset tags to generate labels for+ *+ * @param Request $request Contains asset_tags array of asset tags to generate labels for* @return JsonResponse Returns base64 encoded PDF on success, error message on failure*/public function getLabels(Request $request): JsonResponse@@ -1382,17 +1382,17 @@ class AssetsController extends Controllertry {$this->authorize('view', Asset::class);- // Validate that asset tags were provided in the request- if (!$request->filled('asset_tags')) {- return response()->json(Helper::formatStandardApiResponse('error', null,+ // Validate that asset tags were provided in the request+ if (! $request->filled('asset_tags')) {+ return response()->json(Helper::formatStandardApiResponse('error', null,trans('admin/hardware/message.no_assets_selected')), 400);}- // Convert asset tags from request into collection and fetch matching assets+ // Convert asset tags from request into collection and fetch matching assets$asset_tags = collect($request->input('asset_tags'));$assets = Asset::whereIn('asset_tag', $asset_tags)->get();- // Return error if no assets were found for the provided tags+ // Return error if no assets were found for the provided tagsif ($assets->isEmpty()) {return response()->json(Helper::formatStandardApiResponse('error', null,trans('admin/hardware/message.does_not_exist')), 404);@@ -1403,27 +1403,27 @@ class AssetsController extends Controller// Check if logo file exists in storage and disable logo if not found// This prevents errors when trying to include a non-existent logo in the PDF- $settings->label_logo = ($original_logo = $settings->label_logo) && !Storage::disk('public')->exists('/' . $original_logo) ? null : $settings->label_logo;+ $settings->label_logo = ($original_logo = $settings->label_logo) && ! Storage::disk('public')->exists('/'.$original_logo) ? null : $settings->label_logo;+ $label = new Label;- $label = new Label();-- if (!$label) {+ if (! $label) {throw new \Exception('Label object could not be created');}// Configure label with assets and settings// bulkedit=false and count=0 are default values for label generation$label = $label->with('assets', $assets)- ->with('settings', $settings)- ->with('bulkedit', false)- ->with('count', 0);+ ->with('settings', $settings)+ ->with('bulkedit', false)+ ->with('count', 0);// Generate PDF using callback function// The callback captures the PDF content in $pdf_content variable$pdf_content = '';- $label->render(function($pdf) use (&$pdf_content) {+ $label->render(function ($pdf) use (&$pdf_content) {$pdf_content = $pdf->Output('', 'S');+return $pdf;});@@ -1435,21 +1435,21 @@ class AssetsController extends Controller$encoded_content = base64_encode($pdf_content);return response()->json(Helper::formatStandardApiResponse('success', [- 'pdf' => $encoded_content+ 'pdf' => $encoded_content,], trans('admin/hardware/message.labels_generated')));} catch (\Exception $e) {return response()->json(Helper::formatStandardApiResponse('error', ['error_message' => $e->getMessage(),'error_line' => $e->getLine(),- 'error_file' => $e->getFile()+ 'error_file' => $e->getFile(),], trans('admin/hardware/message.error_generating_labels')), 500);}} catch (\Exception $e) {return response()->json(Helper::formatStandardApiResponse('error', ['error_message' => $e->getMessage(),'error_line' => $e->getLine(),- 'error_file' => $e->getFile()+ 'error_file' => $e->getFile(),], $e->getMessage()), 500);}}diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.phpindex e85dd74d51..51d78e9d71 100644--- a/app/Http/Controllers/Api/CategoriesController.php+++ b/app/Http/Controllers/Api/CategoriesController.php@@ -6,12 +6,13 @@ use App\Actions\Categories\DestroyCategoryAction;use App\Exceptions\ItemStillHasChildren;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Transformers\CategoriesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Category;-use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;-use App\Http\Requests\ImageUploadRequest;+use Illuminate\Http\Request;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Storage;class CategoriesController extends Controller@@ -20,10 +21,12 @@ class CategoriesController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @return \Illuminate\Http\Response+ *+ * @return Response*/- public function index(Request $request) : array+ public function index(Request $request): array{$this->authorize('view', Category::class);$allowed_columns = [@@ -60,11 +63,10 @@ class CategoriesController extends Controller'image','tag_color','notes',- ])+ ])->with('adminuser')->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count');-$filter = [];if ($request->filled('filter')) {@@ -89,7 +91,7 @@ class CategoriesController extends Controller** @see \App\Models\Category::showableAssets()*/- if ($request->input('archived')=='true') {+ if ($request->input('archived') == 'true') {$categories = $categories->withCount('assets as assets_count');} else {$categories = $categories->withCount('showableAssets as assets_count');@@ -131,7 +133,7 @@ class CategoriesController extends Controller$offset = ($request->input('offset') > $categories->count()) ? $categories->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets_count';switch ($sort_override) {@@ -150,16 +152,16 @@ class CategoriesController extends Controller}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request- * @return \Illuminate\Http\Response+ *+ * @return Response*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Category::class);$category = new Category;@@ -170,6 +172,7 @@ class CategoriesController extends Controllerif ($category->save()) {return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.create.success')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $category->getErrors()));}@@ -178,28 +181,31 @@ class CategoriesController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Category::class);$category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);+return (new CategoriesTransformer)->transformCategory($category);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id- * @return \Illuminate\Http\Response+ * @return Response*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Category::class);$category = Category::findOrFail($id);@@ -207,7 +213,7 @@ class CategoriesController extends Controller// Don't allow the user to change the category_type once it's been createdif (($request->filled('category_type')) && ($category->category_type != $request->input('category_type'))) {return response()->json(- Helper::formatStandardApiResponse('error', null, ['category_type' => trans('admin/categories/message.update.cannot_change_category_type')], 422)+ Helper::formatStandardApiResponse('error', null, ['category_type' => trans('admin/categories/message.update.cannot_change_category_type')], 422));}$category->fill($request->all());@@ -224,9 +230,11 @@ class CategoriesController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id- * @return \Illuminate\Http\Response+ * @return Response*/public function destroy(Category $category): JsonResponse{@@ -239,6 +247,7 @@ class CategoriesController extends Controller);} catch (\Exception $e) {report($e);+return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));@@ -247,15 +256,15 @@ class CategoriesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success')));}-/*** Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request, $category_type = 'asset') : array+ public function selectlist(Request $request, $category_type = 'asset'): array{$this->authorize('view.selectlists');$categories = Category::select([diff --git a/app/Http/Controllers/Api/CheckoutRequest.php b/app/Http/Controllers/Api/CheckoutRequest.phpindex 9b66531ae4..5035e299a9 100644--- a/app/Http/Controllers/Api/CheckoutRequest.php+++ b/app/Http/Controllers/Api/CheckoutRequest.php@@ -8,9 +8,9 @@ use App\Exceptions\AssetNotRequestable;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Asset;+use Exception;use Illuminate\Auth\Access\AuthorizationException;use Illuminate\Http\JsonResponse;-use Exception;class CheckoutRequest extends Controller{@@ -18,6 +18,7 @@ class CheckoutRequest extends Controller{try {CreateCheckoutRequestAction::run($asset, auth()->user());+return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.requests.success')));} catch (AssetNotRequestable $e) {return response()->json(Helper::formatStandardApiResponse('error', 'Asset is not requestable'));@@ -25,6 +26,7 @@ class CheckoutRequest extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('general.insufficient_permissions')));} catch (Exception $e) {report($e);+return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));}}@@ -33,11 +35,13 @@ class CheckoutRequest extends Controller{try {CancelCheckoutRequestAction::run($asset, auth()->user());+return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.requests.canceled')));} catch (AuthorizationException $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.insufficient_permissions')));} catch (Exception $e) {report($e);+return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));}}diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.phpindex 6fdf6d713d..05808a16b0 100644--- a/app/Http/Controllers/Api/CompaniesController.php+++ b/app/Http/Controllers/Api/CompaniesController.php@@ -4,13 +4,13 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Transformers\CompaniesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Company;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;use Illuminate\Support\Facades\Storage;-use Illuminate\Http\JsonResponse;class CompaniesController extends Controller{@@ -18,9 +18,10 @@ class CompaniesController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Company::class);@@ -42,13 +43,12 @@ class CompaniesController extends Controller'notes',];- $companies = Company::withCount(['assets as assets_count' => function ($query) {+ $companies = Company::withCount(['assets as assets_count' => function ($query) {$query->AssetsForShow();}])->with('adminuser')->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');-if ($request->filled('search')) {$companies->TextSearch($request->input('search'));}@@ -57,7 +57,7 @@ class CompaniesController extends Controller$companies->where('name', '=', $request->input('name'));}- if ($request->filled('email')) {+ if ($request->filled('email')) {$companies->where('email', '=', $request->input('email'));}@@ -69,13 +69,11 @@ class CompaniesController extends Controller$companies->where('tag_color', '=', $request->input('tag_color'));}--// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -90,25 +88,25 @@ class CompaniesController extends Controller$total = $companies->count();$companies = $companies->skip($offset)->take($limit)->get();+return (new CompaniesTransformer)->transformCompanies($companies, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Company::class);$company = new Company;$company->fill($request->all());$company = $request->handleImages($company);-+if ($company->save()) {return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.create.success')));}@@ -121,28 +119,31 @@ class CompaniesController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Company::class);$company = Company::findOrFail($id);$this->authorize('view', $company);+return (new CompaniesTransformer)->transformCompany($company);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Company::class);$company = Company::findOrFail($id);@@ -163,10 +164,12 @@ class CompaniesController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Company::class);$company = Company::findOrFail($id);@@ -174,7 +177,7 @@ class CompaniesController extends Controllerif (! $company->isDeletable()) {return response()- ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users')));+ ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users')));}$company->delete();@@ -186,10 +189,11 @@ class CompaniesController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');$companies = Company::select([@@ -200,7 +204,6 @@ class CompaniesController extends Controller'companies.tag_color',]);-if ($request->filled('search')) {$companies = $companies->where('companies.name', 'LIKE', '%'.$request->input('search').'%');}diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.phpindex 87f47dd688..8b47419ba1 100644--- a/app/Http/Controllers/Api/ComponentsController.php+++ b/app/Http/Controllers/Api/ComponentsController.php@@ -2,20 +2,20 @@namespace App\Http\Controllers\Api;+use App\Events\CheckoutableCheckedIn;use App\Helpers\Helper;use App\Http\Controllers\Controller;-use App\Http\Transformers\ComponentsTransformer;-use App\Models\Component;-use Illuminate\Http\Request;use App\Http\Requests\ImageUploadRequest;-use App\Events\CheckoutableCheckedIn;+use App\Http\Transformers\ComponentsTransformer;use App\Models\Asset;-use Illuminate\Support\Facades\Validator;+use App\Models\Component;+use Carbon\Carbon;use Illuminate\Database\Query\Builder;-use Illuminate\Support\Facades\Log;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;-use Carbon\Carbon;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Validator;class ComponentsController extends Controller{@@ -23,16 +23,16 @@ class ComponentsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]- * @since [v4.0]*+ * @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Component::class);// This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations// Relations will be handled in query scopes a little further down.- $allowed_columns =+ $allowed_columns =['id','name',@@ -78,7 +78,6 @@ class ComponentsController extends Controller$components->TextSearch($request->input('search'));}-if ($request->filled('name')) {$components->where('name', '=', $request->input('name'));}@@ -112,7 +111,7 @@ class ComponentsController extends Controller}if ($request->filled('notes')) {- $components->where('notes','=',$request->input('notes'));+ $components->where('notes', '=', $request->input('notes'));}// Make sure the offset and limit are actually integers and do not exceed system limits@@ -121,7 +120,7 @@ class ComponentsController extends Controller$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -154,15 +153,14 @@ class ComponentsController extends Controllerreturn (new ComponentsTransformer)->transformComponents($components, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Component::class);$component = new Component;@@ -180,9 +178,10 @@ class ComponentsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Component::class);$component = Component::findOrFail($id);@@ -196,17 +195,17 @@ class ComponentsController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Component::class);$component = Component::findOrFail($id);$component->fill($request->all());$component = $request->handleImages($component);-if ($component->save()) {return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.update.success')));@@ -219,17 +218,19 @@ class ComponentsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Component::class);$component = Component::findOrFail($id);$this->authorize('delete', $component);if ($component->numCheckedOut() > 0) {- return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.delete.error_qty')));+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.delete.error_qty')));}$component->delete();@@ -241,35 +242,36 @@ class ComponentsController extends Controller* Display all assets attached to a component** @author [A. Bergamasco] [@vjandrea]+ ** @since [v4.0]- * @param Request $request- * @param int $id- */- public function getAssets(Request $request, $id) : array+ *+ * @param int $id+ */+ public function getAssets(Request $request, $id): array{- $this->authorize('view', \App\Models\Asset::class);-+ $this->authorize('view', Asset::class);+$component = Component::findOrFail($id);-+$offset = request('offset', 0);$limit = $request->input('limit', 50);-+if ($request->filled('search')) {$assets = $component->assets()- ->where(function ($query) use ($request) {- $search_str = '%' . $request->input('search') . '%';- $query->where('name', 'like', $search_str)- ->orWhereIn('model_id', function (Builder $query) use ($request) {- $search_str = '%' . $request->input('search') . '%';- $query->selectRaw('id')->from('models')->where('name', 'like', $search_str);- })- ->orWhere('asset_tag', 'like', $search_str);- })- ->get();+ ->where(function ($query) use ($request) {+ $search_str = '%'.$request->input('search').'%';+ $query->where('name', 'like', $search_str)+ ->orWhereIn('model_id', function (Builder $query) use ($request) {+ $search_str = '%'.$request->input('search').'%';+ $query->selectRaw('id')->from('models')->where('name', 'like', $search_str);+ })+ ->orWhere('asset_tag', 'like', $search_str);+ })+ ->get();$total = $assets->count();} else {$assets = $component->assets();-+$total = $assets->count();$assets = $assets->skip($offset)->take($limit)->get();}@@ -277,28 +279,28 @@ class ComponentsController extends Controllerreturn (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);}-/*** Validate and checkout the component.** @author [A. Gianotto] [<[email protected]>]* t+ ** @since [v5.1.8]- * @param Request $request- * @param int $componentId+ *+ * @param int $componentId*/- public function checkout(Request $request, $componentId) : JsonResponse+ public function checkout(Request $request, $componentId): JsonResponse{// Check if the component exists- if (!$component = Component::find($componentId)) {+ if (! $component = Component::find($componentId)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.does_not_exist')));}$this->authorize('checkout', $component);$validator = Validator::make($request->all(), [- 'assigned_to' => 'required|exists:assets,id',- 'assigned_qty' => "required|numeric|min:1|digits_between:1,".$component->numRemaining(),+ 'assigned_to' => 'required|exists:assets,id',+ 'assigned_qty' => 'required|numeric|min:1|digits_between:1,'.$component->numRemaining(),]);if ($validator->fails()) {@@ -327,7 +329,7 @@ class ComponentsController extends Controller$component->logCheckout($request->input('note'), $asset, null, [], $request->get('assigned_qty', 1));- return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkout.success')));+ return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkout.success')));}return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->input('assigned_qty')])));@@ -337,11 +339,10 @@ class ComponentsController extends Controller* Validate and store checkin data.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.1.8]- * @param Request $request- * @param $component_asset_id*/- public function checkin(Request $request, $component_asset_id) : JsonResponse+ public function checkin(Request $request, $component_asset_id): JsonResponse{if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {if (is_null($component = Component::find($component_assets->component_id))) {@@ -353,15 +354,15 @@ class ComponentsController extends Controller$max_to_checkin = $component_assets->assigned_qty;$validator = Validator::make($request->all(), [- "checkin_qty" => "required|numeric|between:1,$max_to_checkin"+ 'checkin_qty' => "required|numeric|between:1,$max_to_checkin",]);if ($validator->fails()) {- return response()->json(Helper::formatStandardApiResponse('error', null, 'Checkin quantity must be between 1 and ' . $max_to_checkin));+ return response()->json(Helper::formatStandardApiResponse('error', null, 'Checkin quantity must be between 1 and '.$max_to_checkin));}// Validation passed, so let's figure out what we have to do here.- $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int)$request->input('checkin_qty', 1));+ $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int) $request->input('checkin_qty', 1));// We have to modify the record to reflect the new qty that's// actually checked out.@@ -381,10 +382,9 @@ class ComponentsController extends Controllerevent(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));- return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkin.success')));+ return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkin.success')));}return response()->json(Helper::formatStandardApiResponse('error', null, 'No matching checkouts for that component join record'));}-}diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.phpindex 167fac283b..0fd3ba2ffe 100644--- a/app/Http/Controllers/Api/ConsumablesController.php+++ b/app/Http/Controllers/Api/ConsumablesController.php@@ -5,16 +5,15 @@ namespace App\Http\Controllers\Api;use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\StoreConsumableRequest;use App\Http\Transformers\ConsumablesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Company;use App\Models\Consumable;use App\Models\User;-use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;-use Illuminate\Support\Facades\Log;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;class ConsumablesController extends Controller{@@ -22,9 +21,10 @@ class ConsumablesController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : array+ public function index(Request $request): array{$this->authorize('index', Consumable::class);@@ -59,7 +59,6 @@ class ConsumablesController extends Controller'manufacturer',];-$filter = [];if ($request->filled('filter')) {@@ -77,7 +76,6 @@ class ConsumablesController extends Controller$consumables->TextSearch($request->input('search'));}-if ($request->filled('name')) {$consumables->where('name', '=', $request->input('name'));}@@ -95,7 +93,7 @@ class ConsumablesController extends Controller}if ($request->filled('model_number')) {- $consumables->where('model_number','=',$request->input('model_number'));+ $consumables->where('model_number', '=', $request->input('model_number'));}if ($request->filled('manufacturer_id')) {@@ -107,14 +105,13 @@ class ConsumablesController extends Controller}if ($request->filled('location_id')) {- $consumables->where('location_id','=',$request->input('location_id'));+ $consumables->where('location_id', '=', $request->input('location_id'));}if ($request->filled('notes')) {- $consumables->where('notes','=',$request->input('notes'));+ $consumables->where('notes', '=', $request->input('notes'));}-// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : app('api_offset_value');$limit = app('api_limit_value');@@ -158,10 +155,12 @@ class ConsumablesController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ *+ * @param ImageUploadRequest $request*/- public function store(StoreConsumableRequest $request) : JsonResponse+ public function store(StoreConsumableRequest $request): JsonResponse{$this->authorize('create', Consumable::class);$consumable = new Consumable;@@ -179,9 +178,10 @@ class ConsumablesController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Consumable::class);$consumable = Consumable::with('users')->findOrFail($id);@@ -193,17 +193,19 @@ class ConsumablesController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request- * @param int $id+ *+ * @param ImageUploadRequest $request+ * @param int $id*/- public function update(StoreConsumableRequest $request, $id) : JsonResponse+ public function update(StoreConsumableRequest $request, $id): JsonResponse{$this->authorize('update', Consumable::class);$consumable = Consumable::findOrFail($id);$consumable->fill($request->all());$consumable = $request->handleImages($consumable);-+if ($consumable->save()) {return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.update.success')));}@@ -215,10 +217,12 @@ class ConsumablesController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param int $id+ *+ * @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Consumable::class);$consumable = Consumable::findOrFail($id);@@ -229,22 +233,22 @@ class ConsumablesController extends Controller}/**- * Returns a JSON response containing details on the users associated with this consumable.- *- * @author [A. Gianotto] [<[email protected]>]- * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form.- * @since [v1.0]- * @param int $consumableId+ * Returns a JSON response containing details on the users associated with this consumable.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form.+ * @since [v1.0]+ *+ * @param int $consumableId*/- public function getDataView($consumableId) : array+ public function getDataView($consumableId): array{- $consumable = Consumable::with(['consumableAssignments'=> function ($query) {+ $consumable = Consumable::with(['consumableAssignments' => function ($query) {$query->orderBy($query->getModel()->getTable().'.created_at', 'DESC');},- 'consumableAssignments.adminuser'=> function ($query) {- },- 'consumableAssignments.user'=> function ($query) {- },+ 'consumableAssignments.adminuser' => function ($query) {},+ 'consumableAssignments.user' => function ($query) {},])->find($consumableId);if (! Company::isCurrentUserHasAccess($consumable)) {@@ -258,13 +262,13 @@ class ConsumablesController extends Controller'avatar' => ($consumable_assignment->user) ? e($consumable_assignment->user->present()->gravatar) : '','user' => ($consumable_assignment->user) ? ['id' => (int) $consumable_assignment->user->id,- 'name'=> e($consumable_assignment->user->display_name),+ 'name' => e($consumable_assignment->user->display_name),] : null,'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null,'created_by' => ($consumable_assignment->adminuser) ? ['id' => (int) $consumable_assignment->adminuser->id,- 'name'=> e($consumable_assignment->adminuser->display_name),+ 'name' => e($consumable_assignment->adminuser->display_name),] : null,];}@@ -279,13 +283,15 @@ class ConsumablesController extends Controller* Checkout a consumable** @author [A. Gutierrez] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.9.5]*/- public function checkout(Request $request, $id) : JsonResponse+ public function checkout(Request $request, $id): JsonResponse{// Check if the consumable exists- if (!$consumable = Consumable::with('users')->find($id)) {+ if (! $consumable = Consumable::with('users')->find($id)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.does_not_exist')));}@@ -299,19 +305,17 @@ class ConsumablesController extends Controller}// Make sure there is a valid category- if (!$consumable->category){+ if (! $consumable->category) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.invalid_item_category_single', ['type' => trans('general.consumable')])));}// Make sure there is at least one available to checkoutif ($consumable->numRemaining() <= 0 || $consumable->checkout_qty > $consumable->numRemaining()) {- return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable', ['requested' => $consumable->checkout_qty, 'remaining' => $consumable->numRemaining() ])));+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable', ['requested' => $consumable->checkout_qty, 'remaining' => $consumable->numRemaining()])));}--// Check if the user exists - @TODO: this should probably be handled via validation, not here??- if (!$user = User::find($request->input('assigned_to'))) {+ if (! $user = User::find($request->input('assigned_to'))) {// Return error messagereturn response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));}@@ -344,11 +348,11 @@ class ConsumablesController extends Controller}/**- * Gets a paginated collection for the select2 menus- *- * @see \App\Http\Transformers\SelectlistTransformer- */- public function selectlist(Request $request) : array+ * Gets a paginated collection for the select2 menus+ *+ * @see SelectlistTransformer+ */+ public function selectlist(Request $request): array{$consumables = Consumable::select(['consumables.id',diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.phpindex 207a92e274..9ba098bc24 100644--- a/app/Http/Controllers/Api/CustomFieldsController.php+++ b/app/Http/Controllers/Api/CustomFieldsController.php@@ -7,9 +7,9 @@ use App\Http\Controllers\Controller;use App\Http\Transformers\CustomFieldsTransformer;use App\Models\CustomField;use App\Models\CustomFieldset;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Validator;-use Illuminate\Http\JsonResponse;class CustomFieldsController extends Controller{@@ -17,11 +17,12 @@ class CustomFieldsController extends Controller* Reorder the custom fields within a fieldset** @author [Brady Wetherington] [<[email protected]>]+ ** @param int $id+ ** @since [v3.0]- * @return array*/- public function index() : array+ public function index(): array{$this->authorize('index', CustomField::class);$fields = CustomField::get();@@ -31,11 +32,14 @@ class CustomFieldsController extends Controller/*** Shows the given field+ ** @author [V. Cordes] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.1.10]*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', CustomField::class);if ($field = CustomField::find($id)) {@@ -49,11 +53,12 @@ class CustomFieldsController extends Controller* Update the specified field** @author [V. Cordes] [<[email protected]>]+ ** @since [v4.1.10]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('update', CustomField::class);$field = CustomField::findOrFail($id);@@ -61,6 +66,7 @@ class CustomFieldsController extends Controller/*** Updated values for the field,* without the "field_encrypted" flag, preventing the change of encryption status+ ** @var array*/$data = $request->except(['field_encrypted']);@@ -83,10 +89,10 @@ class CustomFieldsController extends Controller* Store a newly created field.** @author [V. Cordes] [<[email protected]>]+ ** @since [v4.1.10]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', CustomField::class);$field = new CustomField;@@ -134,7 +140,7 @@ class CustomFieldsController extends Controllerreturn $fieldset->fields()->sync($fields);}- public function associate(Request $request, $field_id) : JsonResponse+ public function associate(Request $request, $field_id): JsonResponse{$this->authorize('update', CustomFieldset::class);@@ -153,7 +159,7 @@ class CustomFieldsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));}- public function disassociate(Request $request, $field_id) : JsonResponse+ public function disassociate(Request $request, $field_id): JsonResponse{$this->authorize('update', CustomFieldset::class);$field = CustomField::findOrFail($field_id);@@ -175,9 +181,10 @@ class CustomFieldsController extends Controller* Delete a custom field.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function destroy($field_id) : JsonResponse+ public function destroy($field_id): JsonResponse{$field = CustomField::findOrFail($field_id);diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.phpindex 5dbd507917..51123eea6f 100644--- a/app/Http/Controllers/Api/CustomFieldsetsController.php+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php@@ -6,10 +6,10 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\CustomFieldsetsTransformer;use App\Http\Transformers\CustomFieldsTransformer;-use App\Models\CustomFieldset;use App\Models\CustomField;-use Illuminate\Http\Request;+use App\Models\CustomFieldset;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** This controller handles all actions related to Custom Asset Fieldsets for@@ -17,7 +17,9 @@ use Illuminate\Http\JsonResponse;** @todo Improve documentation here.* @todo Check for raw DB queries and try to convert them to query builder statements+ ** @version v2.0+ ** @author [Brady Wetherington] [<[email protected]>]* @author [Josh Gibson]*/@@ -25,12 +27,15 @@ class CustomFieldsetsController extends Controller{/*** Shows the given fieldset and its fields+ ** @author [A. Gianotto] [<[email protected]>]* @author [Josh Gibson]- * @param int $id+ *+ * @param int $id+ ** @since [v1.8]*/- public function index() : array+ public function index(): array{$this->authorize('index', CustomField::class);$fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();@@ -40,12 +45,15 @@ class CustomFieldsetsController extends Controller/*** Shows the given fieldset and its fields+ ** @author [A. Gianotto] [<[email protected]>]* @author [Josh Gibson]- * @param int $id+ *+ * @param int $id+ ** @since [v1.8]*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', CustomField::class);if ($fieldset = CustomFieldset::find($id)) {@@ -59,11 +67,12 @@ class CustomFieldsetsController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('update', CustomField::class);$fieldset = CustomFieldset::findOrFail($id);@@ -80,10 +89,10 @@ class CustomFieldsetsController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', CustomField::class);$fieldset = new CustomFieldset;@@ -112,9 +121,10 @@ class CustomFieldsetsController extends Controller* Delete a custom fieldset.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', CustomField::class);$fieldset = CustomFieldset::findOrFail($id);@@ -137,11 +147,13 @@ class CustomFieldsetsController extends Controller* Return JSON containing a list of fields belonging to a fieldset.** @author [V. Cordes] [<[email protected]>]+ ** @since [v4.1.10]- * @param $fieldsetId+ *+ * @param $fieldsetId* @return string JSON*/- public function fields($id) : array+ public function fields($id): array{$this->authorize('view', CustomField::class);$set = CustomFieldset::findOrFail($id);@@ -154,15 +166,14 @@ class CustomFieldsetsController extends Controller* Return JSON containing a list of fields belonging to a fieldset with the* default values for a given model*- * @param $modelId- * @param $fieldsetId* @return string JSON*/- public function fieldsWithDefaultValues($fieldsetId, $modelId) : array+ public function fieldsWithDefaultValues($fieldsetId, $modelId): array{$this->authorize('view', CustomField::class);$set = CustomFieldset::findOrFail($fieldsetId);$fields = $set->fields;+return (new CustomFieldsTransformer)->transformCustomFieldsWithDefaultValues($fields, $modelId, $fields->count());}}diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.phpindex bb3c1e926f..2310125841 100644--- a/app/Http/Controllers/Api/DepartmentsController.php+++ b/app/Http/Controllers/Api/DepartmentsController.php@@ -4,14 +4,14 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\StoreDepartmentRequest;use App\Http\Transformers\DepartmentsTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Department;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;use Illuminate\Support\Facades\Storage;-use Illuminate\Http\JsonResponse;class DepartmentsController extends Controller{@@ -19,9 +19,10 @@ class DepartmentsController extends Controller* Display a listing of the resource.** @author [Godfrey Martinez] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Department::class);$allowed_columns = ['id', 'name', 'image', 'users_count', 'notes', 'tag_color'];@@ -39,7 +40,7 @@ class DepartmentsController extends Controller'departments.updated_at','departments.image','departments.tag_color',- 'departments.notes'+ 'departments.notes',])->with('location')->with('manager')->with('company')->withCount('users as users_count');if ($request->filled('search')) {@@ -90,6 +91,7 @@ class DepartmentsController extends Controller$total = $departments->count();$departments = $departments->skip($offset)->take($limit)->get();+return (new DepartmentsTransformer)->transformDepartments($departments, $total);}@@ -98,8 +100,10 @@ class DepartmentsController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ *+ * @param ImageUploadRequest $request*/public function store(StoreDepartmentRequest $request): JsonResponse{@@ -113,6 +117,7 @@ class DepartmentsController extends Controllerif ($department->save()) {return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.create.success')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));}@@ -121,13 +126,16 @@ class DepartmentsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Department::class);$department = Department::withCount('users as users_count')->findOrFail($id);+return (new DepartmentsTransformer)->transformDepartment($department);}@@ -135,11 +143,12 @@ class DepartmentsController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Department::class);$department = Department::findOrFail($id);@@ -153,15 +162,16 @@ class DepartmentsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));}-/*** Validates and deletes selected department.** @author [A. Gianotto] [<[email protected]>]- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v4.0]*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$department = Department::findOrFail($id);@@ -172,6 +182,7 @@ class DepartmentsController extends Controller}$department->delete();+return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/departments/message.delete.success')));}@@ -180,10 +191,11 @@ class DepartmentsController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.phpindex 254a72c98e..74d2fadb4b 100644--- a/app/Http/Controllers/Api/DepreciationsController.php+++ b/app/Http/Controllers/Api/DepreciationsController.php@@ -6,8 +6,8 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\DepreciationsTransformer;use App\Models\Depreciation;-use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;class DepreciationsController extends Controller{@@ -15,9 +15,10 @@ class DepreciationsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Depreciation::class);$allowed_columns = [@@ -32,7 +33,7 @@ class DepreciationsController extends Controller'licenses_count',];- $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','created_at','updated_at', 'created_by')+ $depreciations = Depreciation::select('id', 'name', 'months', 'depreciation_min', 'depreciation_type', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('assets as assets_count')->withCount('models as models_count')@@ -46,7 +47,7 @@ class DepreciationsController extends Controller$offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -68,10 +69,10 @@ class DepreciationsController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', Depreciation::class);$depreciation = new Depreciation;@@ -88,10 +89,12 @@ class DepreciationsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', Depreciation::class);$depreciation = Depreciation::findOrFail($id);@@ -103,11 +106,12 @@ class DepreciationsController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('update', Depreciation::class);$depreciation = Depreciation::findOrFail($id);@@ -124,10 +128,12 @@ class DepreciationsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Depreciation::class);$depreciation = Depreciation::withCount('models as models_count')->findOrFail($id);diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.phpindex 44ff9b98dc..05645bcc37 100644--- a/app/Http/Controllers/Api/GroupsController.php+++ b/app/Http/Controllers/Api/GroupsController.php@@ -6,9 +6,8 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\GroupsTransformer;use App\Models\Group;-use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;-+use Illuminate\Http\Request;class GroupsController extends Controller{@@ -16,9 +15,10 @@ class GroupsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('superadmin');@@ -34,7 +34,6 @@ class GroupsController extends Controller$groups->where('name', '=', $request->input('name'));}-$offset = ($request->input('offset') > $groups->count()) ? $groups->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';@@ -69,10 +68,10 @@ class GroupsController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('superadmin');$group = new Group;@@ -96,13 +95,16 @@ class GroupsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('superadmin');$group = Group::findOrFail($id);+return (new GroupsTransformer)->transformGroup($group);}@@ -110,11 +112,12 @@ class GroupsController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('superadmin');$group = Group::findOrFail($id);@@ -134,10 +137,12 @@ class GroupsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('superadmin');$group = Group::findOrFail($id);diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.phpindex c92463eb73..9dc7a295ed 100644--- a/app/Http/Controllers/Api/ImportController.php+++ b/app/Http/Controllers/Api/ImportController.php@@ -6,12 +6,12 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\ItemImportRequest;use App\Http\Transformers\ImportsTransformer;-use App\Models\Asset;-use App\Models\Company;use App\Models\Import;+use Illuminate\Database\Eloquent\JsonEncodingException;+use Illuminate\Http\JsonResponse;use Illuminate\Http\UploadedFile;use Illuminate\Support\Facades\Artisan;-use Illuminate\Database\Eloquent\JsonEncodingException;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Request;use Illuminate\Support\Facades\Session;use Illuminate\Support\Facades\Storage;@@ -19,19 +19,17 @@ use Illuminate\Support\Str;use League\Csv\Reader;use Onnov\DetectEncoding\EncodingDetector;use Symfony\Component\HttpFoundation\File\Exception\FileException;-use Illuminate\Support\Facades\Log;-use Illuminate\Http\JsonResponse;class ImportController extends Controller{/*** Display a listing of the resource.- **/- public function index() : JsonResponse | array+ public function index(): JsonResponse|array{$this->authorize('import');$imports = Import::with('adminuser')->latest()->get();+return (new ImportsTransformer)->transformImports($imports);}@@ -40,7 +38,7 @@ class ImportController extends Controller** @param \Illuminate\Http\Request $request*/- public function store() : JsonResponse+ public function store(): JsonResponse{$this->authorize('import');if (! config('app.lock_passwords')) {@@ -48,7 +46,7 @@ class ImportController extends Controller$path = config('app.private_uploads').'/imports';$results = [];$import = new Import;- $detector = new EncodingDetector();+ $detector = new EncodingDetector;foreach ($files as $file) {if (! in_array($file->getMimeType(), [@@ -60,15 +58,16 @@ class ImportController extends Controller'text/comma-separated-values','text/tsv', ])) {$results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();+return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);}- //TODO: is there a lighter way to do this?+ // TODO: is there a lighter way to do this?if (! ini_get('auto_detect_line_endings')) {ini_set('auto_detect_line_endings', '1');}if (function_exists('iconv')) {- $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?+ $file_contents = $file->getContent(); // TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?$encoding = $detector->getEncoding($file_contents);\Log::debug("Discovered encoding: $encoding in uploaded CSV");$reader = null;@@ -77,12 +76,13 @@ class ImportController extends Controllertry {$transliterated = iconv(strtoupper($encoding), 'UTF-8', $file_contents);} catch (\Exception $e) {- $transliterated = false; //blank out the partially-decoded string+ $transliterated = false; // blank out the partially-decoded string+return response()->json(Helper::formatStandardApiResponse('error',null,- trans('admin/hardware/message.import.transliterate_failure', ["encoding" => $encoding])+ trans('admin/hardware/message.import.transliterate_failure', ['encoding' => $encoding])),422);@@ -90,18 +90,18 @@ class ImportController extends Controllerif ($transliterated !== false) {$tmpname = tempnam(sys_get_temp_dir(), '');$tmpresults = file_put_contents($tmpname, $transliterated);- $transliterated = null; //save on memory?+ $transliterated = null; // save on memory?if ($tmpresults !== false) {- $newfile = new UploadedFile($tmpname, $file->getClientOriginalName(), null, null, true); //WARNING: this is enabling 'test mode' - which is gross, but otherwise the file won't be treated as 'uploaded'+ $newfile = new UploadedFile($tmpname, $file->getClientOriginalName(), null, null, true); // WARNING: this is enabling 'test mode' - which is gross, but otherwise the file won't be treated as 'uploaded'if ($newfile->isValid()) {$file = $newfile;}}}}- $file_contents = null; //try to save on memory, I guess?+ $file_contents = null; // try to save on memory, I guess?}- $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?+ $reader = Reader::createFromFileObject($file->openFile('r')); // file pointer leak?try {$import->header_row = $reader->nth(0);@@ -116,7 +116,7 @@ class ImportController extends Controller);}- //duplicate headers check+ // duplicate headers check$duplicate_headers = [];for ($i = 0; $i < count($import->header_row); $i++) {@@ -124,15 +124,15 @@ class ImportController extends Controllerif (in_array($header, $import->header_row)) {$found_at = array_search($header, $import->header_row);if ($i > $found_at) {- //avoid reporting duplicates twice, e.g. "1 is same as 17! 17 is same as 1!!!"- //as well as "1 is same as 1!!!" (which is always true)- //has to be > because otherwise the first result of array_search will always be $i itself(!)+ // avoid reporting duplicates twice, e.g. "1 is same as 17! 17 is same as 1!!!"+ // as well as "1 is same as 1!!!" (which is always true)+ // has to be > because otherwise the first result of array_search will always be $i itself(!)array_push($duplicate_headers, "Duplicate header '$header' detected, first at column: ".($found_at + 1).', repeats at column: '.($i + 1));}}}if (count($duplicate_headers) > 0) {- return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)),422);+ return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 422);}try {@@ -167,7 +167,7 @@ class ImportController extends Controller$import->file_path = $file_name;$import->filesize = null;- if (!file_exists($path.'/'.$file_name)) {+ if (! file_exists($path.'/'.$file_name)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 500);}@@ -191,7 +191,7 @@ class ImportController extends Controller** @param int $import_id*/- public function process(ItemImportRequest $request, $import_id) : JsonResponse+ public function process(ItemImportRequest $request, $import_id): JsonResponse{$this->authorize('import');@@ -205,8 +205,9 @@ class ImportController extends Controller$import = Import::find($import_id);- if(is_null($import)){- $error[0][0] = trans("validation.exists", ["attribute" => "file"]);+ if (is_null($import)) {+ $error[0][0] = trans('validation.exists', ['attribute' => 'file']);+return response()->json(Helper::formatStandardApiResponse('import-errors', null, $error), 500);}@@ -259,10 +260,10 @@ class ImportController extends Controllerbreak;}- if ($errors) { //Failure+ if ($errors) { // Failurereturn response()->json(Helper::formatStandardApiResponse('import-errors', null, $errors), 500);}- //Flash message before the redirect+ // Flash message before the redirectSession::flash('success', trans('admin/hardware/message.import.success'));if (auth()->user()->can('view', $model_perms)) {@@ -277,18 +278,16 @@ class ImportController extends Controller** @param int $import_id*/- public function destroy($import_id) : JsonResponse+ public function destroy($import_id): JsonResponse{$this->authorize('import');if ($import = Import::find($import_id)) {-- if ((auth()->user()->id != $import->created_by) && (!auth()->user()->isSuperUser())) {+ if ((auth()->user()->id != $import->created_by) && (! auth()->user()->isSuperUser())) {return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));}-try {// Try to delete the fileStorage::delete('imports/'.$import->file_path);@@ -303,8 +302,7 @@ class ImportController extends Controller}}+return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));}--}diff --git a/app/Http/Controllers/Api/LabelsController.php b/app/Http/Controllers/Api/LabelsController.phpindex c7fa2210f4..65940dfb62 100644--- a/app/Http/Controllers/Api/LabelsController.php+++ b/app/Http/Controllers/Api/LabelsController.php@@ -6,9 +6,9 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\LabelsTransformer;use App\Models\Labels\Label;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\ItemNotFoundException;-use Illuminate\Http\JsonResponse;class LabelsController extends Controller{@@ -17,7 +17,7 @@ class LabelsController extends Controller** @author Grant Le Roux <[email protected]>*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Label::class);@@ -38,7 +38,7 @@ class LabelsController extends Controller$maxLimit = config('app.max_results');$limit = $request->input('limit', $maxLimit);$limit = ($limit > $maxLimit) ? $maxLimit : $limit;-+$labels = $labels->skip($offset)->take($limit);return (new LabelsTransformer)->transformLabels($labels, $total, $request);@@ -48,22 +48,21 @@ class LabelsController extends Controller* Returns JSON with information about a label for detail view.** @author Grant Le Roux <[email protected]>- * @param string $labelName*/- public function show(string $labelName) : JsonResponse | array+ public function show(string $labelName): JsonResponse|array{$labelName = str_replace('/', '\\', $labelName);try {$label = Label::find($labelName);- } catch(ItemNotFoundException $e) {+ } catch (ItemNotFoundException $e) {return response()->json(- Helper::formatStandardApiResponse('error', null, trans('admin/labels/message.does_not_exist')),+ Helper::formatStandardApiResponse('error', null, trans('admin/labels/message.does_not_exist')),404);}$this->authorize('view', $label);+return (new LabelsTransformer)->transformLabel($label);}-}diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.phpindex 39a7c45e90..fdee549d67 100644--- a/app/Http/Controllers/Api/LicenseSeatsController.php+++ b/app/Http/Controllers/Api/LicenseSeatsController.php@@ -17,16 +17,15 @@ class LicenseSeatsController extends Controller/*** Display a listing of the resource.*- * @param \Illuminate\Http\Request $request* @param int $licenseId*/- public function index(Request $request, $licenseId) : JsonResponse | array+ public function index(Request $request, $licenseId): JsonResponse|array{if ($license = License::find($licenseId)) {$this->authorize('view', $license);- $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department', 'user.company', 'asset.company')+ $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department', 'user.company', 'asset.company')->where('license_seats.license_id', $licenseId);if ($request->input('status') == 'available') {@@ -46,7 +45,7 @@ class LicenseSeatsController extends Controllerif ($request->input('sort') == 'assigned_user.department') {$seats->OrderDepartments($order);} elseif ($request->input('sort') == 'assigned_user.company') {- $seats->OrderCompany($order);+ $seats->OrderCompany($order);} else {$seats->orderBy('updated_at', $order);}@@ -56,7 +55,7 @@ class LicenseSeatsController extends Controller// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $seats->count()) ? $seats->count() : app('api_offset_value');- if ($offset >= $total ){+ if ($offset >= $total) {$offset = 0;}@@ -78,7 +77,7 @@ class LicenseSeatsController extends Controller* @param int $licenseId* @param int $seatId*/- public function show($licenseId, $seatId) : JsonResponse | array+ public function show($licenseId, $seatId): JsonResponse|array{$this->authorize('view', License::class);@@ -89,17 +88,15 @@ class LicenseSeatsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, 'Seat ID or license not found or the seat does not belong to this license'));-}/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request* @param int $licenseId* @param int $seatId*/- public function update(Request $request, $licenseId, $seatId) : JsonResponse | array+ public function update(Request $request, $licenseId, $seatId): JsonResponse|array{$validated = $this->validate($request, ['assigned_to' => [@@ -109,7 +106,7 @@ class LicenseSeatsController extends Controller'prohibits:asset_id',// must be a valid user or null to unassignfunction ($attribute, $value, $fail) {- if (!is_null($value) && !User::where('id', $value)->whereNull('deleted_at')->exists()) {+ if (! is_null($value) && ! User::where('id', $value)->whereNull('deleted_at')->exists()) {$fail('The selected assigned_to is invalid.');}},@@ -121,7 +118,7 @@ class LicenseSeatsController extends Controller'prohibits:assigned_to',// must be a valid asset or null to unassignfunction ($attribute, $value, $fail) {- if (!is_null($value) && !Asset::where('id', $value)->whereNull('deleted_at')->exists()) {+ if (! is_null($value) && ! Asset::where('id', $value)->whereNull('deleted_at')->exists()) {$fail('The selected asset_id is invalid.');}},@@ -133,12 +130,12 @@ class LicenseSeatsController extends Controller$licenseSeat = LicenseSeat::with(['license', 'asset', 'user'])->find($seatId);- if (!$licenseSeat) {+ if (! $licenseSeat) {return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));}$license = $licenseSeat->license;- if (!$license || $license->id != intval($licenseId)) {+ if (! $license || $license->id != intval($licenseId)) {return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));}@@ -158,7 +155,7 @@ class LicenseSeatsController extends ControllerHelper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));}- if( $assignmentTouched && $licenseSeat->unreassignable_seat) {+ if ($assignmentTouched && $licenseSeat->unreassignable_seat) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.checkout.unavailable')));}@@ -176,18 +173,18 @@ class LicenseSeatsController extends Controller$target = $is_checkin ? $oldAsset : Asset::find($licenseSeat->asset_id);}- if ($assignmentTouched && is_null($target)){+ if ($assignmentTouched && is_null($target)) {// if both asset_id and assigned_to are null then we are "checking-in"// a related model that does not exist (possible purged or bad data).- if (!is_null($request->input('asset_id')) || !is_null($request->input('assigned_to'))) {+ if (! is_null($request->input('asset_id')) || ! is_null($request->input('assigned_to'))) {return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));}}if ($licenseSeat->save()) {- if($assignmentTouched) {+ if ($assignmentTouched) {if ($is_checkin) {- if (!$licenseSeat->license->reassignable) {+ if (! $licenseSeat->license->reassignable) {$licenseSeat->unreassignable_seat = true;$licenseSeat->save();}@@ -198,6 +195,7 @@ class LicenseSeatsController extends Controller$licenseSeat->logCheckout($request->input('notes'), $target);}}+return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));}diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.phpindex 06ebd7693f..4d1b46f68e 100644--- a/app/Http/Controllers/Api/LicensesController.php+++ b/app/Http/Controllers/Api/LicensesController.php@@ -8,9 +8,9 @@ use App\Http\Transformers\LicensesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\License;use App\Models\Setting;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;-use Illuminate\Http\JsonResponse;class LicensesController extends Controller{@@ -18,21 +18,21 @@ class LicensesController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]- * @since [v4.0]*+ * @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', License::class);- $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');+ $licenses = License::with('company', 'manufacturer', 'supplier', 'category', 'adminuser')->withCount('freeSeats as free_seats_count');$settings = Setting::getSettings();- if ($request->input('status')=='inactive') {+ if ($request->input('status') == 'inactive') {$licenses->ExpiredLicenses();- } elseif ($request->input('status')=='expiring') {+ } elseif ($request->input('status') == 'expiring') {$licenses->ExpiringLicenses($settings->alert_interval);- } elseif ($request->input('status')=='active') {+ } elseif ($request->input('status') == 'active') {$licenses->ActiveLicenses();}@@ -84,15 +84,15 @@ class LicensesController extends Controller$licenses->where('created_by', '=', $request->input('created_by'));}- if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {- $licenses->where('maintained','=',1);- } elseif (($request->filled('maintained')) && ($request->input('maintained')=='false')) {- $licenses->where('maintained','=',0);+ if (($request->filled('maintained')) && ($request->input('maintained') == 'true')) {+ $licenses->where('maintained', '=', 1);+ } elseif (($request->filled('maintained')) && ($request->input('maintained') == 'false')) {+ $licenses->where('maintained', '=', 0);}- if (($request->filled('expires')) && ($request->input('expires')=='true')) {+ if (($request->filled('expires')) && ($request->input('expires') == 'true')) {$licenses->whereNotNull('expiration_date');- } elseif (($request->filled('expires')) && ($request->input('expires')=='false')) {+ } elseif (($request->filled('expires')) && ($request->input('expires') == 'false')) {$licenses->whereNull('expiration_date');}@@ -100,12 +100,10 @@ class LicensesController extends Controller$licenses = $licenses->TextSearch($request->input('search'));}- if ($request->input('deleted')=='true') {+ if ($request->input('deleted') == 'true') {$licenses->onlyTrashed();}--// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : app('api_offset_value');$limit = app('api_limit_value');@@ -113,8 +111,8 @@ class LicensesController extends Controller$order = $request->input('order') === 'asc' ? 'asc' : 'desc';switch ($request->input('sort')) {- case 'manufacturer':- $licenses = $licenses->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order);+ case 'manufacturer':+ $licenses = $licenses->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order);break;case 'supplier':$licenses = $licenses->leftJoin('suppliers', 'licenses.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);@@ -161,6 +159,7 @@ class LicensesController extends Controller$total = $licenses->count();$licenses = $licenses->skip($offset)->take($limit)->get();+return (new LicensesTransformer)->transformLicenses($licenses, $total);}@@ -169,10 +168,10 @@ class LicensesController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', License::class);$license = new License;@@ -189,9 +188,10 @@ class LicensesController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @param int $id*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', License::class);$license = License::withCount('freeSeats as free_seats_count')->findOrFail($id);@@ -204,11 +204,12 @@ class LicensesController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse | array+ public function update(Request $request, $id): JsonResponse|array{//$this->authorize('update', License::class);@@ -227,10 +228,12 @@ class LicensesController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$license = License::findOrFail($id);$this->authorize('delete', $license);@@ -255,9 +258,9 @@ class LicensesController extends Controller/*** Gets a paginated collection for the select2 menus*- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$licenses = License::select(['licenses.id',diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.phpindex 16495a91f2..cbbb0d056d 100644--- a/app/Http/Controllers/Api/LocationsController.php+++ b/app/Http/Controllers/Api/LocationsController.php@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;-use App\Http\Transformers\AccessoriesTransformer;use App\Http\Transformers\AssetsTransformer;use App\Http\Transformers\LocationsTransformer;use App\Http\Transformers\SelectlistTransformer;@@ -17,6 +16,7 @@ use App\Models\Location;use App\Models\Setting;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Illuminate\Http\Response;use Illuminate\Pagination\LengthAwarePaginator;use Illuminate\Support\Collection;@@ -26,10 +26,12 @@ class LocationsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @return \Illuminate\Http\Response+ *+ * @return Response*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Location::class);$allowed_columns = [@@ -61,7 +63,7 @@ class LocationsController extends Controller'zip','tag_color','notes',- ];+ ];$locations = Location::with('parent', 'manager', 'children')->select(['locations.id',@@ -159,8 +161,6 @@ class LocationsController extends Controller$order = $request->input('order') === 'asc' ? 'asc' : 'desc';$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';--switch ($request->input('sort')) {case 'parent':$locations->OrderParent($order);@@ -176,22 +176,20 @@ class LocationsController extends Controllerbreak;}-$total = $locations->count();$locations = $locations->skip($offset)->take($limit)->get();return (new LocationsTransformer)->transformLocations($locations, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Location::class);$location = new Location;@@ -204,7 +202,7 @@ class LocationsController extends Controller// check if parent is set and has a different companyif ($location->parent_id && Location::find($location->parent_id)->company_id != $location->company_id) {response()->json(Helper::formatStandardApiResponse('error', null, 'different company than parent'));- }+ }}if ($location->save()) {@@ -218,10 +216,12 @@ class LocationsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', Location::class);$location = Location::with('parent', 'manager', 'children', 'company')@@ -258,16 +258,16 @@ class LocationsController extends Controllerreturn (new LocationsTransformer)->transformLocation($location);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Location::class);$location = Location::findOrFail($id);@@ -282,7 +282,7 @@ class LocationsController extends Controller// check if there are related objects with different companyif (Helper::test_locations_fmcs(false, $id, $location->company_id)) {return response()->json(Helper::formatStandardApiResponse('error', null, 'error scoped locations'));- }+ }} else {$location->company_id = $request->input('company_id');}@@ -291,6 +291,7 @@ class LocationsController extends Controllerif ($location->isValid()) {$location->save();+return response()->json(Helper::formatStandardApiResponse('success',@@ -303,26 +304,27 @@ class LocationsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));}-- public function assets(Request $request, Location $location) : JsonResponse | array+ public function assets(Request $request, Location $location): JsonResponse|array{$this->authorize('view', Asset::class);$this->authorize('view', $location);$assets = Asset::where('location_id', '=', $location->id)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');$assets = $assets->get();+return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);}- public function assignedAssets(Request $request, Location $location) : JsonResponse | array+ public function assignedAssets(Request $request, Location $location): JsonResponse|array{$this->authorize('view', Asset::class);$this->authorize('view', $location);$assets = Asset::where('assigned_to', '=', $location->id)->where('assigned_type', '=', Location::class)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');$assets = $assets->get();+return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);}- public function assignedAccessories(Request $request, Location $location) : JsonResponse | array+ public function assignedAccessories(Request $request, Location $location): JsonResponse|array{$this->authorize('view', Accessory::class);$this->authorize('view', $location);@@ -333,6 +335,7 @@ class LocationsController extends Controller$total = $accessory_checkouts->count();$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();+return (new LocationsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);}@@ -340,10 +343,12 @@ class LocationsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Location::class);$location = Location::withCount('assignedAssets as assigned_assets_count')@@ -360,7 +365,7 @@ class LocationsController extends Controllerif (! $location->isDeletable()) {return response()- ->json(Helper::formatStandardApiResponse('error', null, trans('admin/locations/message.assoc_users')));+ ->json(Helper::formatStandardApiResponse('error', null, trans('admin/locations/message.assoc_users')));}$this->authorize('delete', $location);$location->delete();@@ -393,10 +398,11 @@ class LocationsController extends Controller* sea... this time.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{// If a user is in the process of editing their profile, as determined by the referrer,// then we check that they have permission to edit their own location.diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.phpindex a6cfd21f68..ff8b85a0e7 100644--- a/app/Http/Controllers/Api/MaintenancesController.php+++ b/app/Http/Controllers/Api/MaintenancesController.php@@ -7,10 +7,10 @@ use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;use App\Http\Transformers\MaintenancesTransformer;use App\Models\Asset;-use App\Models\Maintenance;use App\Models\Company;-use Illuminate\Http\Request;+use App\Models\Maintenance;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** This controller handles all actions related to Asset Maintenance for@@ -20,21 +20,23 @@ use Illuminate\Http\JsonResponse;*/class MaintenancesController extends Controller{-/*** Generates the JSON response for asset maintenances listing view.** @see MaintenancesController::getIndex() method that generates view+ ** @author Vincent Sposato <[email protected]>+ ** @version v1.0+ ** @since [v1.8]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Asset::class);$maintenances = Maintenance::select('maintenances.*')- ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser');+ ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser');if ($request->filled('search')) {$maintenances = $maintenances->TextSearch($request->input('search'));@@ -60,31 +62,30 @@ class MaintenancesController extends Controller$maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));}-// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $maintenances->count()) ? $maintenances->count() : abs($request->input('offset'));$limit = app('api_limit_value');$allowed_columns = [- 'id',- 'name',- 'asset_maintenance_time',- 'asset_maintenance_type',- 'cost',- 'start_date',- 'completion_date',- 'notes',- 'asset_tag',- 'asset_name',- 'serial',- 'created_by',- 'supplier',- 'location',- 'is_warranty',- 'status_label',- 'model',- 'model_number',- ];+ 'id',+ 'name',+ 'asset_maintenance_time',+ 'asset_maintenance_type',+ 'cost',+ 'start_date',+ 'completion_date',+ 'notes',+ 'asset_tag',+ 'asset_name',+ 'serial',+ 'created_by',+ 'supplier',+ 'location',+ 'is_warranty',+ 'status_label',+ 'model',+ 'model_number',+ ];$order = $request->input('order') === 'asc' ? 'asc' : 'desc';$sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';@@ -124,26 +125,28 @@ class MaintenancesController extends Controller$total = $maintenances->count();$maintenances = $maintenances->skip($offset)->take($limit)->get();- return (new MaintenancesTransformer())->transformMaintenances($maintenances, $total);+ return (new MaintenancesTransformer)->transformMaintenances($maintenances, $total);}-/*** Validates and stores the new asset maintenance** @see MaintenancesController::getCreate() method for the form+ ** @author Vincent Sposato <[email protected]>+ ** @version v1.0+ ** @since [v1.8]*/- public function store(ImageUploadRequest $request) : JsonResponse | array+ public function store(ImageUploadRequest $request): JsonResponse|array{$this->authorize('update', Asset::class);// create a new model instance- $maintenance = new Maintenance();+ $maintenance = new Maintenance;$maintenance->fill($request->all());$maintenance->created_by = auth()->id();$maintenance = $request->handleImages($maintenance);@@ -161,12 +164,15 @@ class MaintenancesController extends Controller* Validates and stores an update to an asset maintenance** @author A. Gianotto <[email protected]>- * @param int $id- * @param int $request+ *+ * @param int $id+ * @param int $request+ ** @version v1.0+ ** @since [v4.0]*/- public function update(Request $request, $id) : JsonResponse | array+ public function update(Request $request, $id): JsonResponse|array{$this->authorize('update', Asset::class);@@ -178,7 +184,7 @@ class MaintenancesController extends Controller}// The asset this miantenance is attached to is not valid or has been deleted- if (!$maintenance->asset) {+ if (! $maintenance->asset) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('general.asset'), 'id' => $id])));}@@ -199,11 +205,14 @@ class MaintenancesController extends Controller* Delete an asset maintenance** @author A. Gianotto <[email protected]>- * @param int $maintenanceId+ *+ * @param int $maintenanceId+ ** @version v1.0+ ** @since [v4.0]*/- public function destroy($maintenanceId) : JsonResponse | array+ public function destroy($maintenanceId): JsonResponse|array{$this->authorize('update', Asset::class);// Check if the asset maintenance exists@@ -214,18 +223,20 @@ class MaintenancesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.delete.success')));-}/*** View an asset maintenance** @author A. Gianotto <[email protected]>- * @param int $maintenanceId+ *+ * @param int $maintenanceId+ ** @version v1.0+ ** @since [v4.0]*/- public function show($maintenanceId) : JsonResponse | array+ public function show($maintenanceId): JsonResponse|array{$this->authorize('view', Asset::class);$maintenance = Maintenance::findOrFail($maintenanceId);@@ -233,7 +244,7 @@ class MaintenancesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));}- return (new MaintenancesTransformer())->transformMaintenance($maintenance);+ return (new MaintenancesTransformer)->transformMaintenance($maintenance);}}diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.phpindex ab0fe72587..c2e311f855 100644--- a/app/Http/Controllers/Api/ManufacturersController.php+++ b/app/Http/Controllers/Api/ManufacturersController.php@@ -3,22 +3,19 @@namespace App\Http\Controllers\Api;use App\Actions\Manufacturers\DeleteManufacturerAction;-use App\Exceptions\ItemStillHasAccessories;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasChildren;-use App\Exceptions\ItemStillHasComponents;-use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasLicenses;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Transformers\ManufacturersTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\Actionlog;use App\Models\Manufacturer;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Storage;-use Illuminate\Http\JsonResponse;class ManufacturersController extends Controller{@@ -26,13 +23,15 @@ class ManufacturersController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @return \Illuminate\Http\Response+ *+ * @return Response*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', Manufacturer::class);- $allowed_columns = [+ $allowed_columns = ['id','name','url',@@ -52,21 +51,21 @@ class ManufacturersController extends Controller];$manufacturers = Manufacturer::select([- 'id',- 'name',- 'url',- 'support_url',- 'warranty_lookup_url',- 'support_email',- 'support_phone',- 'created_by',- 'created_at',- 'updated_at',- 'image',- 'deleted_at',- 'tag_color',- 'notes',- ])+ 'id',+ 'name',+ 'url',+ 'support_url',+ 'warranty_lookup_url',+ 'support_email',+ 'support_phone',+ 'created_by',+ 'created_at',+ 'updated_at',+ 'image',+ 'deleted_at',+ 'tag_color',+ 'notes',+ ])->with('adminuser')->withCount('assets as assets_count')->withCount('licenses as licenses_count')@@ -86,8 +85,6 @@ class ManufacturersController extends Controller$manufacturers = $manufacturers->TextSearch($request->input('search'));}--if ($request->filled('name')) {$manufacturers->where('name', '=', $request->input('name'));}@@ -120,7 +117,7 @@ class ManufacturersController extends Controller$offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -142,10 +139,10 @@ class ManufacturersController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Manufacturer::class);$manufacturer = new Manufacturer;@@ -155,6 +152,7 @@ class ManufacturersController extends Controllerif ($manufacturer->save()) {return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.create.success')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $manufacturer->getErrors()));}@@ -163,10 +161,12 @@ class ManufacturersController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', Manufacturer::class);$manufacturer = Manufacturer::withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count')->findOrFail($id);@@ -178,11 +178,12 @@ class ManufacturersController extends Controller* Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Manufacturer::class);$manufacturer = Manufacturer::findOrFail($id);@@ -200,7 +201,9 @@ class ManufacturersController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/public function destroy(Manufacturer $manufacturer): JsonResponse@@ -212,6 +215,7 @@ class ManufacturersController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')])));} catch (\Exception $e) {report($e);+return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));}@@ -222,11 +226,14 @@ class ManufacturersController extends Controller* Restore a given Manufacturer (mark as un-deleted)** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.3.4]- * @param int $id- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ *+ * @throws AuthorizationException*/- public function restore($id) : JsonResponse+ public function restore($id): JsonResponse{$this->authorize('delete', Manufacturer::class);@@ -238,7 +245,7 @@ class ManufacturersController extends Controllerif ($manufacturer->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = Manufacturer::class;$logaction->item_id = $manufacturer->id;$logaction->created_at = date('Y-m-d H:i:s');@@ -252,17 +259,18 @@ class ManufacturersController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.manufacturer'), 'error' => $manufacturer->getErrors()->first()])), 200);}- return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.does_not_exist')));+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.does_not_exist')));}/*** Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');diff --git a/app/Http/Controllers/Api/NotesController.php b/app/Http/Controllers/Api/NotesController.phpindex c1a16fd4d6..9bd035ee26 100644--- a/app/Http/Controllers/Api/NotesController.php+++ b/app/Http/Controllers/Api/NotesController.php@@ -6,7 +6,6 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Actionlog;use App\Models\Asset;-use Illuminate\Database\Eloquent\ModelNotFoundException;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;@@ -25,16 +24,15 @@ class NotesController extends Controller* and fetches related action log entries of type 'note added', including* user information for each note. Returns a JSON response with the notes or errors.*- * @param \Illuminate\Http\Request $request The incoming HTTP request.+ * @param Request $request The incoming HTTP request.* @param Asset $asset The ID of the asset whose notes to retrieve.- * @return \Illuminate\Http\JsonResponse*/public function index(Asset $asset): JsonResponse{$this->authorize('view', $asset);// Get the manual notes for the asset- $notes = ActionLog::with('user:id,username')+ $notes = Actionlog::with('user:id,username')->where('item_type', Asset::class)->where('item_id', $asset->id)->where('action_type', 'note added')@@ -57,7 +55,7 @@ class NotesController extends Controller// Return a success responsereturn response()->json(Helper::formatStandardApiResponse('success', ['notes' => $notesArray, 'asset_id' => $asset->id]));}-+/*** Store a manual note on a specified asset and log the action.*@@ -65,9 +63,8 @@ class NotesController extends Controller* attempts to find the asset by ID, and creates a new ActionLog entry if successful.* Returns JSON responses indicating success or failure with appropriate HTTP status codes.*- * @param \Illuminate\Http\Request $request The incoming HTTP request containing the 'note'.+ * @param Request $request The incoming HTTP request containing the 'note'.* @param Asset $asset The ID of the asset to attach the note to.- * @return \Illuminate\Http\JsonResponse*/public function store(Request $request, Asset $asset): JsonResponse{@@ -78,7 +75,7 @@ class NotesController extends Controller}// Create the note- $logaction = new ActionLog();+ $logaction = new Actionlog;$logaction->item_type = get_class($asset);$logaction->created_by = Auth::id();$logaction->item_id = $asset->id;diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.phpindex e2a6f25ae6..d49efb9ea0 100644--- a/app/Http/Controllers/Api/PredefinedKitsController.php+++ b/app/Http/Controllers/Api/PredefinedKitsController.php@@ -5,10 +5,11 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\PredefinedKitsTransformer;+use App\Http\Transformers\SelectlistTransformer;use App\Models\PredefinedKit;-use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;-use App\Http\Transformers\SelectlistTransformer;+use Illuminate\Http\Request;+use Illuminate\Http\Response;/*** @author [D. Minaev.] [<[email protected]>]@@ -18,9 +19,9 @@ class PredefinedKitsController extends Controller/*** Display a listing of the resource.*- * @return \Illuminate\Http\Response+ * @return Response*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('view', PredefinedKit::class);@@ -63,10 +64,8 @@ class PredefinedKitsController extends Controller/*** Store a newly created resource in storage.- *- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', PredefinedKit::class);$kit = new PredefinedKit;@@ -84,7 +83,7 @@ class PredefinedKitsController extends Controller** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', PredefinedKit::class);$kit = PredefinedKit::findOrFail($id);@@ -95,10 +94,9 @@ class PredefinedKitsController extends Controller/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request- * @param int $id kit id+ * @param int $id kit id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($id);@@ -116,7 +114,7 @@ class PredefinedKitsController extends Controller** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', PredefinedKit::class);$kit = PredefinedKit::findOrFail($id);@@ -135,9 +133,9 @@ class PredefinedKitsController extends Controller/*** Gets a paginated collection for the select2 menus*- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$kits = PredefinedKit::select(['id',@@ -157,9 +155,9 @@ class PredefinedKitsController extends Controller* Display the specified resource.** @param int $id- * @return \Illuminate\Http\Response+ * @return Response*/- public function indexLicenses($kit_id) : array+ public function indexLicenses($kit_id): array{$this->authorize('view', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -172,9 +170,9 @@ class PredefinedKitsController extends Controller* Store the specified resource.** @param int $id- * @return \Illuminate\Http\Response+ * @return Response*/- public function storeLicense(Request $request, $kit_id) : JsonResponse+ public function storeLicense(Request $request, $kit_id): JsonResponse{$this->authorize('update', PredefinedKit::class);@@ -198,10 +196,9 @@ class PredefinedKitsController extends Controller/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request* @param int $kit_id*/- public function updateLicense(Request $request, $kit_id, $license_id) : JsonResponse+ public function updateLicense(Request $request, $kit_id, $license_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -209,7 +206,7 @@ class PredefinedKitsController extends Controllerif ($quantity < 1) {$quantity = 1;}- $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' => $quantity]]);+ $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' => $quantity]]);return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.license_updated')));}@@ -219,7 +216,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function detachLicense($kit_id, $license_id) : JsonResponse+ public function detachLicense($kit_id, $license_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -234,7 +231,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function indexModels($kit_id) : array+ public function indexModels($kit_id): array{$this->authorize('view', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -248,7 +245,7 @@ class PredefinedKitsController extends Controller** @param int $id*/- public function storeModel(Request $request, $kit_id) : JsonResponse+ public function storeModel(Request $request, $kit_id): JsonResponse{$this->authorize('update', PredefinedKit::class);@@ -272,10 +269,9 @@ class PredefinedKitsController extends Controller/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request* @param int $kit_id*/- public function updateModel(Request $request, $kit_id, $model_id) : JsonResponse+ public function updateModel(Request $request, $kit_id, $model_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -283,7 +279,7 @@ class PredefinedKitsController extends Controllerif ($quantity < 1) {$quantity = 1;}- $kit->models()->syncWithoutDetaching([$model_id => ['quantity' => $quantity]]);+ $kit->models()->syncWithoutDetaching([$model_id => ['quantity' => $quantity]]);return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.license_updated')));}@@ -293,7 +289,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function detachModel($kit_id, $model_id) : JsonResponse+ public function detachModel($kit_id, $model_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -308,7 +304,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function indexConsumables($kit_id) : array+ public function indexConsumables($kit_id): array{$this->authorize('view', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -322,7 +318,7 @@ class PredefinedKitsController extends Controller** @param int $id*/- public function storeConsumable(Request $request, $kit_id) : JsonResponse+ public function storeConsumable(Request $request, $kit_id): JsonResponse{$this->authorize('update', PredefinedKit::class);@@ -346,10 +342,9 @@ class PredefinedKitsController extends Controller/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request* @param int $kit_id*/- public function updateConsumable(Request $request, $kit_id, $consumable_id) : JsonResponse+ public function updateConsumable(Request $request, $kit_id, $consumable_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -357,7 +352,7 @@ class PredefinedKitsController extends Controllerif ($quantity < 1) {$quantity = 1;}- $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' => $quantity]]);+ $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' => $quantity]]);return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.consumable_updated')));}@@ -367,7 +362,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function detachConsumable($kit_id, $consumable_id) : JsonResponse+ public function detachConsumable($kit_id, $consumable_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -382,7 +377,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function indexAccessories($kit_id) : array+ public function indexAccessories($kit_id): array{$this->authorize('view', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -396,7 +391,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function storeAccessory(Request $request, $kit_id) : JsonResponse+ public function storeAccessory(Request $request, $kit_id): JsonResponse{$this->authorize('update', PredefinedKit::class);@@ -420,10 +415,9 @@ class PredefinedKitsController extends Controller/*** Update the specified resource in storage.*- * @param \Illuminate\Http\Request $request* @param int $kit_id*/- public function updateAccessory(Request $request, $kit_id, $accessory_id) : JsonResponse+ public function updateAccessory(Request $request, $kit_id, $accessory_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);@@ -431,7 +425,7 @@ class PredefinedKitsController extends Controllerif ($quantity < 1) {$quantity = 1;}- $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' => $quantity]]);+ $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' => $quantity]]);return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.accessory_updated')));}@@ -441,7 +435,7 @@ class PredefinedKitsController extends Controller** @param int $kit_id*/- public function detachAccessory($kit_id, $accessory_id) : JsonResponse+ public function detachAccessory($kit_id, $accessory_id): JsonResponse{$this->authorize('update', PredefinedKit::class);$kit = PredefinedKit::findOrFail($kit_id);diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.phpindex 7648dd5ad8..c261f5cf2a 100644--- a/app/Http/Controllers/Api/ProfileController.php+++ b/app/Http/Controllers/Api/ProfileController.php@@ -4,37 +4,32 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Transformers\ActionlogsTransformer;use App\Http\Transformers\ProfileTransformer;use App\Models\CheckoutRequest;-use App\Models\Setting;-use Illuminate\Http\RedirectResponse;-use Illuminate\Http\Response;-use Illuminate\Http\Request;-use Illuminate\Support\Facades\Storage;-use Laravel\Passport\TokenRepository;-use Illuminate\Contracts\Validation\Factory as ValidationFactory;-use Illuminate\Support\Facades\Gate;use App\Models\CustomField;+use App\Models\Setting;use App\Models\User;-use Illuminate\Support\Facades\DB;+use Illuminate\Contracts\Validation\Factory as ValidationFactory;use Illuminate\Http\JsonResponse;-use Symfony\Component\HttpFoundation\BinaryFileResponse;+use Illuminate\Http\Request;+use Illuminate\Http\Response;+use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Gate;+use Laravel\Passport\TokenRepository;class ProfileController extends Controller{-/*** The token repository implementation.*- * @var \Laravel\Passport\TokenRepository+ * @var TokenRepository*/protected $tokenRepository;/*** Create a controller instance.*- * @param \Laravel\Passport\TokenRepository $tokenRepository- * @param \Illuminate\Contracts\Validation\Factory $validation* @return void*/public function __construct(TokenRepository $tokenRepository, ValidationFactory $validation)@@ -47,20 +42,21 @@ class ProfileController extends Controller* Display a listing of requested assets.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.3.0]*/- public function requestedAssets() : array+ public function requestedAssets(): array{$checkoutRequests = CheckoutRequest::where('user_id', '=', auth()->id())->get();- $results = array();- $show_field = array();- $showable_fields = array();+ $results = [];+ $show_field = [];+ $showable_fields = [];$results['total'] = $checkoutRequests->count();- $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load+ $all_custom_fields = CustomField::all(); // used as a 'cache' of custom fields throughout this page loadforeach ($all_custom_fields as $field) {- if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {+ if (($field->field_encrypted == '0') && ($field->show_in_requestable_list == '1')) {$showable_fields[] = $field->db_column_name();}}@@ -80,30 +76,29 @@ class ProfileController extends Controller];foreach ($showable_fields as $showable_field_name) {- $show_field['custom_fields.'.$showable_field_name] = $checkoutRequest->itemRequested()->{$showable_field_name};+ $show_field['custom_fields.'.$showable_field_name] = $checkoutRequest->itemRequested()->{$showable_field_name};}// Merge the plain asset data and the custom fields data$results['rows'][] = array_merge($assets, $show_field);}-}return $results;}-/*** Delete an API token** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0.5]*/- public function createApiToken(Request $request) : JsonResponse+ public function createApiToken(Request $request): JsonResponse{- if (!Gate::allows('self.api')) {+ if (! Gate::allows('self.api')) {abort(403);}@@ -112,27 +107,29 @@ class ProfileController extends Controllerif ($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()->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;+return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, trans('account/general.personal_api_keys_success', ['key' => $accessTokenName])));}+return response()->json(Helper::formatStandardApiResponse('error', null, 'Token could not be created.'));}-/*** Delete an API token** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0.5]*/- public function deleteApiToken($tokenId) : Response+ public function deleteApiToken($tokenId): Response{- if (!Gate::allows('self.api')) {+ if (! Gate::allows('self.api')) {abort(403);}@@ -150,20 +147,20 @@ class ProfileController extends Controller}-/*** Show user's API tokens** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0.5]*/- public function showApiTokens() : JsonResponse+ public function showApiTokens(): JsonResponse{- if (!Gate::allows('self.api')) {+ if (! Gate::allows('self.api')) {abort(403);}-+$tokens = $this->tokenRepository->forUser(auth()->user()->getAuthIdentifier());$token_values = $tokens->load('client')->filter(function ($token) {return $token->client->personal_access_client && ! $token->revoked;@@ -176,29 +173,30 @@ class ProfileController extends Controller/*** Display the EULAs accepted by the user.*- * @param \App\Http\Transformers\ActionlogsTransformer $transformer- * @return \Illuminate\Http\JsonResponse+ * @param ActionlogsTransformer $transformer+ * @return JsonResponse+ **@since [v8.1.16]+ ** @author [Godfrey Martinez] [<[email protected]>]*/public function eulas(ProfileTransformer $transformer, Request $request){- if (($request->filled('user_id')) && ($request->input( 'user_id') != 0)) {+ if (($request->filled('user_id')) && ($request->input('user_id') != 0)) {$eula_user = User::find($request->input('user_id'));if (($eula_user) && (Setting::getSettings()->manager_view_enabled) && (auth()->user()->isManagerOf($eula_user))) {$eulas = $eula_user->eulas;} else {- return response()->json(Helper:: formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')));+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')));}} else {$eulas = auth()->user()->eulas;}- return response()->json($transformer->transformFiles($eulas, $eulas->count()));+ return response()->json($transformer->transformFiles($eulas, $eulas->count()));}-}diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.phpindex c03dddf6b7..9f583d560f 100644--- a/app/Http/Controllers/Api/ReportsController.php+++ b/app/Http/Controllers/Api/ReportsController.php@@ -5,10 +5,8 @@ namespace App\Http\Controllers\Api;use App\Http\Controllers\Controller;use App\Http\Transformers\ActionlogsTransformer;use App\Models\Actionlog;-use App\Models\Company;-use App\Models\Setting;-use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;class ReportsController extends Controller{@@ -16,15 +14,15 @@ class ReportsController extends Controller* Returns Activity Report JSON.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : JsonResponse | array+ public function index(Request $request): JsonResponse|array{$this->authorize('activity.view');$actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');-if ($request->filled('search')) {$actionlogs = $actionlogs->TextSearch(e($request->input('search')));}@@ -35,15 +33,13 @@ class ReportsController extends Controller}if (($request->filled('item_type')) && ($request->filled('item_id'))) {- $actionlogs = $actionlogs->where(function($query) use ($request)- {+ $actionlogs = $actionlogs->where(function ($query) use ($request) {$query->where('item_id', '=', $request->input('item_id'))- ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')))- ->orWhere(function($query) use ($request)- {- $query->where('target_id', '=', $request->input('item_id'))- ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));- });+ ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')))+ ->orWhere(function ($query) use ($request) {+ $query->where('target_id', '=', $request->input('item_id'))+ ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));+ });});}@@ -58,12 +54,11 @@ class ReportsController extends Controllerif ($request->filled('action_source')) {$actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'));}-+if ($request->filled('remote_ip')) {$actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'));}-if ($request->filled('uploads')) {$actionlogs = $actionlogs->whereNotNull('filename');}@@ -84,7 +79,6 @@ class ReportsController extends Controller'action_date',];-$total = $actionlogs->count();// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.phpindex b410998926..092e1a48ce 100644--- a/app/Http/Controllers/Api/SettingsController.php+++ b/app/Http/Controllers/Api/SettingsController.php@@ -3,38 +3,36 @@namespace App\Http\Controllers\Api;use App\Helpers\Helper;-use App\Http\Transformers\DatatablesTransformer;-use Illuminate\Http\Request;use App\Http\Controllers\Controller;+use App\Http\Transformers\DatatablesTransformer;+use App\Http\Transformers\LoginAttemptsTransformer;use App\Models\Ldap;use App\Models\Setting;use App\Notifications\MailTest;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Notification;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;-use App\Http\Transformers\LoginAttemptsTransformer;use Symfony\Component\HttpFoundation\BinaryFileResponse;-class SettingsController extends Controller{--- public function ldaptest() : JsonResponse+ public function ldaptest(): JsonResponse{$settings = Setting::getSettings();- if ($settings->ldap_enabled!='1') {+ if ($settings->ldap_enabled != '1') {Log::debug('LDAP is not enabled cannot test.');+return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);}Log::debug('Preparing to test LDAP connection');- $message = []; //where we collect together test messages+ $message = []; // where we collect together test messagestry {$connection = Ldap::connectToLdap();try {@@ -45,27 +43,27 @@ class SettingsController extends Controller'message' => 'Successfully connected to LDAP server.',];- $users = collect(Ldap::findLdapUsers(null,10))->filter(function ($value, $key) {+ $users = collect(Ldap::findLdapUsers(null, 10))->filter(function ($value, $key) {return is_int($key);})->slice(0, 10)->map(function ($item) use ($settings) {return (object) [- 'username' => $item[$settings['ldap_username_field']][0] ?? null,- 'display_name' => $item[$settings['ldap_display_name']][0] ?? null,+ 'username' => $item[$settings['ldap_username_field']][0] ?? null,+ 'display_name' => $item[$settings['ldap_display_name']][0] ?? null,'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,- 'lastname' => $item[$settings['ldap_lname_field']][0] ?? null,- 'firstname' => $item[$settings['ldap_fname_field']][0] ?? null,- 'email' => $item[$settings['ldap_email']][0] ?? null,- 'phone' => $item[$settings['ldap_phone_field']][0] ?? null,- 'mobile' => $item[$settings['ldap_mobile']][0] ?? null,- 'jobtitle' => $item[$settings['ldap_jobtitle']][0] ?? null,- 'department' => $item[$settings['ldap_department']][0] ?? null,- 'manager' => $item[$settings['ldap_manager']][0] ?? null,- 'address' => $item[$settings['ldap_address']][0] ?? null,- 'city' => $item[$settings['ldap_city']][0] ?? null,- 'state' => $item[$settings['ldap_state']][0] ?? null,- 'zip' => $item[$settings['ldap_zip']][0] ?? null,- 'country' => $item[$settings['ldap_country']][0] ?? null,- 'location' => $item[$settings['ldap_location']][0] ?? null,+ 'lastname' => $item[$settings['ldap_lname_field']][0] ?? null,+ 'firstname' => $item[$settings['ldap_fname_field']][0] ?? null,+ 'email' => $item[$settings['ldap_email']][0] ?? null,+ 'phone' => $item[$settings['ldap_phone_field']][0] ?? null,+ 'mobile' => $item[$settings['ldap_mobile']][0] ?? null,+ 'jobtitle' => $item[$settings['ldap_jobtitle']][0] ?? null,+ 'department' => $item[$settings['ldap_department']][0] ?? null,+ 'manager' => $item[$settings['ldap_manager']][0] ?? null,+ 'address' => $item[$settings['ldap_address']][0] ?? null,+ 'city' => $item[$settings['ldap_city']][0] ?? null,+ 'state' => $item[$settings['ldap_state']][0] ?? null,+ 'zip' => $item[$settings['ldap_zip']][0] ?? null,+ 'country' => $item[$settings['ldap_country']][0] ?? null,+ 'location' => $item[$settings['ldap_location']][0] ?? null,];});if ($users->count() > 0) {@@ -76,47 +74,47 @@ class SettingsController extends Controller$message['user_sync'] = ['message' => 'Connection to LDAP was successful, however there were no users returned from your query. You should confirm the Base Bind DN above.',];-+return response()->json($message, 400);}return response()->json($message, 200);} catch (\Exception $e) {Log::debug('Bind failed');- Log::debug("Exception was: ".$e->getMessage());+ Log::debug('Exception was: '.$e->getMessage());+return response()->json(['message' => $e->getMessage()], 400);- //return response()->json(['message' => $e->getMessage()], 500);+ // return response()->json(['message' => $e->getMessage()], 500);}} catch (\Exception $e) {Log::debug('Connection failed but we cannot debug it any further on our end.');+return response()->json(['message' => $e->getMessage()], 400);}-}- public function ldaptestlogin(Request $request) : JsonResponse+ public function ldaptestlogin(Request $request): JsonResponse{if (Setting::getSettings()->ldap_enabled != '1') {Log::debug('LDAP is not enabled. Cannot test.');+return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);}-- $rules = array(+ $rules = ['ldaptest_user' => 'required',- 'ldaptest_password' => 'required'- );+ 'ldaptest_password' => 'required',+ ];$validator = Validator::make($request->all(), $rules);if ($validator->fails()) {Log::debug('LDAP Validation test failed.');- $validation_errors = implode(' ',$validator->errors()->all());+ $validation_errors = implode(' ', $validator->errors()->all());+return response()->json(['message' => $validator->errors()->all()], 400);}--Log::debug('Preparing to test LDAP login');try {@@ -127,60 +125,68 @@ class SettingsController extends Controllertry {$ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password'));if ($ldap_user) {- Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.');- return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);+ Log::debug('It worked! '.$request->input('ldaptest_user').' successfully binded to LDAP.');++ return response()->json(['message' => 'It worked! '.$request->input('ldaptest_user').' successfully binded to LDAP.'], 200);}- return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);++ return response()->json(['message' => 'Login Failed. '.$request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);} catch (\Exception $e) {Log::debug('LDAP login failed');+return response()->json(['message' => $e->getMessage()], 400);}} catch (\Exception $e) {Log::debug('Bind failed');+return response()->json(['message' => $e->getMessage()], 400);- //return response()->json(['message' => $e->getMessage()], 500);+ // return response()->json(['message' => $e->getMessage()], 500);}} catch (\Exception $e) {Log::debug('Connection failed');+return response()->json(['message' => $e->getMessage()], 500);}-}/*** Test the email configuration** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function ajaxTestEmail() : JsonResponse+ public function ajaxTestEmail(): JsonResponse{- if (!config('app.lock_passwords')) {+ if (! config('app.lock_passwords')) {try {- Notification::send(Setting::first(), new MailTest());+ Notification::send(Setting::first(), new MailTest);Log::debug('Attempting to sending to '.config('mail.reply_to.address'));+return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);} catch (\Exception $e) {- Log::error('Mail sent error using '.config('mail.reply_to.address') .': '. $e->getMessage());+ Log::error('Mail sent error using '.config('mail.reply_to.address').': '.$e->getMessage());Log::debug($e);+return response()->json(['message' => $e->getMessage()], 500);}}+return response()->json(['message' => 'Mail would have been sent, but this application is in demo mode! '], 200);}-/*** Delete server-cached barcodes** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0.0]*/- public function purgeBarcodes() : JsonResponse+ public function purgeBarcodes(): JsonResponse{$file_count = 0;$files = Storage::disk('public')->files('barcodes');@@ -195,7 +201,6 @@ class SettingsController extends Controllerif ($extension == 'png') {Log::debug('Deleting: '.$file);-try {Storage::disk('public')->delete($file);Log::debug('Deleting: '.$file);@@ -209,18 +214,14 @@ class SettingsController extends Controllerreturn response()->json(['message' => 'Deleted '.$file_count.' barcodes'], 200);}----/*** Get a list of login attempts** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0.0]- * @param \Illuminate\Http\Request $request*/- public function showLoginAttempts(Request $request) : array+ public function showLoginAttempts(Request $request): array{$allowed_columns = ['id', 'username', 'remote_ip', 'user_agent', 'successful', 'created_at'];@@ -235,13 +236,12 @@ class SettingsController extends Controllerreturn (new LoginAttemptsTransformer)->transformLoginAttempts($login_attempt_results, $total);}-/*** Lists backup files** @author [A. Gianotto]*/- public function listBackups() : array+ public function listBackups(): array{$settings = Setting::getSettings();$path = 'app/backups';@@ -272,11 +272,11 @@ class SettingsController extends Controller}$files = array_reverse($files_raw);+return (new DatatablesTransformer)->transformDatatables($files, $count);}-/*** Downloads a backup file.* We use response()->download() here instead of Storage::download() because Storage::download()@@ -284,16 +284,17 @@ class SettingsController extends Controller** @author [A. Gianotto]*/- public function downloadBackup($file) : JsonResponse | BinaryFileResponse+ public function downloadBackup($file): JsonResponse|BinaryFileResponse{$path = storage_path('app/backups');-+if (Storage::exists('app/backups/'.$file)) {$headers = ['ContentType' => 'application/zip'];+return response()->download($path.'/'.$file, $file, $headers);} else {- return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 404);+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 404);}}@@ -302,9 +303,10 @@ class SettingsController extends Controller* Determines and downloads the latest backup** @author [A. Gianotto]+ ** @since [v6.3.1]*/- public function downloadLatestBackup() : JsonResponse | BinaryFileResponse+ public function downloadLatestBackup(): JsonResponse|BinaryFileResponse{$fileData = collect();@@ -312,7 +314,7 @@ class SettingsController extends Controllerif (pathinfo($file, PATHINFO_EXTENSION) == 'zip') {$fileData->push(['file' => $file,- 'date' => Storage::lastModified($file)+ 'date' => Storage::lastModified($file),]);}}@@ -320,13 +322,11 @@ class SettingsController extends Controller$newest = $fileData->sortByDesc('date')->first();if (Storage::exists($newest['file'])) {$headers = ['ContentType' => 'application/zip'];+return response()->download(storage_path($newest['file']), basename($newest['file']), $headers);} else {- return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 404);+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 404);}-}--}diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.phpindex a1158cd61a..fc9de64687 100644--- a/app/Http/Controllers/Api/StatuslabelsController.php+++ b/app/Http/Controllers/Api/StatuslabelsController.php@@ -5,14 +5,14 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Transformers\AssetsTransformer;+use App\Http\Transformers\PieChartTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Http\Transformers\StatuslabelsTransformer;use App\Models\Asset;use App\Models\Setting;use App\Models\Statuslabel;-use Illuminate\Http\Request;-use App\Http\Transformers\PieChartTransformer;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;class StatuslabelsController extends Controller{@@ -20,9 +20,10 @@ class StatuslabelsController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function index(Request $request) : array+ public function index(Request $request): array{$this->authorize('view', Statuslabel::class);$allowed_columns = [@@ -32,7 +33,7 @@ class StatuslabelsController extends Controller'assets_count','color','notes',- 'default_label'+ 'default_label',];$statuslabels = Statuslabel::with('adminuser')->withCount('assets as assets_count');@@ -45,7 +46,6 @@ class StatuslabelsController extends Controller$statuslabels->where('name', '=', $request->input('name'));}-// if a status_type is passed, filter by thatif ($request->filled('status_type')) {if (strtolower($request->input('status_type')) == 'pending') {@@ -63,7 +63,7 @@ class StatuslabelsController extends Controller$offset = ($request->input('offset') > $statuslabels->count()) ? $statuslabels->count() : app('api_offset_value');$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort_override = $request->input('sort');+ $sort_override = $request->input('sort');$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';switch ($sort_override) {@@ -81,15 +81,14 @@ class StatuslabelsController extends Controllerreturn (new StatuslabelsTransformer)->transformStatuslabels($statuslabels, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request*/- public function store(Request $request) : JsonResponse+ public function store(Request $request): JsonResponse{$this->authorize('create', Statuslabel::class);$request->except('deployable', 'pending', 'archived');@@ -106,14 +105,14 @@ class StatuslabelsController extends Controller$statuslabel->deployable = $statusType['deployable'];$statuslabel->pending = $statusType['pending'];$statuslabel->archived = $statusType['archived'];- $statuslabel->color = $request->input('color');- $statuslabel->show_in_nav = $request->input('show_in_nav', 0);- $statuslabel->default_label = $request->input('default_label', 0);-+ $statuslabel->color = $request->input('color');+ $statuslabel->show_in_nav = $request->input('show_in_nav', 0);+ $statuslabel->default_label = $request->input('default_label', 0);if ($statuslabel->save()) {return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors()));}@@ -122,10 +121,12 @@ class StatuslabelsController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Statuslabel::class);$statuslabel = Statuslabel::findOrFail($id);@@ -133,22 +134,21 @@ class StatuslabelsController extends Controllerreturn (new StatuslabelsTransformer)->transformStatuslabel($statuslabel);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ ** @param int $id*/- public function update(Request $request, $id) : JsonResponse+ public function update(Request $request, $id): JsonResponse{$this->authorize('update', Statuslabel::class);$statuslabel = Statuslabel::findOrFail($id);-- $request->except('deployable', 'pending', 'archived');+ $request->except('deployable', 'pending', 'archived');if (! $request->filled('type')) {return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.'));@@ -160,9 +160,9 @@ class StatuslabelsController extends Controller$statuslabel->deployable = $statusType['deployable'];$statuslabel->pending = $statusType['pending'];$statuslabel->archived = $statusType['archived'];- $statuslabel->color = $request->input('color');- $statuslabel->show_in_nav = $request->input('show_in_nav', 0);- $statuslabel->default_label = $request->input('default_label', 0);+ $statuslabel->color = $request->input('color');+ $statuslabel->show_in_nav = $request->input('show_in_nav', 0);+ $statuslabel->default_label = $request->input('default_label', 0);if ($statuslabel->save()) {return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.update.success')));@@ -175,10 +175,12 @@ class StatuslabelsController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy($id) : JsonResponse+ public function destroy($id): JsonResponse{$this->authorize('delete', Statuslabel::class);$statuslabel = Statuslabel::findOrFail($id);@@ -194,20 +196,19 @@ class StatuslabelsController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/statuslabels/message.assoc_assets')));}--- /**+ /*** Show a count of assets by status label for pie chart** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function getAssetCountByStatuslabel() : array+ public function getAssetCountByStatuslabel(): array{$this->authorize('view', Statuslabel::class);- if (Setting::getSettings()->show_archived_in_list == 0 ) {- $statuslabels = Statuslabel::withCount('assets')->where('archived','0')->get();+ if (Setting::getSettings()->show_archived_in_list == 0) {+ $statuslabels = Statuslabel::withCount('assets')->where('archived', '0')->get();} else {$statuslabels = Statuslabel::withCount('assets')->get();}@@ -224,7 +225,7 @@ class StatuslabelsController extends Controller}}- return (new PieChartTransformer())->transformPieChartDate($total);+ return (new PieChartTransformer)->transformPieChartDate($total);}@@ -232,9 +233,10 @@ class StatuslabelsController extends Controller* Show a count of assets by meta status type for pie chart** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0.11]*/- public function getAssetCountByMetaStatus() : array+ public function getAssetCountByMetaStatus(): array{$this->authorize('view', Statuslabel::class);@@ -253,17 +255,19 @@ class StatuslabelsController extends Controller$total['undeployable']['label'] = trans('general.undeployable');$total['undeployable']['count'] = Asset::Undeployable()->count();- return (new PieChartTransformer())->transformPieChartDate($total);+ return (new PieChartTransformer)->transformPieChartDate($total);}/*** Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function assets(Request $request, $id) : array+ public function assets(Request $request, $id): array{$this->authorize('view', Statuslabel::class);$this->authorize('index', Asset::class);@@ -283,11 +287,9 @@ class StatuslabelsController extends Controller$total = $assets->count();$assets = $assets->skip($offset)->take($limit)->get();-return (new AssetsTransformer)->transformAssets($assets, $total);}-/*** Returns a boolean response based on whether the status label* is one that is deployable or pending.@@ -298,9 +300,10 @@ class StatuslabelsController extends Controller* assigned but the status is changed to one that isn't pending or deployable** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function checkIfDeployable($id) : string+ public function checkIfDeployable($id): string{$statuslabel = Statuslabel::findOrFail($id);if (($statuslabel->getStatuslabelType() == 'pending') || ($statuslabel->getStatuslabelType() == 'deployable')) {@@ -314,10 +317,11 @@ class StatuslabelsController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.1.1]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.phpindex 7181a1545a..98361ec62c 100644--- a/app/Http/Controllers/Api/SuppliersController.php+++ b/app/Http/Controllers/Api/SuppliersController.php@@ -4,20 +4,21 @@ namespace App\Http\Controllers\Api;use App\Actions\Suppliers\DestroySupplierAction;use App\Exceptions\ItemStillHasAccessories;+use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasComponents;use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasMaintenances;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasLicenses;+use App\Exceptions\ItemStillHasMaintenances;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\ImageUploadRequest;use App\Http\Transformers\SelectlistTransformer;use App\Http\Transformers\SuppliersTransformer;use App\Models\Supplier;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use App\Http\Requests\ImageUploadRequest;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Storage;-use Illuminate\Http\JsonResponse;class SuppliersController extends Controller{@@ -25,8 +26,10 @@ class SuppliersController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @return \Illuminate\Http\Response+ *+ * @return Response*/public function index(Request $request): array{@@ -54,22 +57,20 @@ class SuppliersController extends Controller'url','notes',];-- $suppliers = Supplier::select(- ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip', 'tag_color'])- ->withCount('assets as assets_count')- ->withCount('licenses as licenses_count')- ->withCount('accessories as accessories_count')- ->withCount('components as components_count')- ->withCount('consumables as consumables_count')- ->with('adminuser');+ $suppliers = Supplier::select(+ ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip', 'tag_color'])+ ->withCount('assets as assets_count')+ ->withCount('licenses as licenses_count')+ ->withCount('accessories as accessories_count')+ ->withCount('components as components_count')+ ->withCount('consumables as consumables_count')+ ->with('adminuser');if ($request->filled('search')) {$suppliers->TextSearch($request->input('search'));}-if ($request->filled('name')) {$suppliers->where('name', '=', $request->input('name'));}@@ -132,15 +133,14 @@ class SuppliersController extends Controllerreturn (new SuppliersTransformer)->transformSuppliers($suppliers, $total);}-/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : JsonResponse+ public function store(ImageUploadRequest $request): JsonResponse{$this->authorize('create', Supplier::class);$supplier = new Supplier;@@ -150,6 +150,7 @@ class SuppliersController extends Controllerif ($supplier->save()) {return response()->json(Helper::formatStandardApiResponse('success', $supplier, trans('admin/suppliers/message.create.success')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $supplier->getErrors()));}@@ -158,10 +159,12 @@ class SuppliersController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function show($id) : array+ public function show($id): array{$this->authorize('view', Supplier::class);$supplier = Supplier::findOrFail($id);@@ -169,16 +172,16 @@ class SuppliersController extends Controllerreturn (new SuppliersTransformer)->transformSupplier($supplier);}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \App\Http\Requests\ImageUploadRequest $request+ ** @param int $id*/- public function update(ImageUploadRequest $request, $id) : JsonResponse+ public function update(ImageUploadRequest $request, $id): JsonResponse{$this->authorize('update', Supplier::class);$supplier = Supplier::findOrFail($id);@@ -196,7 +199,9 @@ class SuppliersController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/public function destroy(Supplier $supplier): JsonResponse@@ -206,30 +211,31 @@ class SuppliersController extends ControllerDestroySupplierAction::run(supplier: $supplier);} catch (ItemStillHasAssets $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_assets', [- 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')+ 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier'),])));} catch (ItemStillHasMaintenances $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_maintenances', [- 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')+ 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier'),])));} catch (ItemStillHasLicenses $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_licenses', [- 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')+ 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier'),])));} catch (ItemStillHasAccessories $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_accessories', [- 'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier')+ 'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier'),])));} catch (ItemStillHasConsumables $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_consumables', [- 'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier')+ 'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier'),])));} catch (ItemStillHasComponents $e) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_components', [- 'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier')+ 'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier'),])));} catch (\Exception $e) {report($e);+return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));}@@ -240,10 +246,11 @@ class SuppliersController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$this->authorize('view.selectlists');diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.phpindex 98220972ed..a40689d488 100644--- a/app/Http/Controllers/Api/UploadedFilesController.php+++ b/app/Http/Controllers/Api/UploadedFilesController.php@@ -14,28 +14,27 @@ use Illuminate\Support\Facades\Storage;use Symfony\Component\HttpFoundation\BinaryFileResponse;use Symfony\Component\HttpFoundation\StreamedResponse;-class UploadedFilesController extends Controller{--/*** List files for an object*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to list files for+ * @param UploadFileRequest $request+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to list files for+ ** @since [v8.1.17]+ ** @author [A. Gianotto <[email protected]>]*/- public function index(Request $request, $object_type, $id) : JsonResponse | array+ public function index(Request $request, $object_type, $id): JsonResponse|array{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('view', $object);- if (!$object) {+ if (! $object) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));}@@ -50,7 +49,6 @@ class UploadedFilesController extends Controller'created_at',];-$uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()->with('adminuser');@@ -66,8 +64,8 @@ class UploadedFilesController extends Controller$uploads->where(function ($query) use ($request) {- $query->where('filename', 'LIKE', '%' . $request->input('search') . '%')- ->orWhere('note', 'LIKE', '%' . $request->input('search') . '%');+ $query->where('filename', 'LIKE', '%'.$request->input('search').'%')+ ->orWhere('note', 'LIKE', '%'.$request->input('search').'%');});}@@ -75,27 +73,27 @@ class UploadedFilesController extends Controller$total = $uploads->count();$uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->get();- return (new UploadedFilesTransformer())->transformFiles($uploads, $total);+ return (new UploadedFilesTransformer)->transformFiles($uploads, $total);}-/*** Accepts a POST to upload a file to the server.*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to store so we can check permisisons+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to store so we can check permisisons+ ** @since [v8.1.17]+ ** @author [A. Gianotto <[email protected]>]*/- public function store(UploadFileRequest $request, $object_type, $id) : JsonResponse+ public function store(UploadFileRequest $request, $object_type, $id): JsonResponse{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('update', $object);- if (!$object) {+ if (! $object) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));}@@ -104,7 +102,6 @@ class UploadedFilesController extends ControllerStorage::makeDirectory(self::$map_storage_path[$object_type], 775);}-if ($request->hasFile('file')) {// Loop over the attached files and add them to the objectforeach ($request->file('file') as $file) {@@ -119,7 +116,7 @@ class UploadedFilesController extends Controller->where('item_id', '=', $id)->whereIn('filename', $files)->get();- return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer())->transformFiles($file_results, count($file_results)), trans_choice('general.file_upload_status.upload.success', count($files))));+ return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer)->transformFiles($file_results, count($file_results)), trans_choice('general.file_upload_status.upload.success', count($files))));}}@@ -128,36 +125,34 @@ class UploadedFilesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.nofiles')));}--/*** Check for permissions and display the file.*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to delete from so we can check permisisons- * @param $file_id the ID of the file to delete from the action_logs table+ * @param UploadFileRequest $request+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to delete from so we can check permisisons+ * @param $file_id the ID of the file to delete from the action_logs table+ ** @since [v8.1.17]+ ** @author [A. Gianotto <[email protected]>]*/- public function show($object_type, $id, $file_id) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse+ public function show($object_type, $id, $file_id): JsonResponse|StreamedResponse|Storage|StorageHelper|BinaryFileResponse{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('view', $object);- if (!$object) {+ if (! $object) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));}-// Check that the file being requested exists for the objectif (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_id')), 200);}-if (! Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.file_not_found'), 200));}@@ -166,6 +161,7 @@ class UploadedFilesController extends Controller$headers = ['Content-Disposition' => 'inline',];+return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers);}@@ -176,25 +172,26 @@ class UploadedFilesController extends Controller/*** Delete the associated file*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to delete from so we can check permisisons- * @param $file_id the ID of the file to delete from the action_logs table+ * @param UploadFileRequest $request+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to delete from so we can check permisisons+ * @param $file_id the ID of the file to delete from the action_logs table+ ** @since [v8.1.17]+ ** @author [A. Gianotto <[email protected]>]*/- public function destroy($object_type, $id, $file_id) : JsonResponse+ public function destroy($object_type, $id, $file_id): JsonResponse{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('update', $object);- if (!$object) {+ if (! $object) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));}-// Check for the file$log = Actionlog::query()->where('id', $file_id)@@ -213,7 +210,6 @@ class UploadedFilesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('success', null, trans_choice('general.file_upload_status.delete.success', 1)), 200);}-}// The file doesn't seem to really exist, so report an errordiff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.phpindex 0b3720a2bc..ae7d8351a7 100644--- a/app/Http/Controllers/Api/UsersController.php+++ b/app/Http/Controllers/Api/UsersController.php@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Api;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Http\Requests\DeleteUserRequest;+use App\Http\Requests\FilterRequest;use App\Http\Requests\SaveUserRequest;use App\Http\Transformers\AccessoriesTransformer;use App\Http\Transformers\ActionlogsTransformer;@@ -12,26 +14,22 @@ use App\Http\Transformers\ConsumablesTransformer;use App\Http\Transformers\LicensesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Http\Transformers\UsersTransformer;+use App\Models\Accessory;use App\Models\Actionlog;use App\Models\Asset;-use App\Models\Accessory;use App\Models\Company;use App\Models\Consumable;use App\Models\License;use App\Models\User;use App\Notifications\CurrentInventory;use App\Notifications\WelcomeNotification;-use Illuminate\Support\Facades\Artisan;-use Illuminate\Support\Facades\Auth;use Illuminate\Database\Eloquent\Builder;+use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Gate;+use Illuminate\Support\Facades\Artisan;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;-use Illuminate\Support\Facades\Log;-use App\Http\Requests\DeleteUserRequest;-use Illuminate\Http\JsonResponse;-use App\Http\Requests\FilterRequest;class UsersController extends Controller{@@ -39,11 +37,10 @@ class UsersController extends Controller* Display a listing of the resource.** @author [A. Gianotto] [<[email protected]>]- * @since [v4.0]*- * @return array+ * @since [v4.0]*/- public function index(FilterRequest $request) : array+ public function index(FilterRequest $request): array{$this->authorize('view', User::class);@@ -94,14 +91,14 @@ class UsersController extends Controller->with('department')->with('createdBy')->withCount([- 'assets as assets_count' => function(Builder $query) {+ 'assets as assets_count' => function (Builder $query) {$query->withoutTrashed();},'licenses as licenses_count','accessories as accessories_count','consumables as consumables_count','managesUsers as manages_users_count',- 'managedLocations as manages_locations_count'+ 'managedLocations as manages_locations_count',]);$allowed_columns =@@ -261,7 +258,7 @@ class UsersController extends Controller}if ($request->filled('manager_id')) {- $users = $users->where('users.manager_id','=',$request->input('manager_id'));+ $users = $users->where('users.manager_id', '=', $request->input('manager_id'));}if ($request->filled('ldap_import')) {@@ -293,7 +290,7 @@ class UsersController extends Controller}if ($request->filled('assets_count')) {- $users->has('assets', '=', $request->input('assets_count'));+ $users->has('assets', '=', $request->input('assets_count'));}if ($request->filled('consumables_count')) {@@ -324,7 +321,6 @@ class UsersController extends Controller$users = $users->where('users.locale', '=', $request->input('locale'));}-if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {$users = $users->onlyTrashed();} elseif (($request->filled('all')) && ($request->input('all') == 'true')) {@@ -363,8 +359,6 @@ class UsersController extends Controllerbreak;}--// Make sure the offset and limit are actually integers and do not exceed system limits$offset = ($request->input('offset') > $users->count()) ? $users->count() : app('api_offset_value');$limit = app('api_limit_value');@@ -379,10 +373,11 @@ class UsersController extends Controller* Gets a paginated collection for the select2 menus** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0.16]- * @see \App\Http\Transformers\SelectlistTransformer+ * @see SelectlistTransformer*/- public function selectlist(Request $request) : array+ public function selectlist(Request $request): array{$users = User::select([@@ -396,7 +391,7 @@ class UsersController extends Controller'users.avatar','users.email',]- )->where('show_in_list', '=', '1');+ )->where('show_in_list', '=', '1');if ($request->filled('search')) {$users = $users->where(function ($query) use ($request) {@@ -429,16 +424,16 @@ class UsersController extends Controllerreturn (new SelectlistTransformer)->transformSelectlist($users);}--/*** Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ *+ * @param Request $request*/- public function store(SaveUserRequest $request) : JsonResponse+ public function store(SaveUserRequest $request): JsonResponse{$this->authorize('create', User::class);@@ -456,7 +451,7 @@ class UsersController extends Controller}}- if (!auth()->user()->isAdmin()) {+ if (! auth()->user()->isAdmin()) {if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {unset($permissions_array['admin']);}@@ -465,7 +460,7 @@ class UsersController extends Controller$user->permissions = $permissions_array;}- //+ //if ($request->filled('password')) {$user->password = bcrypt($request->input('password'));} else {@@ -473,7 +468,7 @@ class UsersController extends Controller}app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');-+if ($user->save()) {if (($user->activated == '1') && ($user->email != '') && ($request->input('send_welcome') == '1')) {@@ -481,12 +476,11 @@ class UsersController extends Controllertry {$user->notify(new WelcomeNotification($user));} catch (\Exception $e) {- Log::warning('Could not send welcome notification for user: ' . $e->getMessage());+ Log::warning('Could not send welcome notification for user: '.$e->getMessage());}}-if (($request->has('groups')) && (auth()->user()->isSuperUser())) {$validator = Validator::make($request->only('groups'), [@@ -501,7 +495,6 @@ class UsersController extends Controller$user->groups()->sync($request->input('groups'));}-return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.create')));}@@ -512,28 +505,31 @@ class UsersController extends Controller* Display the specified resource.** @author [A. Gianotto] [<[email protected]>]+ ** @param int $id*/- public function show($id) : JsonResponse | array+ public function show($id): JsonResponse|array{$this->authorize('view', User::class);if ($user = User::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count')->find($id)) {$this->authorize('view', $user);+return (new UsersTransformer)->transformUser($user);}-+return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));}-/*** Update the specified resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param \Illuminate\Http\Request $request+ *+ * @param Request $request* @param int $id*/public function update(SaveUserRequest $request, User $user): JsonResponse@@ -544,9 +540,7 @@ class UsersController extends Controller* This is a janky hack to prevent people from changing admin demo user data on the public demo.* The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.* Thanks, jerks. You are why we can't have nice things. - snipe- **/-if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.'));}@@ -554,7 +548,6 @@ class UsersController extends Controller// Pull out sensitive fields that require extra permission$user->fill($request->except(['password', 'username', 'email', 'activated', 'permissions', 'activation_code', 'remember_token', 'two_factor_secret', 'two_factor_enrolled', 'two_factor_optin']));-if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {if ($request->filled('password')) {@@ -582,9 +575,8 @@ class UsersController extends Controller$permissions_array = $request->input('permissions');$orig_permissions_array = $user->decodePermissions();-// Strip out the individual superuser permission if the API user isn't a superadmin- if (!auth()->user()->isSuperUser()) {+ if (! auth()->user()->isSuperUser()) {if (is_array($orig_permissions_array)) {if (array_key_exists('superuser', $orig_permissions_array)) {@@ -595,7 +587,7 @@ class UsersController extends Controller}// Strip out the individual admin permission if the API user isn't an admin- if ((!auth()->user()->isAdmin()) && (!auth()->user()->isSuperUser())) {+ if ((! auth()->user()->isAdmin()) && (! auth()->user()->isSuperUser())) {if (is_array($orig_permissions_array)) {if (array_key_exists('admin', $orig_permissions_array)) {@@ -610,7 +602,6 @@ class UsersController extends Controller}-if ($request->filled('display_name')) {$user->display_name = $request->input('display_name');}@@ -623,16 +614,12 @@ class UsersController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));}---if ($request->has('location_id')) {// Update the location of any assets checked out to this userAsset::where('assigned_type', User::class)->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);}-app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');if ($user->save()) {@@ -650,8 +637,10 @@ class UsersController extends Controller// Sync the groups since the user is a superuser and the groups pass validation$user->groups()->sync($request->input('groups'));}+return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));}+return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));}@@ -659,10 +648,12 @@ class UsersController extends Controller* Remove the specified resource from storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]+ ** @param int $id*/- public function destroy(DeleteUserRequest $request, $id) : JsonResponse+ public function destroy(DeleteUserRequest $request, $id): JsonResponse{$this->authorize('delete', User::class);@@ -676,13 +667,13 @@ class UsersController extends Controller// Remove the user's avatar if they have one// @todo This should be done on purge, not here-// if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {-// try {-// Storage::disk('public')->delete('avatars/' . $user->avatar);-// } catch (\Exception $e) {-// Log::debug($e);-// }-// }+ // if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {+ // try {+ // Storage::disk('public')->delete('avatars/' . $user->avatar);+ // } catch (\Exception $e) {+ // Log::debug($e);+ // }+ // }return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.delete')));}@@ -702,10 +693,12 @@ class UsersController extends Controller* Return JSON containing a list of assets assigned to a user.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]- * @param $userId+ *+ * @param $userId*/- public function assets(Request $request, $id) : JsonResponse | array+ public function assets(Request $request, $id): JsonResponse|array{$this->authorize('view', User::class);$this->authorize('view', Asset::class);@@ -715,19 +708,17 @@ class UsersController extends Controller$assets = Asset::where('assigned_to', '=', $id)->where('assigned_type', '=', User::class)->with('model');-// Filter on category IDif ($request->filled('category_id')) {$assets = $assets->InCategory($request->input('category_id'));}-// Filter on model IDif ($request->filled('model_id')) {$model_ids = $request->input('model_id');- if (!is_array($model_ids)) {- $model_ids = array($model_ids);+ if (! is_array($model_ids)) {+ $model_ids = [$model_ids];}$assets = $assets->InModelList($model_ids);}@@ -745,12 +736,10 @@ class UsersController extends Controller* Notify a specific user via email with all of their assigned assets.** @author [Lukas Fehling] [<[email protected]>]+ ** @since [v6.0.13]- * @param Request $request- * @param $id*/- public function emailAssetList(Request $request, $id) : JsonResponse-+ public function emailAssetList(Request $request, $id): JsonResponse{$this->authorize('update', User::class);@@ -762,11 +751,11 @@ class UsersController extends Controller}$user->notify((new CurrentInventory($user)));+return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')));}return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));-}@@ -774,16 +763,19 @@ class UsersController extends Controller* Return JSON containing a list of consumables assigned to a user.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]- * @param $userId+ *+ * @param $userId*/- public function consumables(Request $request, $id) : array+ public function consumables(Request $request, $id): array{$this->authorize('view', User::class);$this->authorize('view', Consumable::class);$user = User::findOrFail($id);$this->authorize('view', $user);$consumables = $user->consumables;+return (new ConsumablesTransformer)->transformConsumables($consumables, $consumables->count(), $request);}@@ -791,10 +783,12 @@ class UsersController extends Controller* Return JSON containing a list of accessories assigned to a user.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.6.14]- * @param $userId+ *+ * @param $userId*/- public function accessories($id) : array+ public function accessories($id): array{$this->authorize('view', User::class);$user = User::findOrFail($id);@@ -809,17 +803,20 @@ class UsersController extends Controller* Return JSON containing a list of licenses assigned to a user.** @author [N. Mathar] [<[email protected]>]+ ** @since [v5.0]- * @param $userId+ *+ * @param $userId*/- public function licenses($id) : JsonResponse | array+ public function licenses($id): JsonResponse|array{$this->authorize('view', User::class);$this->authorize('view', License::class);-+if ($user = User::where('id', $id)->withTrashed()->first()) {$licenses = $user->licenses()->get();- return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());++ return (new LicensesTransformer)->transformLicenses($licenses, $licenses->count());}return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));@@ -830,10 +827,12 @@ class UsersController extends Controller* Reset the user's two-factor status** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]- * @param $userId+ *+ * @param $userId*/- public function postTwoFactorReset(Request $request) : JsonResponse+ public function postTwoFactorReset(Request $request): JsonResponse{$this->authorize('update', User::class);@@ -846,7 +845,7 @@ class UsersController extends Controller$user->saveQuietly();// Log the reset- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->target_type = User::class;$logaction->target_id = $user->id;$logaction->item_type = User::class;@@ -860,8 +859,8 @@ class UsersController extends Controllerreturn response()->json(['message' => trans('admin/settings/general.two_factor_reset_error')], 500);}}- return response()->json(['message' => 'No ID provided'], 500);+ return response()->json(['message' => 'No ID provided'], 500);}@@ -869,10 +868,10 @@ class UsersController extends Controller* Get info on the current user.** @author [Juan Font] [<[email protected]>]+ ** @since [v4.4.2]- * @param \Illuminate\Http\Request $request*/- public function getCurrentUserInfo(Request $request) : array+ public function getCurrentUserInfo(Request $request): array{return (new UsersTransformer)->transformUser($request->user());}@@ -880,10 +879,10 @@ class UsersController extends Controller/*** Display the EULAs accepted by the user.*- * @param \App\Models\User $user- * @param \App\Http\Transformers\ActionlogsTransformer $transformer- * @return \Illuminate\Http\JsonResponse+ * @return JsonResponse+ **@since [v8.1.16]+ ** @author [Godfrey Martinez] [<[email protected]>]*/public function eulas(User $user, ActionlogsTransformer $transformer)@@ -891,6 +890,7 @@ class UsersController extends Controller$this->authorize('view', User::class);$eulas = $user->eulas;+return response()->json($transformer->transformActionlogs($eulas, $eulas->count()));@@ -900,10 +900,12 @@ class UsersController extends Controller* Restore a soft-deleted user.** @author [E. Taylor] [<[email protected]>]- * @param int $userId+ *+ * @param int $userId+ ** @since [v6.0.0]*/- public function restore($userId) : JsonResponse+ public function restore($userId): JsonResponse{$this->authorize('delete', User::class);@@ -917,7 +919,7 @@ class UsersController extends Controllerif ($user->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = User::class;$logaction->item_id = $user->id;$logaction->created_at = date('Y-m-d H:i:s');@@ -933,14 +935,14 @@ class UsersController extends Controller}-/*** Run the LDAP sync command to import users from LDAP via API.** @author A. Gianotto <[email protected]>+ ** @since 8.2.2*- * @return \Illuminate\Http\JsonResponse+ * @return JsonResponse*/public function syncLdapUsers(Request $request){@@ -953,8 +955,8 @@ class UsersController extends Controller$ldap_results_json = Artisan::output();$ldap_results = json_decode($ldap_results_json, true);- if (!$ldap_results) {- return response()->json(Helper::formatStandardApiResponse('error', null,trans('general.no_results')), 200);+ if (! $ldap_results) {+ return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.no_results')), 200);}// Direct user to appropriate status page.