webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +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

15
app/Http/Controllers/AttachmentController.php
View File

@ -59,11 +59,12 @@ class AttachmentController extends Controller
/**
* Update an uploaded attachment.
* @param int $attachmentId
* @param Request $request
* @param int $attachmentId
* @return mixed
* @throws \Illuminate\Validation\ValidationException
*/
public function uploadUpdate($attachmentId, Request $request)
public function uploadUpdate(Request $request, $attachmentId)
{
$this->validate($request, [
'uploaded_to' => 'required|integer|exists:pages,id',
@ -94,11 +95,12 @@ class AttachmentController extends Controller
/**
* Update the details of an existing file.
* @param $attachmentId
* @param Request $request
* @param $attachmentId
* @return Attachment|mixed
* @throws \Illuminate\Validation\ValidationException
*/
public function update($attachmentId, Request $request)
public function update(Request $request, $attachmentId)
{
$this->validate($request, [
'uploaded_to' => 'required|integer|exists:pages,id',
@ -161,11 +163,12 @@ class AttachmentController extends Controller
/**
* Update the attachment sorting.
* @param $pageId
* @param Request $request
* @param $pageId
* @return mixed
* @throws \Illuminate\Validation\ValidationException
*/
public function sortForPage($pageId, Request $request)
public function sortForPage(Request $request, $pageId)
{
$this->validate($request, [
'files' => 'required|array',