kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Use PSR-12 code style

Browse Source
This commit is contained in:
James Cole
2022-10-30 14:23:00 +01:00
parent b27fe59ab4
commit 1667b88dcd
154 changed files with 277 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Models/Account/ListController.php
View File

@@ -137,7 +137,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**

1
app/Api/V1/Controllers/Models/Account/ShowController.php
View File

@@ -135,5 +135,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Account/StoreController.php
View File

@@ -82,5 +82,4 @@ class StoreController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
View File

@@ -124,5 +124,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Bill/DestroyController.php
View File

@@ -70,5 +70,4 @@ class DestroyController extends Controller
return response()->json([], 204);
}
}

2
app/Api/V1/Controllers/Models/Bill/ListController.php
View File

@@ -136,7 +136,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -200,5 +199,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/Bill/UpdateController.php
View File

@@ -80,7 +80,5 @@ class UpdateController extends Controller
$resource = new Item($bill, $transformer, 'bills');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Budget/ListController.php
View File

@@ -264,5 +264,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Budget/ShowController.php
View File

@@ -119,5 +119,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Budget/UpdateController.php
View File

@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($budget, $transformer, 'budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
View File

@@ -163,5 +163,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
View File

@@ -76,7 +76,6 @@ class UpdateController extends Controller
*/
public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
@@ -92,6 +91,5 @@ class UpdateController extends Controller
$resource = new Item($budgetLimit, $transformer, 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Category/ListController.php
View File

@@ -157,5 +157,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Category/StoreController.php
View File

@@ -80,5 +80,4 @@ class StoreController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Category/UpdateController.php
View File

@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($category, $transformer, 'categories');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
View File

@@ -135,6 +135,5 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/PiggyBank/ListController.php
View File

@@ -126,6 +126,5 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
View File

@@ -92,7 +92,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -117,6 +116,5 @@ class ShowController extends Controller
$resource = new Item($piggyBank, $transformer, 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
View File

@@ -84,6 +84,5 @@ class UpdateController extends Controller
$resource = new Item($piggyBank, $transformer, 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Recurrence/ShowController.php
View File

@@ -93,7 +93,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**

1
app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
View File

@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($recurrence, $transformer, 'recurrences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/Rule/ShowController.php
View File

@@ -97,7 +97,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -121,6 +120,5 @@ class ShowController extends Controller
$resource = new Item($rule, $transformer, 'rules');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/RuleGroup/ListController.php
View File

@@ -95,6 +95,5 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/RuleGroup/ShowController.php
View File

@@ -118,7 +118,5 @@ class ShowController extends Controller
$resource = new Item($ruleGroup, $transformer, 'rule_groups');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/RuleGroup/StoreController.php
View File

@@ -37,7 +37,6 @@ use League\Fractal\Resource\Item;
*/
class StoreController extends Controller
{
private AccountRepositoryInterface $accountRepository;
private RuleGroupRepositoryInterface $ruleGroupRepository;
@@ -87,6 +86,5 @@ class StoreController extends Controller
$resource = new Item($ruleGroup, $transformer, 'rule_groups');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
View File

@@ -167,5 +167,4 @@ class TriggerController extends Controller
return response()->json([], 204);
}
}

1
app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php
View File

@@ -37,7 +37,6 @@ use League\Fractal\Resource\Item;
*/
class UpdateController extends Controller
{
private RuleGroupRepositoryInterface $ruleGroupRepository;
/**

1
app/Api/V1/Controllers/Models/Tag/ShowController.php
View File

@@ -119,6 +119,5 @@ class ShowController extends Controller
$resource = new Item($tag, $transformer, 'tags');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/Tag/StoreController.php
View File

@@ -82,4 +82,3 @@ class StoreController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/Tag/UpdateController.php
View File

@@ -82,7 +82,5 @@ class UpdateController extends Controller
$resource = new Item($rule, $transformer, 'tags');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

8
app/Api/V1/Controllers/Models/Transaction/DestroyController.php
View File

@@ -84,12 +84,12 @@ class DestroyController extends Controller
// grab asset account(s) from group:
$accounts = [];
/** @var TransactionJournal $journal */
foreach($transactionGroup->transactionJournals as $journal) {
foreach ($transactionGroup->transactionJournals as $journal) {
/** @var Transaction $transaction */
foreach($journal->transactions as $transaction) {
foreach ($journal->transactions as $transaction) {
$type = $transaction->account->accountType->type;
// if is valid liability, trigger event!
if(in_array($type, config('firefly.valid_liabilities'))) {
if (in_array($type, config('firefly.valid_liabilities'), true)) {
$accounts[] = $transaction->account;
}
}
@@ -102,7 +102,7 @@ class DestroyController extends Controller
app('preferences')->mark();
/** @var Account $account */
foreach($accounts as $account) {
foreach ($accounts as $account) {
Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));
event(new UpdatedAccount($account));
}

4
app/Api/V1/Controllers/Models/Transaction/ListController.php
View File

@@ -80,7 +80,7 @@ class ListController extends Controller
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = new Collection;
$collection = new Collection();
foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection);
}
@@ -115,7 +115,7 @@ class ListController extends Controller
public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
{
$manager = $this->getManager();
$collection = new Collection;
$collection = new Collection();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection);

1
app/Api/V1/Controllers/Models/Transaction/ShowController.php
View File

@@ -151,5 +151,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

5
app/Api/V1/Controllers/Models/Transaction/StoreController.php
View File

@@ -95,14 +95,15 @@ class StoreController extends Controller
} catch (DuplicateTransactionException $e) {
Log::warning('Caught a duplicate transaction. Return error message.');
$validator = Validator::make(
['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction]
['transactions' => [['description' => $e->getMessage()]]],
['transactions.0.description' => new IsDuplicateTransaction()]
);
throw new ValidationException($validator, 0, $e);
} catch (FireflyException $e) {
Log::warning('Caught an exception. Return error message.');
Log::error($e->getMessage());
$message = sprintf('Internal exception: %s', $e->getMessage());
$validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction]);
$validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
throw new ValidationException($validator, 0, $e);
}
app('preferences')->mark();

1
app/Api/V1/Controllers/Models/Transaction/UpdateController.php
View File

@@ -110,5 +110,4 @@ class UpdateController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

5
app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
View File

@@ -63,7 +63,8 @@ use League\Fractal\Resource\Collection as FractalCollection;
*/
class ListController extends Controller
{
use AccountFilter, TransactionFilter;
use AccountFilter;
use TransactionFilter;
private CurrencyRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;
@@ -310,7 +311,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -363,7 +363,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**

3
app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
View File

@@ -43,7 +43,8 @@ use League\Fractal\Resource\Item;
*/
class ShowController extends Controller
{
use AccountFilter, TransactionFilter;
use AccountFilter;
use TransactionFilter;
private CurrencyRepositoryInterface $repository;

3
app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
View File

@@ -41,7 +41,8 @@ use League\Fractal\Resource\Item;
*/
class StoreController extends Controller
{
use AccountFilter, TransactionFilter;
use AccountFilter;
use TransactionFilter;
private CurrencyRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;

7
app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
View File

@@ -42,7 +42,8 @@ use League\Fractal\Resource\Item;
*/
class UpdateController extends Controller
{
use AccountFilter, TransactionFilter;
use AccountFilter;
use TransactionFilter;
private CurrencyRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;
@@ -98,7 +99,6 @@ class UpdateController extends Controller
$resource = new Item($currency, $transformer, 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -129,7 +129,6 @@ class UpdateController extends Controller
$resource = new Item($currency, $transformer, 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -162,7 +161,6 @@ class UpdateController extends Controller
$resource = new Item($currency, $transformer, 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -200,6 +198,5 @@ class UpdateController extends Controller
$resource = new Item($currency, $transformer, 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php
View File

@@ -32,7 +32,6 @@ use Illuminate\Http\JsonResponse;
class DestroyController extends Controller
{
private LinkTypeRepositoryInterface $repository;
/**
@@ -74,5 +73,4 @@ class DestroyController extends Controller
return response()->json([], 204);
}
}

2
app/Api/V1/Controllers/Models/TransactionLink/ShowController.php
View File

@@ -103,7 +103,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -128,6 +127,5 @@ class ShowController extends Controller
$resource = new Item($journalLink, $transformer, 'transaction_links');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php
View File

@@ -87,6 +87,5 @@ class UpdateController extends Controller
$resource = new Item($journalLink, $transformer, 'transaction_links');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
View File

@@ -85,5 +85,4 @@ class DestroyController extends Controller
return response()->json([], 204);
}
}

1
app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
View File

@@ -126,5 +126,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

2
app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php
View File

@@ -101,7 +101,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -125,6 +124,5 @@ class ShowController extends Controller
$resource = new Item($linkType, $transformer, 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
View File

@@ -96,6 +96,5 @@ class StoreController extends Controller
$resource = new Item($linkType, $transformer, 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

1
app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
View File

@@ -102,6 +102,5 @@ class UpdateController extends Controller
$resource = new Item($linkType, $transformer, 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}