Skip to content

Commit 4e3c6b1

Browse files
CloCkWeRXCloCkWeRX
committed
PSR12
1 parent ccb2caf commit 4e3c6b1

File tree

2 files changed

+32
-36
lines changed

2 files changed

+32
-36
lines changed

‎app/Http/Controllers/Api/AssetModelFilesController.php‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\HttpFoundation\StreamedResponse;
1616
use Symfony\Component\HttpFoundation\BinaryFileResponse;
1717

18-
1918
/**
2019
* This class controls file related actions related
2120
* to assets for the Snipe-IT Asset Management application.
@@ -35,7 +34,7 @@ class AssetModelFilesController extends Controller
3534
* @since [v7.0.12]
3635
* @author [r-xyz]
3736
*/
38-
public function store(UploadFileRequest $request, $assetModelId = null) : JsonResponse
37+
public function store(UploadFileRequest $request, $assetModelId = null): JsonResponse
3938
{
4039
// Start by checking if the asset being acted upon exists
4140
if (! $assetModel = AssetModel::find($assetModelId)) {
@@ -45,16 +44,16 @@ public function store(UploadFileRequest $request, $assetModelId = null) : JsonRe
4544
// Make sure we are allowed to update this asset
4645
$this->authorize('update', $assetModel);
4746

48-
if ($request->hasFile('file')) {
47+
if ($request->hasFile('file')) {
4948
// If the file storage directory doesn't exist; create it
5049
if (! Storage::exists('private_uploads/assetmodels')) {
5150
Storage::makeDirectory('private_uploads/assetmodels', 775);
5251
}
5352

5453
// Loop over the attached files and add them to the asset
5554
foreach ($request->file('file') as $file) {
56-
$file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$assetModel->id, $file);
57-
55+
$file_name = $request->handleFile('private_uploads/assetmodels/', 'model-' . $assetModel->id, $file);
56+
5857
$assetModel->logUpload($file_name, e($request->get('notes')));
5958
}
6059

@@ -73,7 +72,7 @@ public function store(UploadFileRequest $request, $assetModelId = null) : JsonRe
7372
* @since [v7.0.12]
7473
* @author [r-xyz]
7574
*/
76-
public function list($assetmodel_id) : JsonResponse | array
75+
public function list($assetmodel_id): JsonResponse | array
7776
{
7877
// Start by checking if the asset being acted upon exists
7978
if (! $assetModel = AssetModel::find($assetmodel_id)) {
@@ -82,7 +81,7 @@ public function list($assetmodel_id) : JsonResponse | array
8281

8382
$assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
8483
$this->authorize('view', $assetmodel);
85-
return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
84+
return (new AssetModelsTransformer())->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
8685
}
8786

8887
/**
@@ -95,7 +94,7 @@ public function list($assetmodel_id) : JsonResponse | array
9594
* @since [v7.0.12]
9695
* @author [r-xyz]
9796
*/
98-
public function show($assetModelId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
97+
public function show($assetModelId = null, $fileId = null): JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
9998
{
10099
// Start by checking if the asset being acted upon exists
101100
if (! $assetModel = AssetModel::find($assetModelId)) {
@@ -112,11 +111,11 @@ public function show($assetModelId = null, $fileId = null) : JsonResponse | Stre
112111
}
113112

114113
// Form the full filename with path
115-
$file = 'private_uploads/assetmodels/'.$log->filename;
116-
Log::debug('Checking for '.$file);
114+
$file = 'private_uploads/assetmodels/' . $log->filename;
115+
Log::debug('Checking for ' . $file);
117116

118117
if ($log->action_type == 'audit') {
119-
$file = 'private_uploads/audits/'.$log->filename;
118+
$file = 'private_uploads/audits/' . $log->filename;
120119
}
121120

122121
// Check the file actually exists on the filesystem
@@ -125,7 +124,6 @@ public function show($assetModelId = null, $fileId = null) : JsonResponse | Stre
125124
}
126125

127126
if (request('inline') == 'true') {
128-
129127
$headers = [
130128
'Content-Disposition' => 'inline',
131129
];
@@ -148,7 +146,7 @@ public function show($assetModelId = null, $fileId = null) : JsonResponse | Stre
148146
* @since [v7.0.12]
149147
* @author [r-xyz]
150148
*/
151-
public function destroy($assetModelId = null, $fileId = null) : JsonResponse
149+
public function destroy($assetModelId = null, $fileId = null): JsonResponse
152150
{
153151
// Start by checking if the asset being acted upon exists
154152
if (! $assetModel = AssetModel::find($assetModelId)) {
@@ -165,8 +163,8 @@ public function destroy($assetModelId = null, $fileId = null) : JsonResponse
165163
$log = Actionlog::find($fileId);
166164
if ($log) {
167165
// Check the file actually exists, and delete it
168-
if (Storage::exists($rel_path.'/'.$log->filename)) {
169-
Storage::delete($rel_path.'/'.$log->filename);
166+
if (Storage::exists($rel_path . '/' . $log->filename)) {
167+
Storage::delete($rel_path . '/' . $log->filename);
170168
}
171169
// Delete the record of the file
172170
$log->delete();

‎app/Http/Controllers/Api/AssetModelsController.php‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AssetModelsController extends Controller
3030
* @author [A. Gianotto] [<[email protected]>]
3131
* @since [v4.0]
3232
*/
33-
public function index(Request $request) : JsonResponse | array
33+
public function index(Request $request): JsonResponse | array
3434
{
3535
$this->authorize('view', AssetModel::class);
3636
$allowed_columns =
@@ -73,7 +73,7 @@ public function index(Request $request) : JsonResponse | array
7373
->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
7474
->withCount('assets as assets_count');
7575

76-
if ($request->input('status')=='deleted') {
76+
if ($request->input('status') == 'deleted') {
7777
$assetmodels->onlyTrashed();
7878
}
7979

@@ -129,7 +129,7 @@ public function index(Request $request) : JsonResponse | array
129129
$total = $assetmodels->count();
130130
$assetmodels = $assetmodels->skip($offset)->take($limit)->get();
131131

132-
return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
132+
return (new AssetModelsTransformer())->transformAssetModels($assetmodels, $total);
133133
}
134134

135135

@@ -140,19 +140,17 @@ public function index(Request $request) : JsonResponse | array
140140
* @since [v4.0]
141141
* @param \App\Http\Requests\StoreAssetModelRequest $request
142142
*/
143-
public function store(StoreAssetModelRequest $request) : JsonResponse
143+
public function store(StoreAssetModelRequest $request): JsonResponse
144144
{
145145
$this->authorize('create', AssetModel::class);
146-
$assetmodel = new AssetModel;
146+
$assetmodel = new AssetModel();
147147
$assetmodel->fill($request->all());
148148
$assetmodel = $request->handleImages($assetmodel);
149149

150150
if ($assetmodel->save()) {
151151
return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
152152
}
153153
return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));
154-
155-
156154
}
157155

158156
/**
@@ -162,12 +160,12 @@ public function store(StoreAssetModelRequest $request) : JsonResponse
162160
* @since [v4.0]
163161
* @param int $id
164162
*/
165-
public function show($id) : array
163+
public function show($id): array
166164
{
167165
$this->authorize('view', AssetModel::class);
168166
$assetmodel = AssetModel::withCount('assets as assets_count')->findOrFail($id);
169167

170-
return (new AssetModelsTransformer)->transformAssetModel($assetmodel);
168+
return (new AssetModelsTransformer())->transformAssetModel($assetmodel);
171169
}
172170

173171
/**
@@ -177,12 +175,12 @@ public function show($id) : array
177175
* @since [v4.0]
178176
* @param int $id
179177
*/
180-
public function assets($id) : array
178+
public function assets($id): array
181179
{
182180
$this->authorize('view', AssetModel::class);
183181
$assets = Asset::where('model_id', '=', $id)->get();
184182

185-
return (new AssetsTransformer)->transformAssets($assets, $assets->count());
183+
return (new AssetsTransformer())->transformAssets($assets, $assets->count());
186184
}
187185

188186

@@ -195,13 +193,13 @@ public function assets($id) : array
195193
* @param int $id
196194
* @return \Illuminate\Http\Response
197195
*/
198-
public function update(StoreAssetModelRequest $request, $id) : JsonResponse
196+
public function update(StoreAssetModelRequest $request, $id): JsonResponse
199197
{
200198
$this->authorize('update', AssetModel::class);
201199
$assetmodel = AssetModel::findOrFail($id);
202200
$assetmodel->fill($request->all());
203201
$assetmodel = $request->handleImages($assetmodel);
204-
202+
205203
/**
206204
* Allow custom_fieldset_id to override and populate fieldset_id.
207205
* This is stupid, but required for legacy API support.
@@ -229,7 +227,7 @@ public function update(StoreAssetModelRequest $request, $id) : JsonResponse
229227
* @since [v4.0]
230228
* @param int $id
231229
*/
232-
public function destroy($id) : JsonResponse
230+
public function destroy($id): JsonResponse
233231
{
234232
$this->authorize('delete', AssetModel::class);
235233
$assetmodel = AssetModel::findOrFail($id);
@@ -241,7 +239,7 @@ public function destroy($id) : JsonResponse
241239

242240
if ($assetmodel->image) {
243241
try {
244-
Storage::disk('public')->delete('assetmodels/'.$assetmodel->image);
242+
Storage::disk('public')->delete('assetmodels/' . $assetmodel->image);
245243
} catch (\Exception $e) {
246244
Log::info($e);
247245
}
@@ -259,7 +257,7 @@ public function destroy($id) : JsonResponse
259257
* @since [v4.0.16]
260258
* @see \App\Http\Transformers\SelectlistTransformer
261259
*/
262-
public function selectlist(Request $request) : array
260+
public function selectlist(Request $request): array
263261
{
264262

265263
$this->authorize('view.selectlists');
@@ -284,22 +282,22 @@ public function selectlist(Request $request) : array
284282
$assetmodel->use_text = '';
285283

286284
if ($settings->modellistCheckedValue('category')) {
287-
$assetmodel->use_text .= (($assetmodel->category) ? $assetmodel->category->name.' - ' : '');
285+
$assetmodel->use_text .= (($assetmodel->category) ? $assetmodel->category->name . ' - ' : '');
288286
}
289287

290288
if ($settings->modellistCheckedValue('manufacturer')) {
291-
$assetmodel->use_text .= (($assetmodel->manufacturer) ? $assetmodel->manufacturer->name.' ' : '');
289+
$assetmodel->use_text .= (($assetmodel->manufacturer) ? $assetmodel->manufacturer->name . ' ' : '');
292290
}
293291

294292
$assetmodel->use_text .= $assetmodel->name;
295293

296294
if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number != '')) {
297-
$assetmodel->use_text .= ' (#'.$assetmodel->model_number.')';
295+
$assetmodel->use_text .= ' (#' . $assetmodel->model_number . ')';
298296
}
299297

300-
$assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null;
298+
$assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/' . e($assetmodel->image)) : null;
301299
}
302300

303-
return (new SelectlistTransformer)->transformSelectlist($assetmodels);
301+
return (new SelectlistTransformer())->transformSelectlist($assetmodels);
304302
}
305303
}

0 commit comments

Comments
 (0)