IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
154 changed files with 277 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Api/V1/Controllers/Autocomplete/AccountController.php
View File

@ -111,12 +111,13 @@ class AccountController extends Controller
// custom order.
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
usort(
$return, function ($a, $b) use ($order) {
$pos_a = array_search($a['type'], $order);
$pos_b = array_search($b['type'], $order);
$return,
function ($a, $b) use ($order) {
$pos_a = array_search($a['type'], $order, true);
$pos_b = array_search($b['type'], $order, true);
return $pos_a - $pos_b;
}
return $pos_a - $pos_b;
}
);
return response()->json($return);

1
app/Api/V1/Controllers/Autocomplete/BillController.php
View File

@ -78,5 +78,4 @@ class BillController extends Controller
return response()->json($filtered->toArray());
}
}

1
app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
View File

@ -80,5 +80,4 @@ class ObjectGroupController extends Controller
return response()->json($return);
}
}

5
app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
View File

@ -113,7 +113,9 @@ class PiggyBankController extends Controller
'id' => (string) $piggy->id,
'name' => $piggy->name,
'name_with_balance' => sprintf(
'%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false),
'%s (%s / %s)',
$piggy->name,
app('amount')->formatAnything($currency, $currentAmount, false),
app('amount')->formatAnything($currency, $piggy->targetamount, false),
),
'currency_id' => $currency->id,
@ -126,5 +128,4 @@ class PiggyBankController extends Controller
return response()->json($response);
}
}

1
app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
View File

@ -77,5 +77,4 @@ class RecurrenceController extends Controller
return response()->json($response);
}
}

1
app/Api/V1/Controllers/Autocomplete/RuleController.php
View File

@ -77,5 +77,4 @@ class RuleController extends Controller
return response()->json($response);
}
}

2
app/Api/V1/Controllers/Autocomplete/TransactionController.php
View File

@ -101,7 +101,7 @@ class TransactionController extends Controller
public function transactionsWithID(AutocompleteRequest $request): JsonResponse
{
$data = $request->getData();
$result = new Collection;
$result = new Collection();
if (is_numeric($data['query'])) {
// search for group, not journal.
$firstResult = $this->groupRepository->find((int) $data['query']);

9
app/Api/V1/Controllers/Controller.php
View File

@ -45,7 +45,9 @@ use Symfony\Component\HttpFoundation\ParameterBag;
*/
abstract class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
protected const CONTENT_TYPE = 'application/vnd.api+json';
protected array $allowedSort;
@ -69,7 +71,6 @@ abstract class Controller extends BaseController
return $next($request);
}
);
}
/**
@ -81,7 +82,7 @@ abstract class Controller extends BaseController
*/
private function getParameters(): ParameterBag
{
$bag = new ParameterBag;
$bag = new ParameterBag();
$page = (int)request()->get('page');
if ($page < 1) {
@ -180,7 +181,7 @@ abstract class Controller extends BaseController
final protected function getManager(): Manager
{
// create some objects:
$manager = new Manager;
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));

3
app/Api/V1/Controllers/Data/Bulk/AccountController.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@ -75,7 +74,5 @@ class AccountController extends Controller
$service->moveTransactions($original, $destination);
return response()->json([], 204);
}
}

1
app/Api/V1/Controllers/Data/Bulk/TransactionController.php
View File

@ -96,5 +96,4 @@ class TransactionController extends Controller
{
return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
}
}

1
app/Api/V1/Controllers/Data/DestroyController.php
View File

@ -293,5 +293,4 @@ class DestroyController extends Controller
$service->destroy($journal);
}
}
}

2
app/Api/V1/Controllers/Data/Export/ExportController.php
View File

@ -67,7 +67,6 @@ class ExportController extends Controller
$this->exporter->setExportAccounts(true);
return $this->returnExport('accounts');
}
/**
@ -229,5 +228,4 @@ class ExportController extends Controller
return $this->returnExport('transactions');
}
}

5
app/Api/V1/Controllers/Data/PurgeController.php
View File

@ -43,7 +43,6 @@ class PurgeController extends Controller
*/
public function purge(): JsonResponse
{
$user = auth()->user();
// some manual code, too lazy to call all repositories.
@ -56,10 +55,10 @@ class PurgeController extends Controller
Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();
// piggies
$set = PiggyBank::leftJoin('accounts','accounts.id','piggy_banks.account_id')
$set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
/** @var PiggyBank $piggy */
foreach($set as $piggy) {
foreach ($set as $piggy) {
$piggy->forceDelete();
}

1
app/Api/V1/Controllers/Insight/Expense/AccountController.php
View File

@ -134,5 +134,4 @@ class AccountController extends Controller
return response()->json($result);
}
}

1
app/Api/V1/Controllers/Insight/Expense/BillController.php
View File

@ -170,5 +170,4 @@ class BillController extends Controller
return response()->json(array_values($response));
}
}

2
app/Api/V1/Controllers/Insight/Expense/BudgetController.php
View File

@ -127,7 +127,5 @@ class BudgetController extends Controller
}
return response()->json($result);
}
}

1
app/Api/V1/Controllers/Insight/Expense/CategoryController.php
View File

@ -128,6 +128,5 @@ class CategoryController extends Controller
}
return response()->json($result);
}
}

2
app/Api/V1/Controllers/Insight/Expense/PeriodController.php
View File

@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
@ -82,5 +81,4 @@ class PeriodController extends Controller
return response()->json(array_values($response));
}
}

1
app/Api/V1/Controllers/Insight/Expense/TagController.php
View File

@ -176,5 +176,4 @@ class TagController extends Controller
return response()->json(array_values($response));
}
}

1
app/Api/V1/Controllers/Insight/Income/AccountController.php
View File

@ -133,5 +133,4 @@ class AccountController extends Controller
return response()->json($result);
}
}

1
app/Api/V1/Controllers/Insight/Income/CategoryController.php
View File

@ -128,6 +128,5 @@ class CategoryController extends Controller
}
return response()->json($result);
}
}

5
app/Api/V1/Controllers/Insight/Income/PeriodController.php
View File

@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
@ -76,7 +75,8 @@ class PeriodController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
}
@ -84,5 +84,4 @@ class PeriodController extends Controller
return response()->json(array_values($response));
}
}

7
app/Api/V1/Controllers/Insight/Income/TagController.php
View File

@ -101,7 +101,8 @@ class TagController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
@ -172,7 +173,8 @@ class TagController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
@ -181,5 +183,4 @@ class TagController extends Controller
return response()->json(array_values($response));
}
}

1
app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
View File

@ -127,6 +127,5 @@ class CategoryController extends Controller
}
return response()->json($result);
}
}

5
app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
View File

@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
@ -76,7 +75,8 @@ class PeriodController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
@ -84,5 +84,4 @@ class PeriodController extends Controller
return response()->json(array_values($response));
}
}

6
app/Api/V1/Controllers/Insight/Transfer/TagController.php
View File

@ -98,7 +98,8 @@ class TagController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
}
@ -169,7 +170,8 @@ class TagController extends Controller
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}

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);
}
}

5
app/Api/V1/Controllers/Summary/BasicController.php
View File

@ -150,8 +150,9 @@ class BasicController extends Controller
foreach ($set as $transactionJournal) {
$currencyId = (int) $transactionJournal['currency_id'];
$incomes[$currencyId] = $incomes[$currencyId] ?? '0';
$incomes[$currencyId] = bcadd($incomes[$currencyId],
bcmul($transactionJournal['amount'], '-1')
$incomes[$currencyId] = bcadd(
$incomes[$currencyId],
bcmul($transactionJournal['amount'], '-1')
);
$sums[$currencyId] = $sums[$currencyId] ?? '0';
$sums[$currencyId] = bcadd($sums[$currencyId], bcmul($transactionJournal['amount'], '-1'));

1
app/Api/V1/Controllers/System/CronController.php
View File

@ -57,5 +57,4 @@ class CronController extends Controller
return response()->json($return);
}
}

2
app/Api/V1/Controllers/System/UserController.php
View File

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

2
app/Api/V1/Controllers/User/PreferencesController.php
View File

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

1
app/Api/V1/Controllers/Webhook/AttemptController.php
View File

@ -116,7 +116,6 @@ class AttemptController extends Controller
}
if ($attempt->webhook_message_id !== $message->id) {
throw new FireflyException('Webhook message and webhook attempt are no match');
}
$manager = $this->getManager();

1
app/Api/V1/Controllers/Webhook/DestroyController.php
View File

@ -94,7 +94,6 @@ class DestroyController extends Controller
}
if ($attempt->webhook_message_id !== $message->id) {
throw new FireflyException('Webhook message and webhook attempt are no match');
}
$this->repository->destroyAttempt($attempt);

1
app/Api/V1/Controllers/Webhook/MessageController.php
View File

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

1
app/Api/V1/Controllers/Webhook/UpdateController.php
View File

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

1
app/Api/V1/Middleware/ApiDemoUser.php
View File

@ -49,7 +49,6 @@ class ApiDemoUser
}
if ($user->hasRole('demo')) {
return response('', 403);
}
return $next($request);

3
app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php
View File

@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AutocompleteRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array

6
app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
View File

@ -35,7 +35,8 @@ use Illuminate\Validation\Validator;
*/
class MoveTransactionsRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@ -84,7 +85,8 @@ class MoveTransactionsRequest extends FormRequest
* @param Validator $validator
* @return void
*/
private function validateMove(Validator $validator): void {
private function validateMove(Validator $validator): void
{
$data = $validator->getData();
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());

4
app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
View File

@ -39,7 +39,9 @@ use Log;
*/
class TransactionRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes, ValidatesBulkTransactionQuery;
use ChecksLogin;
use ConvertsDataTypes;
use ValidatesBulkTransactionQuery;
/**
* @return array

3
app/Api/V1/Requests/Data/DateRequest.php
View File

@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class DateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Data/DestroyRequest.php
View File

@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class DestroyRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

5
app/Api/V1/Requests/Data/Export/ExportRequest.php
View File

@ -36,7 +36,8 @@ use Illuminate\Support\Collection;
*/
class ExportRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
public function getAll(): array
{
@ -49,7 +50,7 @@ class ExportRequest extends FormRequest
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$accounts = new Collection;
$accounts = new Collection();
foreach ($parts as $part) {
$accountId = (int) $part;
if (0 !== $accountId) {

21
app/Api/V1/Requests/Insight/GenericRequest.php
View File

@ -42,7 +42,8 @@ use Illuminate\Support\Collection;
*/
class GenericRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
private Collection $accounts;
private Collection $bills;
@ -69,11 +70,11 @@ class GenericRequest extends FormRequest
public function getAssetAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE])) {
if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
$return->push($account);
}
}
@ -216,7 +217,7 @@ class GenericRequest extends FormRequest
public function getExpenseAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
@ -234,7 +235,7 @@ class GenericRequest extends FormRequest
public function getRevenueAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
@ -297,11 +298,11 @@ class GenericRequest extends FormRequest
public function rules(): array
{
// this is cheating but it works to initialize the collections.
$this->accounts = new Collection;
$this->budgets = new Collection;
$this->categories = new Collection;
$this->bills = new Collection;
$this->tags = new Collection;
$this->accounts = new Collection();
$this->budgets = new Collection();
$this->categories = new Collection();
$this->bills = new Collection();
$this->tags = new Collection();
return [
'start' => 'required|date',

8
app/Api/V1/Requests/Models/Account/StoreRequest.php
View File

@ -40,7 +40,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* @return array
@ -114,8 +116,8 @@ class StoreRequest extends FormRequest
'order' => 'numeric|nullable',
'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'active' => [new IsBoolean],
'include_net_worth' => [new IsBoolean],
'active' => [new IsBoolean()],
'include_net_worth' => [new IsBoolean()],
'account_role' => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
'credit_card_type' => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',

8
app/Api/V1/Requests/Models/Account/UpdateRequest.php
View File

@ -42,7 +42,9 @@ use Log;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* @return array
@ -116,8 +118,8 @@ class UpdateRequest extends FormRequest
'order' => 'numeric|nullable',
'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'active' => [new IsBoolean],
'include_net_worth' => [new IsBoolean],
'active' => [new IsBoolean()],
'include_net_worth' => [new IsBoolean()],
'account_role' => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles),
'credit_card_type' => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'date' . '|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',

7
app/Api/V1/Requests/Models/Attachment/StoreRequest.php
View File

@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -62,10 +63,10 @@ class StoreRequest extends FormRequest
{
$models = config('firefly.valid_attachment_models');
$models = array_map(
static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className);
}, $models
},
$models
);
$models = implode(',', $models);
$model = $this->convertString('attachable_type');

7
app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
View File

@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -64,10 +65,10 @@ class UpdateRequest extends FormRequest
{
$models = config('firefly.valid_attachment_models');
$models = array_map(
static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className);
}, $models
},
$models
);
$models = implode(',', $models);
$model = $this->convertString('attachable_type');

3
app/Api/V1/Requests/Models/AvailableBudget/Request.php
View File

@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class Request extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

5
app/Api/V1/Requests/Models/Bill/StoreRequest.php
View File

@ -38,7 +38,8 @@ use Log;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -87,7 +88,7 @@ class StoreRequest extends FormRequest
'extension_date' => 'date|after:date',
'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly|required',
'skip' => 'between:0,31',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'between:1,65536',
];
}

5
app/Api/V1/Requests/Models/Bill/UpdateRequest.php
View File

@ -37,7 +37,8 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -87,7 +88,7 @@ class UpdateRequest extends FormRequest
'extension_date' => 'date|after:date',
'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'between:0,31',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'between:1,65536',
];
}

6
app/Api/V1/Requests/Models/Budget/StoreRequest.php
View File

@ -37,7 +37,9 @@ use Illuminate\Validation\Validator;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Get all data from the request.
@ -72,7 +74,7 @@ class StoreRequest extends FormRequest
{
return [
'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'currency_id' => 'exists:transaction_currencies,id',
'currency_code' => 'exists:transaction_currencies,code',
'notes' => 'nullable|between:1,65536',

6
app/Api/V1/Requests/Models/Budget/UpdateRequest.php
View File

@ -37,7 +37,9 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Get all data from the request.
@ -82,7 +84,7 @@ class UpdateRequest extends FormRequest
return [
'name' => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id),
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'nullable|between:1,65536',
'auto_budget_type' => 'in:reset,rollover,none',
'auto_budget_currency_id' => 'exists:transaction_currencies,id',

4
app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php
View File

@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -67,5 +68,4 @@ class StoreRequest extends FormRequest
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
];
}
}

4
app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
View File

@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@ -96,5 +97,4 @@ class UpdateRequest extends FormRequest
}
);
}
}

Some files were not shown because too many files have changed in this diff Show More