Refactor VendorsController class

app/Http/Controllers/Partners/VendorsController.php

@@ -11,14 +11,14 @@ class VendorsController extends Controller
     /**
      * Display a listing of the vendor.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function index()
     {
         $editableVendor = null;
-        $vendors = Vendor::where(function ($query) {
-            $query->where('name', 'like', '%'.request('q').'%');
-        })->paginate(25);
+        $vendorQuery = Vendor::query();
+        $vendorQuery->where('name', 'like', '%'.request('q').'%');
+        $vendors = $vendorQuery->paginate(25);
 
         if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
             $editableVendor = Vendor::find(request('id'));
@@ -30,21 +30,18 @@ class VendorsController extends Controller
     /**
      * Store a newly created vendor in storage.
      *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
-        $newVendorData = $this->validate($request, [
+        Vendor::create($request->validate([
             'name'    => 'required|max:60',
             'notes'   => 'nullable|max:255',
             'website' => 'nullable|url|max:255',
-        ]);
-
-        Vendor::create($newVendorData);
+        ]));
 
-        flash(trans('vendor.created'), 'success');
+        flash(__('vendor.created'), 'success');
 
         return redirect()->route('vendors.index');
     }
@@ -52,27 +49,22 @@ class VendorsController extends Controller
     /**
      * Update the specified vendor in storage.
      *
-     * @param \Illuminate\Http\Request      $request
-     * @param \App\Entities\Partners\Vendor $vendor
-     *
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Entities\Partners\Vendor  $vendor
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request, Vendor $vendor)
     {
-        $vendorData = $this->validate($request, [
+        $vendor->update($request->validate([
             'name'      => 'required|max:60',
             'notes'     => 'nullable|max:255',
             'website'   => 'nullable|url|max:255',
             'is_active' => 'required|boolean',
-        ]);
+        ]));
 
-        $routeParam = request()->only('page', 'q');
+        flash(__('vendor.updated'), 'success');
 
-        $vendor = $vendor->update($vendorData);
-
-        flash(trans('vendor.updated'), 'success');
-
-        return redirect()->route('vendors.index', $routeParam);
+        return redirect()->route('vendors.index', request(['page', 'q']));
     }
 
     /**
@@ -89,25 +81,20 @@ class VendorsController extends Controller
     /**
      * Remove the specified vendor from storage.
      *
-     * @param \App\Entities\Partners\Vendor $vendor
-     *
-     * @return \Illuminate\Http\Response
+     * @param  \App\Entities\Partners\Vendor  $vendor
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Vendor $vendor)
     {
-        $this->validate(request(), [
-            'vendor_id' => 'required',
-        ]);
-
-        $routeParam = request()->only('page', 'q');
+        request()->validate(['vendor_id' => 'required']);
 
         if (request('vendor_id') == $vendor->id && $vendor->delete()) {
-            flash(trans('vendor.deleted'), 'warning');
+            flash(__('vendor.deleted'), 'warning');
 
-            return redirect()->route('vendors.index', $routeParam);
+            return redirect()->route('vendors.index', request(['page', 'q']));
         }
 
-        flash(trans('vendor.undeleted'), 'danger');
+        flash(__('vendor.undeleted'), 'danger');
 
         return back();
     }