kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:41:57 +01:00
parent 0022009dd5
commit dbf3e76ecc
340 changed files with 4079 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
<?php
/**
* AttachmentController.php
* Copyright (c) 2019 james@firefly-iii.org
@@ -56,7 +57,7 @@ class AttachmentController extends Controller
$this->middleware(
function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-paperclip');
app('view')->share('title', (string) trans('firefly.attachments'));
app('view')->share('title', (string)trans('firefly.attachments'));
$this->repository = app(AttachmentRepositoryInterface::class);
return $next($request);
@@ -67,13 +68,13 @@ class AttachmentController extends Controller
/**
* Form to delete an attachment.
*
* @param Attachment $attachment
* @param Attachment $attachment
*
* @return Factory|View
*/
public function delete(Attachment $attachment)
{
$subTitle = (string) trans('firefly.delete_attachment', ['name' => $attachment->filename]);
$subTitle = (string)trans('firefly.delete_attachment', ['name' => $attachment->filename]);
// put previous url in session
$this->rememberPreviousUrl('attachments.delete.url');
@@ -84,8 +85,8 @@ class AttachmentController extends Controller
/**
* Destroy attachment.
*
* @param Request $request
* @param Attachment $attachment
* @param Request $request
* @param Attachment $attachment
*
* @return RedirectResponse|Redirector
*/
@@ -95,7 +96,7 @@ class AttachmentController extends Controller
$this->repository->destroy($attachment);
$request->session()->flash('success', (string) trans('firefly.attachment_deleted', ['name' => $name]));
$request->session()->flash('success', (string)trans('firefly.attachment_deleted', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUrl('attachments.delete.url'));
@@ -104,7 +105,7 @@ class AttachmentController extends Controller
/**
* Download attachment to PC.
*
* @param Attachment $attachment
* @param Attachment $attachment
*
* @return LaravelResponse
*
@@ -121,7 +122,7 @@ class AttachmentController extends Controller
$response
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted)
->header('Content-Disposition', 'attachment; filename='.$quoted)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
@@ -137,15 +138,15 @@ class AttachmentController extends Controller
/**
* Edit an attachment.
*
* @param Request $request
* @param Attachment $attachment
* @param Request $request
* @param Attachment $attachment
*
* @return Factory|View
*/
public function edit(Request $request, Attachment $attachment)
{
$subTitleIcon = 'fa-pencil';
$subTitle = (string) trans('firefly.edit_attachment', ['name' => $attachment->filename]);
$subTitle = (string)trans('firefly.edit_attachment', ['name' => $attachment->filename]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('attachments.edit.fromUpdate')) {
@@ -182,8 +183,8 @@ class AttachmentController extends Controller
/**
* Update attachment.
*
* @param AttachmentFormRequest $request
* @param Attachment $attachment
* @param AttachmentFormRequest $request
* @param Attachment $attachment
*
* @return RedirectResponse
*/
@@ -192,11 +193,11 @@ class AttachmentController extends Controller
$data = $request->getAttachmentData();
$this->repository->update($attachment, $data);
$request->session()->flash('success', (string) trans('firefly.attachment_updated', ['name' => $attachment->filename]));
$request->session()->flash('success', (string)trans('firefly.attachment_updated', ['name' => $attachment->filename]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUrl('attachments.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
if (1 === (int)$request->get('return_to_edit')) {
$request->session()->put('attachments.edit.fromUpdate', true);
$redirect = redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);
@@ -209,8 +210,8 @@ class AttachmentController extends Controller
/**
* View attachment in browser.
*
* @param Request $request
* @param Attachment $attachment
* @param Request $request
* @param Attachment $attachment
*
* @return LaravelResponse
* @throws FireflyException
@@ -240,7 +241,7 @@ class AttachmentController extends Controller
[
'Content-Security-Policy' => implode('; ', $csp),
'Content-Type' => $attachment->mime,
'Content-Disposition' => 'inline; filename="' . $attachment->filename . '"',
'Content-Disposition' => 'inline; filename="'.$attachment->filename.'"',
]
);
}