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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/TransactionCurrency/CreateController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* CreateController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -48,8 +47,6 @@ class CreateController extends Controller
/**
* CurrencyController constructor.
*
*/
public function __construct()
{
@@ -70,9 +67,7 @@ class CreateController extends Controller
/**
* Create a currency.
*
* @param Request $request
*
* @return Factory|RedirectResponse|Redirector|View
* @return Factory|Redirector|RedirectResponse|View
*/
public function create(Request $request)
{
@@ -101,9 +96,7 @@ class CreateController extends Controller
/**
* Store new currency.
*
* @param CurrencyFormRequest $request
*
* @return $this|RedirectResponse|Redirector
* @return $this|Redirector|RedirectResponse
*/
public function store(CurrencyFormRequest $request)
{
@@ -111,13 +104,14 @@ class CreateController extends Controller
$user = auth()->user();
$data = $request->getCurrencyData();
if (!$this->userRepository->hasRole($user, 'owner')) {
app('log')->error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.');
app('log')->error('User '.auth()->user()->id.' is not admin, but tried to store a currency.');
Log::channel('audit')->info('Tried to create (POST) currency without admin rights.', $data);
return redirect($this->getPreviousUrl('currencies.create.url'))->withInput();
}
$data['enabled'] = true;
try {
$currency = $this->repository->store($data);
} catch (FireflyException $e) {

15
app/Http/Controllers/TransactionCurrency/DeleteController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* DeleteController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -47,8 +46,6 @@ class DeleteController extends Controller
/**
* CurrencyController constructor.
*
*/
public function __construct()
{
@@ -66,14 +63,10 @@ class DeleteController extends Controller
);
}
/**
* Deletes a currency.
*
* @param Request $request
* @param TransactionCurrency $currency
*
* @return Factory|RedirectResponse|Redirector|View
* @return Factory|Redirector|RedirectResponse|View
*/
public function delete(Request $request, TransactionCurrency $currency)
{
@@ -106,10 +99,7 @@ class DeleteController extends Controller
/**
* Destroys a currency.
*
* @param Request $request
* @param TransactionCurrency $currency
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function destroy(Request $request, TransactionCurrency $currency)
{
@@ -143,5 +133,4 @@ class DeleteController extends Controller
return redirect($this->getPreviousUrl('currencies.delete.url'));
}
}

15
app/Http/Controllers/TransactionCurrency/EditController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* EditController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -45,8 +44,6 @@ class EditController extends Controller
/**
* CurrencyController constructor.
*
*/
public function __construct()
{
@@ -67,10 +64,7 @@ class EditController extends Controller
/**
* Edit a currency.
*
* @param Request $request
* @param TransactionCurrency $currency
*
* @return Factory|RedirectResponse|Redirector|View
* @return Factory|Redirector|RedirectResponse|View
*/
public function edit(Request $request, TransactionCurrency $currency)
{
@@ -109,14 +103,10 @@ class EditController extends Controller
return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
}
/**
* Updates a currency.
*
* @param CurrencyFormRequest $request
* @param TransactionCurrency $currency
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function update(CurrencyFormRequest $request, TransactionCurrency $currency)
{
@@ -147,5 +137,4 @@ class EditController extends Controller
return redirect($this->getPreviousUrl('currencies.edit.url'));
}
}

8
app/Http/Controllers/TransactionCurrency/IndexController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* IndexController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -44,8 +43,6 @@ class IndexController extends Controller
/**
* CurrencyController constructor.
*
*/
public function __construct()
{
@@ -66,9 +63,8 @@ class IndexController extends Controller
/**
* Show overview of currencies.
*
* @param Request $request
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -87,6 +83,7 @@ class IndexController extends Controller
static function (TransactionCurrency $currency) {
$default = true === $currency->userGroupDefault ? 0 : 1;
$enabled = true === $currency->userGroupEnabled ? 0 : 1;
return sprintf('%s-%s-%s', $default, $enabled, $currency->code);
}
);
@@ -101,5 +98,4 @@ class IndexController extends Controller
return view('currencies.index', compact('currencies', 'isOwner'));
}
}