X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/3043/head:/app/Http/Controllers/RoleController.php

diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index e16a724a4..7ba52d486 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Exceptions\PermissionsException;
@@ -8,7 +10,6 @@ use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {
-
     protected $permissionsRepo;
 
     /**
@@ -26,15 +27,17 @@ class RoleController extends Controller
     {
         $this->checkPermission('user-roles-manage');
         $roles = $this->permissionsRepo->getAllRoles();
+
         return view('settings.roles.index', ['roles' => $roles]);
     }
 
     /**
-     * Show the form to create a new role
+     * Show the form to create a new role.
      */
     public function create()
     {
         $this->checkPermission('user-roles-manage');
+
         return view('settings.roles.create');
     }
 
@@ -45,17 +48,19 @@ class RoleController extends Controller
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
-            'display_name' => 'required|min:3|max:180',
-            'description' => 'max:180'
+            'display_name' => ['required', 'min:3', 'max:180'],
+            'description'  => 'max:180',
         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());
         $this->showSuccessNotification(trans('settings.role_create_success'));
+
         return redirect('/settings/roles');
     }
 
     /**
      * Show the form for editing a user role.
+     *
      * @throws PermissionsException
      */
     public function edit(string $id)
@@ -65,23 +70,26 @@ class RoleController extends Controller
         if ($role->hidden) {
             throw new PermissionsException(trans('errors.role_cannot_be_edited'));
         }
+
         return view('settings.roles.edit', ['role' => $role]);
     }
 
     /**
      * Updates a user role.
+     *
      * @throws ValidationException
      */
     public function update(Request $request, string $id)
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
-            'display_name' => 'required|min:3|max:180',
-            'description' => 'max:180'
+            'display_name' => ['required', 'min:3', 'max:180'],
+            'description'  => 'max:180',
         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());
         $this->showSuccessNotification(trans('settings.role_update_success'));
+
         return redirect('/settings/roles');
     }
 
@@ -96,12 +104,14 @@ class RoleController extends Controller
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
         $roles->prepend($blankRole);
+
         return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);
     }
 
     /**
      * Delete a role from the system,
      * Migrate from a previous role if set.
+     *
      * @throws Exception
      */
     public function delete(Request $request, string $id)
@@ -112,10 +122,12 @@ class RoleController extends Controller
             $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
+
             return redirect()->back();
         }
 
         $this->showSuccessNotification(trans('settings.role_delete_success'));
+
         return redirect('/settings/roles');
     }
 }