webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Standardised how request is injected into controller methods

Browse Source 
Puts it in-line with how Laravel recommend.
This commit is contained in:
Dan Brown
2019-09-15 18:53:30 +01:00
parent be08dc1588
commit 3281925375
10 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/PermissionController.php
View File

@ -75,12 +75,13 @@ class PermissionController extends Controller
/**
* Updates a user role.
* @param $id
* @param Request $request
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws PermissionsException
* @throws \Illuminate\Validation\ValidationException
*/
public function updateRole($id, Request $request)
public function updateRole(Request $request, $id)
{
$this->checkPermission('user-roles-manage');
$this->validate($request, [
@ -112,11 +113,11 @@ class PermissionController extends Controller
/**
* Delete a role from the system,
* Migrate from a previous role if set.
* @param $id
* @param Request $request
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function deleteRole($id, Request $request)
public function deleteRole(Request $request, $id)
{
$this->checkPermission('user-roles-manage');