kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 19:47:11 +00:00
Code Issues Projects Releases Wiki Activity

Code reordering and reformatting. I should really start employing style CI.

Browse Source
This commit is contained in:
James Cole
2021-09-18 10:26:12 +02:00
parent 9b9d52e99f
commit 4003cea759
344 changed files with 2776 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -66,7 +66,7 @@ class BulkController extends Controller
/**
* Edit a set of journals in bulk.
*
* See reference nr. 47
* See reference nr. 47
*
* @param array $journals
*
@@ -97,11 +97,11 @@ class BulkController extends Controller
*/
public function update(BulkEditJournalRequest $request)
{
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
$ignoreCategory = 1 === (int)$request->get('ignore_category');
$ignoreBudget = 1 === (int)$request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$ignoreBudget = 1 === (int)$request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$count = 0;

22
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -47,7 +47,7 @@ use Log;
/**
* Class ConvertController.
*
* See reference nr. 49
* See reference nr. 49
*/
class ConvertController extends Controller
{
@@ -91,7 +91,7 @@ class ConvertController extends Controller
public function index(TransactionType $destinationType, TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
/** @var TransactionGroupTransformer $transformer */
@@ -159,12 +159,12 @@ class ConvertController extends Controller
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
$name = $account->name;
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
// maybe it's a liability thing:
if (in_array($account->accountType->type, $liabilityTypes, true)) {
$role = 'l_' . $account->accountType->type;
$role = 'l_' . $account->accountType->type;
}
if (AccountType::CASH === $account->accountType->type) {
@@ -173,7 +173,7 @@ class ConvertController extends Controller
}
if (AccountType::REVENUE === $account->accountType->type) {
$role = 'revenue_account';
$role = 'revenue_account';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -200,12 +200,12 @@ class ConvertController extends Controller
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
$name = $account->name;
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
// maybe it's a liability thing:
if (in_array($account->accountType->type, $liabilityTypes, true)) {
$role = 'l_' . $account->accountType->type;
$role = 'l_' . $account->accountType->type;
}
if (AccountType::CASH === $account->accountType->type) {
@@ -214,7 +214,7 @@ class ConvertController extends Controller
}
if (AccountType::EXPENSE === $account->accountType->type) {
$role = 'expense_account';
$role = 'expense_account';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -264,7 +264,7 @@ class ConvertController extends Controller
$currency = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -287,7 +287,7 @@ class ConvertController extends Controller
public function postIndex(Request $request, TransactionType $destinationType, TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
/** @var TransactionJournal $journal */
@@ -346,7 +346,7 @@ class ConvertController extends Controller
throw new FireflyException(sprintf(trans('firefly.convert_invalid_destination'), $journal->id));
}
// See reference nr. 50
// See reference nr. 50
$update = [
'source_id' => $sourceId,

6
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -24,11 +24,13 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Update\GroupCloneService;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
@@ -86,8 +88,8 @@ class CreateController extends Controller
*
* @param string|null $objectType
*
* @return Factory|\Illuminate\Contracts\View\View
* @throws \FireflyIII\Exceptions\FireflyException
* @return Factory|View
* @throws FireflyException
*/
public function create(?string $objectType)
{

4
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -73,7 +73,7 @@ class DeleteController extends Controller
public function delete(TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
Log::debug(sprintf('Start of delete view for group #%d', $group->id));
@@ -102,7 +102,7 @@ class DeleteController extends Controller
public function destroy(TransactionGroup $group): RedirectResponse
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
$journal = $group->transactionJournals->first();

10
app/Http/Controllers/Transaction/EditController.php
View File

@@ -67,15 +67,15 @@ class EditController extends Controller
app('preferences')->mark();
if (!$this->isEditableGroup($transactionGroup)) {
return $this->redirectGroupToAccount($transactionGroup);
return $this->redirectGroupToAccount($transactionGroup);
}
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository = app(AccountRepositoryInterface::class);
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$expectedSourceTypes = config('firefly.expected_source_types');
$allowedSourceDests = config('firefly.source_dests');
$accountToTypes = config('firefly.account_to_transaction');
$expectedSourceTypes = config('firefly.expected_source_types');
$allowedSourceDests = config('firefly.source_dests');
//
$defaultCurrency = app('amount')->getDefaultCurrency();

2
app/Http/Controllers/Transaction/IndexController.php
View File

@@ -77,7 +77,7 @@ class IndexController extends Controller
*/
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
{
if('transfers' === $objectType) {
if ('transfers' === $objectType) {
$objectType = 'transfer';
}

2
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -40,7 +40,7 @@ use URL;
*/
class LinkController extends Controller
{
private JournalRepositoryInterface $journalRepository;
private JournalRepositoryInterface $journalRepository;
private LinkTypeRepositoryInterface $repository;
/**

8
app/Http/Controllers/Transaction/MassController.php
View File

@@ -168,8 +168,8 @@ class MassController extends Controller
{
$journalIds = $request->get('journals');
if (!is_array($journalIds)) {
// See reference nr. 48
throw new FireflyException('This is not an array.');
// See reference nr. 48
throw new FireflyException('This is not an array.');
}
$count = 0;
/** @var string $journalId */
@@ -178,7 +178,7 @@ class MassController extends Controller
try {
$this->updateJournal($integer, $request);
$count++;
} catch (FireflyException $e) {
} catch (FireflyException $e) {
// @ignoreException
}
}
@@ -200,7 +200,7 @@ class MassController extends Controller
{
$journal = $this->repository->find($journalId);
if (null === $journal) {
throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
}
$service = app(JournalUpdateService::class);
// for each field, call the update service.