Sit 214 revert only formatting changes

.env.example

@@ -222,4 +222,4 @@ ARGON_TIME=2
 # OPTIONAL: SCIM
 # --------------------------------------------
 SCIM_TRACE=false
-SCIM_STANDARDS_COMPLIANCE=false
+SCIM_STANDARDS_COMPLIANCE=false

.gitignore

@@ -70,7 +70,4 @@ storage/ldap_client_tls.cert
 storage/ldap_client_tls.key
 /storage/framework/testing
 
-/.phpunit.cache
-
-#Ignore vscode AI rules
-.github/instructions/codacy.instructions.md
+/.phpunit.cache

app/Exceptions/Handler.php

@@ -150,19 +150,19 @@ public function render($request, Throwable $e)
             // Sigh.
             if ($route == 'assets.index') {
                 $route = 'hardware.index';
-            } else if ($route == 'reporttemplates.index') {
+            } elseif ($route == 'reporttemplates.index') {
                 $route = 'reports/custom';
-            } else if ($route == 'assetmodels.index') {
+            } elseif ($route == 'assetmodels.index') {
                 $route = 'models.index';
-            } else if ($route == 'predefinedkits.index') {
+            } elseif ($route == 'predefinedkits.index') {
                 $route = 'kits.index';
-            } else if ($route == 'assetmaintenances.index') {
+            } elseif ($route == 'assetmaintenances.index') {
                 $route = 'maintenances.index';
-            } else if ($route === 'licenseseats.index') {
+            } elseif ($route === 'licenseseats.index') {
                 $route = 'licenses.index';
-            } else if (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
+            } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
                 $route = 'fields.index';
-            } else if ($route === 'predefinedfilters.index') {
+            } elseif ($route === 'predefinedfilters.index') {
                 $route = 'predefined-filters.index';
             }
 

app/Http/Controllers/Api/AssetsController.php

@@ -58,7 +58,7 @@ class AssetsController extends Controller
      * @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
     {
 
 
@@ -135,7 +135,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
             'created_by',
 
         ];
-        
+
         $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
 
         foreach ($all_custom_fields as $field) {
@@ -159,7 +159,6 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
             $allowed_columns[] = $field->db_column_name();
         }
 
-
         $assets = Asset::select('assets.*')
             ->with(
                 'model',
@@ -196,7 +195,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
             }
         }
 
-        if ((!is_null($filter)) && (count($filter)) > 0) {
+        if ((! is_null($filter)) && (count($filter)) > 0) {
             $assets->ByFilter($filter);
         } elseif ($request->filled('search')) {
             $assets->TextSearch($request->input('search'));
@@ -207,7 +206,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
          * 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 APIs
             case 'audits':
                 switch ($upcoming_status) {
                     case 'due':
@@ -300,7 +299,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
                 break;
             default:
 
-                if ((!$request->filled('status_id')) && ($settings->show_archived_in_list != '1')) {
+                if ((! $request->filled('status_id')) && ($settings->show_archived_in_list != '1')) {
                     // terrible workaround for complex-query Laravel bug in fulltext
                     $assets->join('status_labels AS status_alias', function ($join) {
                         $join->on('status_alias.id', '=', 'assets.status_id')
@@ -487,11 +486,9 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
          * Include additional associated relationships
          */
         if ($request->input('components')) {
-            $assets->loadMissing([
-                'components' => function ($query) {
+            $assets->loadMissing(['components' => function ($query) {
                     $query->orderBy('created_at', 'desc');
-                }
-            ]);
+                }]);
         }
 
         return (new $transformer)->transformAssets($assets, $total, $request);
@@ -584,18 +581,11 @@ public function showBySerial(Request $request, $serial): JsonResponse | array
      * @since [v4.0]
      * @return \Illuminate\Http\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()
-                ->withCount(
-                    'checkins as checkins_count', 
-                    'checkouts as checkouts_count', 
-                    'userRequests as user_requests_count'
-                )
-                ->find($id)
+        if ($asset = Asset::with('assetstatus')
+            ->with('assignedTo')->withTrashed()
+            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->find($id)
         ) {
             $this->authorize('view', $asset);
 
@@ -636,7 +626,7 @@ public function selectlist(Request $request): array
         ])->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'));
         }
 
@@ -687,7 +677,7 @@ public function store(StoreAssetRequest $request): JsonResponse
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
         $asset->fill($request->validated());
-        $asset->created_by = auth()->id();
+        $asset->created_by    = auth()->id();
 
         /**
          * this is here just legacy reasons. Api\AssetController
@@ -1131,6 +1121,7 @@ public function checkinByTag(Request $request, $tag = null): JsonResponse
      * @since [v4.0]
      */
     public function audit(Request $request, Asset $asset): JsonResponse
+
     {
         $this->authorize('audit', Asset::class);
 
@@ -1173,7 +1164,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
              * Update custom fields in the database.
              * Validation for these fields is handled through the AssetRequest form request
              * $model = AssetModel::find($request->get('model_id'));
-             */
+            */
             if (($asset->model) && ($asset->model->fieldset)) {
                 $payload['custom_fields'] = [];
                 foreach ($asset->model->fieldset->fields as $field) {
@@ -1193,7 +1184,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
                                 $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);
                     }
 
                 }
@@ -1204,7 +1195,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
 
             // Validate the rest of the data before we turn off the event dispatcher
             if ($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()));
             }
 
 
@@ -1225,7 +1216,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
              * @see \App\Models\Asset::save()
              */
 
-            $asset->unsetEventDispatcher();
+             $asset->unsetEventDispatcher();
 
 
             /**
@@ -1241,7 +1232,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
 
 
         // 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);
 
     }
 
@@ -1396,26 +1387,20 @@ public function getLabels(Request $request): JsonResponse
         try {
             $this->authorize('view', Asset::class);
 
-            // Validate that asset tags were provided in the request
+             // 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);
+                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 tags
             if ($assets->isEmpty()) {
-                return response()->json(Helper::formatStandardApiResponse(
-                    'error',
-                    null,
-                    trans('admin/hardware/message.does_not_exist')
-                ), 404);
+                return response()->json(Helper::formatStandardApiResponse('error', null,
+                    trans('admin/hardware/message.does_not_exist')), 404);
             }
 
             try {
@@ -1435,9 +1420,9 @@ public function getLabels(Request $request): JsonResponse
                 // 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

app/Http/Controllers/Api/GroupsController.php

@@ -115,7 +115,7 @@ public function show($id) : array
      * @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);
@@ -138,7 +138,7 @@ public function update(Request $request, $id): JsonResponse
      * @since [v4.0]
      * @param  int  $id
      */
-    public function destroy($id): JsonResponse
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('superadmin');
         $group = Group::findOrFail($id);