fix(UpdateUserRequest): UpdateUserRequest issue while updating role

Author: bilaschandra

app/Http/Controllers/UsersController.php

@@ -6,16 +6,19 @@
 use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use App\Http\Requests\StoreUserRequest;
-use App\Http\Requests\UpdateUserRequest;
+use App\Http\Requests\ProfileUpdateRequest;
 
+/**
+ *
+ */
 class UsersController extends Controller
 {
     /**
      * Display all users
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function index() 
+    public function index()
     {
         $users = User::latest()->paginate(10);
 
@@ -24,28 +27,28 @@ public function index()
 
     /**
      * Show form for creating user
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function create() 
+    public function create()
     {
         return view('users.create');
     }
 
     /**
      * Store a newly created user
-     * 
+     *
      * @param User $user
      * @param StoreUserRequest $request
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function store(User $user, StoreUserRequest $request) 
+    public function store(User $user, StoreUserRequest $request)
     {
         //For demo purposes only. When creating user or inviting a user
         // you should create a generated random password and email it to the user
         $user->create(array_merge($request->validated(), [
-            'password' => 'test' 
+            'password' => 'test'
         ]));
 
         return redirect()->route('users.index')
@@ -54,12 +57,12 @@ public function store(User $user, StoreUserRequest $request)
 
     /**
      * Show user data
-     * 
+     *
      * @param User $user
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function show(User $user) 
+    public function show(User $user)
     {
         return view('users.show', [
             'user' => $user
@@ -68,12 +71,12 @@ public function show(User $user)
 
     /**
      * Edit user data
-     * 
+     *
      * @param User $user
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function edit(User $user) 
+    public function edit(User $user)
     {
         return view('users.edit', [
             'user' => $user,
@@ -84,13 +87,13 @@ public function edit(User $user)
 
     /**
      * Update user data
-     * 
+     *
      * @param User $user
-     * @param UpdateUserRequest $request
-     * 
+     * @param ProfileUpdateRequest $request
+     *
      * @return \Illuminate\Http\Response
      */
-    public function update(User $user, UpdateUserRequest $request) 
+    public function update(User $user, ProfileUpdateRequest $request)
     {
         $user->update($request->validated());
 
@@ -102,16 +105,16 @@ public function update(User $user, UpdateUserRequest $request)
 
     /**
      * Delete user data
-     * 
+     *
      * @param User $user
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
-    public function destroy(User $user) 
+    public function destroy(User $user)
     {
         $user->delete();
 
         return redirect()->route('users.index')
             ->withSuccess(__('User deleted successfully.'));
     }
-}
+}

app/Http/Requests/ProfileUpdateRequest.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class UpdateUserRequest extends FormRequest
+class ProfileUpdateRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -32,4 +32,4 @@ public function rules()
             'username' => 'required|unique:users,username,'.$user->id,
         ];
     }
-}
+}

resources/views/users/edit.blade.php

@@ -44,7 +44,7 @@
                         <select class="form-control" name="role" required>
                             <option value="">Select role</option>
                             @foreach($roles as $role)
-                            <option value="{{ $role->id }}" {{ in_array($role->name, $userRole) 
+                            <option value="{{ $role->id }}" {{ in_array($role->name, $userRole)
                                     ? 'selected'
                                     : '' }}>{{ $role->name }}</option>
                             @endforeach
@@ -55,11 +55,11 @@
                     </div>
 
                     <button type="submit" class="btn btn-primary">Update user</button>
-                    <a href="{{ route('users.index') }}" class="btn btn-default">Cancel</button>
+                    <a href="{{ route('users.index') }}" class="btn btn-default">Cancel</a>
                 </form>
             </div>
         </div>
     </div>
 
 </div>
-@endsection
+@endsection