Merge pull request #147 from CloCkWeRX/psr12-controllers-3

CloCkWeRX · web-flow · commit 7c57c3be1d6f · 2025-05-12T23:59:26.000+09:30
PSR12 - Controllers/Kits, Controllers/Accessories and more
diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.php
@@ -35,8 +35,10 @@ public function create($component_asset_id)
                 return redirect()->route('components.index')->with('error', trans('admin/components/messages.not_found'));
             }
             if (is_null($asset = Asset::find($component_assets->asset_id))) {
-                return redirect()->route('components.index')->with('error',
-                    trans('admin/components/message.not_found'));
+                return redirect()->route('components.index')->with(
+                    'error',
+                    trans('admin/components/message.not_found')
+                );
             }
             $this->authorize('checkin', $component);
 
@@ -61,9 +63,10 @@ public function store(Request $request, $component_asset_id, $backto = null)
     {
         if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
             if (is_null($component = Component::find($component_assets->component_id))) {
-
-                return redirect()->route('components.index')->with('error',
-                    trans('admin/components/message.not_found'));
+                return redirect()->route('components.index')->with(
+                    'error',
+                    trans('admin/components/message.not_found')
+                );
             }
 
             $this->authorize('checkin', $component);
@@ -85,8 +88,10 @@ public function store(Request $request, $component_asset_id, $backto = null)
             // We have to modify the record to reflect the new qty that's
             // actually checked out.
             $component_assets->assigned_qty = $qty_remaining_in_checkout;
-            DB::table('components_assets')->where('id',
-                $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);
+            DB::table('components_assets')->where(
+                'id',
+                $component_asset_id
+            )->update(['assigned_qty' => $qty_remaining_in_checkout]);
 
             // If the checked-in qty is exactly the same as the assigned_qty,
             // we can simply delete the associated components_assets record
@@ -100,8 +105,10 @@ public function store(Request $request, $component_asset_id, $backto = null)
 
             session()->put(['redirect_option' => $request->get('redirect_option')]);
 
-            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success',
-                trans('admin/components/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with(
+                'success',
+                trans('admin/components/message.checkin.success')
+            );
         }
 
         return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -30,14 +30,12 @@ public function create($id)
     {
 
         if ($component = Component::find($id)) {
-
             $this->authorize('checkout', $component);
 
             // Make sure the category is valid
             if ($component->category) {
-
                 // Make sure there is at least one available to checkout
-                if ($component->numRemaining() <= 0){
+                if ($component->numRemaining() <= 0) {
                     return redirect()->route('components.index')
                         ->with('error', trans('admin/components/message.checkout.unavailable'));
                 }
@@ -53,7 +51,6 @@ public function create($id)
 
         // Not found
         return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
-
     }
 
     /**
diff --git a/app/Http/Controllers/Components/ComponentsFilesController.php b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -29,7 +29,7 @@ public function store(UploadFileRequest $request, $componentId = null)
     {
 
         if (config('app.lock_passwords')) {
-            return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled'));
+            return redirect()->route('components.show', ['component' => $componentId])->with('error', trans('general.feature_disabled'));
         }
 
         $component = Component::find($componentId);
@@ -43,15 +43,14 @@ public function store(UploadFileRequest $request, $componentId = null)
                 }
 
                 foreach ($request->file('file') as $file) {
-                    $file_name = $request->handleFile('private_uploads/components/','component-'.$component->id, $file);
+                    $file_name = $request->handleFile('private_uploads/components/', 'component-' . $component->id, $file);
 
                     //Log the upload to the log
                     $component->logUpload($file_name, e($request->input('notes')));
                 }
 
 
                 return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
-
             }
 
             return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded'));
@@ -81,9 +80,9 @@ public function destroy($componentId = null, $fileId = null)
             $log = Actionlog::find($fileId);
 
             // Remove the file if one exists
-            if (Storage::exists('components/'.$log->filename)) {
+            if (Storage::exists('components/' . $log->filename)) {
                 try {
-                    Storage::delete('components/'.$log->filename);
+                    Storage::delete('components/' . $log->filename);
                 } catch (\Exception $e) {
                     Log::debug($e);
                 }
@@ -111,7 +110,7 @@ public function destroy($componentId = null, $fileId = null)
      */
     public function show($componentId = null, $fileId = null)
     {
-        Log::debug('Private filesystem is: '.config('filesystems.default'));
+        Log::debug('Private filesystem is: ' . config('filesystems.default'));
 
 
         // the component is valid
@@ -120,17 +119,15 @@ public function show($componentId = null, $fileId = null)
             $this->authorize('components.files', $component);
 
             if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
-
-                $file = 'private_uploads/components/'.$log->filename;
+                $file = 'private_uploads/components/' . $log->filename;
 
                 try {
                     return StorageHelper::showOrDownloadFile($file, $log->filename);
                 } catch (\Exception $e) {
-                    return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.file_not_found'));
+                    return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.file_not_found'));
                 }
             }
-            return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.log_record_not_found'));
-
+            return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.log_record_not_found'));
         }
 
         return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -8,8 +8,8 @@
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 
 class ConsumableCheckoutController extends Controller
 {
@@ -21,18 +21,16 @@ class ConsumableCheckoutController extends Controller
      * @since [v1.0]
      * @param int $id
      */
-    public function create($id) : View | RedirectResponse
+    public function create($id): View | RedirectResponse
     {
 
         if ($consumable = Consumable::find($id)) {
-
             $this->authorize('checkout', $consumable);
 
             // Make sure the category is valid
             if ($consumable->category) {
-
                 // Make sure there is at least one available to checkout
-                if ($consumable->numRemaining() <= 0){
+                if ($consumable->numRemaining() <= 0) {
                     return redirect()->route('consumables.index')
                         ->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => 1, 'remaining' => $consumable->numRemaining()]));
                 }
@@ -48,7 +46,6 @@ public function create($id) : View | RedirectResponse
 
         // Not found
         return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
-
     }
 
     /**
@@ -92,13 +89,13 @@ public function store(Request $request, $consumableId)
         // Update the consumable data
         $consumable->assigned_to = e($request->input('assigned_to'));
 
-        for ($i = 0; $i < $quantity; $i++){
-        $consumable->users()->attach($consumable->id, [
+        for ($i = 0; $i < $quantity; $i++) {
+            $consumable->users()->attach($consumable->id, [
             'consumable_id' => $consumable->id,
             'created_by' => $admin_user->id,
             'assigned_to' => e($request->input('assigned_to')),
             'note' => $request->input('note'),
-        ]);
+            ]);
         }
 
         $consumable->checkout_qty = $quantity;
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -10,7 +10,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Contracts\View\View;
 use App\Http\Requests\StoreConsumableRequest;
 
 /**
@@ -51,7 +51,7 @@ public function create()
         $this->authorize('create', Consumable::class);
 
         return view('consumables.edit')->with('category_type', 'consumable')
-            ->with('item', new Consumable);
+            ->with('item', new Consumable());
     }
 
     /**
@@ -104,13 +104,12 @@ public function store(StoreConsumableRequest $request)
      * @see ConsumablesController::postEdit() method that stores the form data.
      * @since [v1.0]
      */
-    public function edit(Consumable $consumable) : View | RedirectResponse
+    public function edit(Consumable $consumable): View | RedirectResponse
     {
             $this->authorize($consumable);
             return view('consumables/edit')
                 ->with('item', $consumable)
                 ->with('category_type', 'consumable');
-
     }
 
     /**
@@ -204,7 +203,7 @@ public function show(Consumable $consumable)
         return view('consumables/view', compact('consumable'));
     }
 
-    public function clone(Consumable $consumable) : View
+    public function clone(Consumable $consumable): View
     {
         $this->authorize('create', $consumable);
         $consumable_to_close = $consumable;
diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Facades\Storage;
 use Symfony\Consumable\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Log;
+
 class ConsumablesFilesController extends Controller
 {
     /**
@@ -27,7 +28,7 @@ class ConsumablesFilesController extends Controller
     public function store(UploadFileRequest $request, $consumableId = null)
     {
         if (config('app.lock_passwords')) {
-            return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled'));
+            return redirect()->route('consumables.show', ['consumable' => $consumableId])->with('error', trans('general.feature_disabled'));
         }
 
         $consumable = Consumable::find($consumableId);
@@ -41,15 +42,14 @@ public function store(UploadFileRequest $request, $consumableId = null)
                 }
 
                 foreach ($request->file('file') as $file) {
-                    $file_name = $request->handleFile('private_uploads/consumables/','consumable-'.$consumable->id, $file);
+                    $file_name = $request->handleFile('private_uploads/consumables/', 'consumable-' . $consumable->id, $file);
 
                     //Log the upload to the log
                     $consumable->logUpload($file_name, e($request->input('notes')));
                 }
 
 
                 return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
-
             }
 
             return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));
@@ -79,9 +79,9 @@ public function destroy($consumableId = null, $fileId = null)
             $log = Actionlog::find($fileId);
 
             // Remove the file if one exists
-            if (Storage::exists('consumables/'.$log->filename)) {
+            if (Storage::exists('consumables/' . $log->filename)) {
                 try {
-                    Storage::delete('consumables/'.$log->filename);
+                    Storage::delete('consumables/' . $log->filename);
                 } catch (\Exception $e) {
                     Log::debug($e);
                 }
@@ -116,17 +116,16 @@ public function show($consumableId = null, $fileId = null)
             $this->authorize('consumables.files', $consumable);
 
             if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
-                $file = 'private_uploads/consumables/'.$log->filename;
+                $file = 'private_uploads/consumables/' . $log->filename;
 
                 try {
                     return StorageHelper::showOrDownloadFile($file, $log->filename);
                 } catch (\Exception $e) {
-                    return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.file_not_found'));
+                    return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.file_not_found'));
                 }
             }
             // The log record doesn't exist somehow
-            return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.log_record_not_found'));
-
+            return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.log_record_not_found'));
         }
 
         return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.php

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,12 @@ public function create($id)`
`30`	`30`	`{`
`31`	`31`
`32`	`32`	`if ($component = Component::find($id)) {`
`33`		`-`
`34`	`33`	`$this->authorize('checkout', $component);`
`35`	`34`
`36`	`35`	`// Make sure the category is valid`
`37`	`36`	`if ($component->category) {`
`38`		`-`
`39`	`37`	`// Make sure there is at least one available to checkout`
`40`		`- if ($component->numRemaining() <= 0){`
	`38`	`+ if ($component->numRemaining() <= 0) {`
`41`	`39`	`return redirect()->route('components.index')`
`42`	`40`	`->with('error', trans('admin/components/message.checkout.unavailable'));`
`43`	`41`	`}`
`@@ -53,7 +51,6 @@ public function create($id)`
`53`	`51`
`54`	`52`	`// Not found`
`55`	`53`	`return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));`
`56`		`-`
`57`	`54`	`}`
`58`	`55`
`59`	`56`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function store(UploadFileRequest $request, $componentId = null)`
`29`	`29`	`{`
`30`	`30`
`31`	`31`	`if (config('app.lock_passwords')) {`
`32`		`- return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled'));`
	`32`	`+ return redirect()->route('components.show', ['component' => $componentId])->with('error', trans('general.feature_disabled'));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$component = Component::find($componentId);`
`@@ -43,15 +43,14 @@ public function store(UploadFileRequest $request, $componentId = null)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`foreach ($request->file('file') as $file) {`
`46`		`- $file_name = $request->handleFile('private_uploads/components/','component-'.$component->id, $file);`
	`46`	`+ $file_name = $request->handleFile('private_uploads/components/', 'component-' . $component->id, $file);`
`47`	`47`
`48`	`48`	`//Log the upload to the log`
`49`	`49`	`$component->logUpload($file_name, e($request->input('notes')));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
`53`	`53`	`return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));`
`54`		`-`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded'));`
`@@ -81,9 +80,9 @@ public function destroy($componentId = null, $fileId = null)`
`81`	`80`	`$log = Actionlog::find($fileId);`
`82`	`81`
`83`	`82`	`// Remove the file if one exists`
`84`		`- if (Storage::exists('components/'.$log->filename)) {`
	`83`	`+ if (Storage::exists('components/' . $log->filename)) {`
`85`	`84`	`try {`
`86`		`- Storage::delete('components/'.$log->filename);`
	`85`	`+ Storage::delete('components/' . $log->filename);`
`87`	`86`	`} catch (\Exception $e) {`
`88`	`87`	`Log::debug($e);`
`89`	`88`	`}`
`@@ -111,7 +110,7 @@ public function destroy($componentId = null, $fileId = null)`
`111`	`110`	`*/`
`112`	`111`	`public function show($componentId = null, $fileId = null)`
`113`	`112`	`{`
`114`		`- Log::debug('Private filesystem is: '.config('filesystems.default'));`
	`113`	`+ Log::debug('Private filesystem is: ' . config('filesystems.default'));`
`115`	`114`
`116`	`115`
`117`	`116`	`// the component is valid`
`@@ -120,17 +119,15 @@ public function show($componentId = null, $fileId = null)`
`120`	`119`	`$this->authorize('components.files', $component);`
`121`	`120`
`122`	`121`	`if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {`
`123`		`-`
`124`		`- $file = 'private_uploads/components/'.$log->filename;`
	`122`	`+ $file = 'private_uploads/components/' . $log->filename;`
`125`	`123`
`126`	`124`	`try {`
`127`	`125`	`return StorageHelper::showOrDownloadFile($file, $log->filename);`
`128`	`126`	`} catch (\Exception $e) {`
`129`		`- return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.file_not_found'));`
	`127`	`+ return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.file_not_found'));`
`130`	`128`	`}`
`131`	`129`	`}`
`132`		`- return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.log_record_not_found'));`
`133`		`-`
	`130`	`+ return redirect()->route('components.show', ['component' => $component])->with('error', trans('general.log_record_not_found'));`
`134`	`131`	`}`
`135`	`132`
`136`	`133`	`return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use Illuminate\Support\Facades\Storage;`
`12`	`12`	`use Symfony\Consumable\HttpFoundation\JsonResponse;`
`13`	`13`	`use Illuminate\Support\Facades\Log;`
	`14`	`+`
`14`	`15`	`class ConsumablesFilesController extends Controller`
`15`	`16`	`{`
`16`	`17`	`/**`
`@@ -27,7 +28,7 @@ class ConsumablesFilesController extends Controller`
`27`	`28`	`public function store(UploadFileRequest $request, $consumableId = null)`
`28`	`29`	`{`
`29`	`30`	`if (config('app.lock_passwords')) {`
`30`		`- return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled'));`
	`31`	`+ return redirect()->route('consumables.show', ['consumable' => $consumableId])->with('error', trans('general.feature_disabled'));`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`$consumable = Consumable::find($consumableId);`
`@@ -41,15 +42,14 @@ public function store(UploadFileRequest $request, $consumableId = null)`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`foreach ($request->file('file') as $file) {`
`44`		`- $file_name = $request->handleFile('private_uploads/consumables/','consumable-'.$consumable->id, $file);`
	`45`	`+ $file_name = $request->handleFile('private_uploads/consumables/', 'consumable-' . $consumable->id, $file);`
`45`	`46`
`46`	`47`	`//Log the upload to the log`
`47`	`48`	`$consumable->logUpload($file_name, e($request->input('notes')));`
`48`	`49`	`}`
`49`	`50`
`50`	`51`
`51`	`52`	`return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));`
`52`		`-`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));`
`@@ -79,9 +79,9 @@ public function destroy($consumableId = null, $fileId = null)`
`79`	`79`	`$log = Actionlog::find($fileId);`
`80`	`80`
`81`	`81`	`// Remove the file if one exists`
`82`		`- if (Storage::exists('consumables/'.$log->filename)) {`
	`82`	`+ if (Storage::exists('consumables/' . $log->filename)) {`
`83`	`83`	`try {`
`84`		`- Storage::delete('consumables/'.$log->filename);`
	`84`	`+ Storage::delete('consumables/' . $log->filename);`
`85`	`85`	`} catch (\Exception $e) {`
`86`	`86`	`Log::debug($e);`
`87`	`87`	`}`
`@@ -116,17 +116,16 @@ public function show($consumableId = null, $fileId = null)`
`116`	`116`	`$this->authorize('consumables.files', $consumable);`
`117`	`117`
`118`	`118`	`if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {`
`119`		`- $file = 'private_uploads/consumables/'.$log->filename;`
	`119`	`+ $file = 'private_uploads/consumables/' . $log->filename;`
`120`	`120`
`121`	`121`	`try {`
`122`	`122`	`return StorageHelper::showOrDownloadFile($file, $log->filename);`
`123`	`123`	`} catch (\Exception $e) {`
`124`		`- return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.file_not_found'));`
	`124`	`+ return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.file_not_found'));`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`// The log record doesn't exist somehow`
`128`		`- return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.log_record_not_found'));`
`129`		`-`
	`128`	`+ return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error', trans('general.log_record_not_found'));`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));`