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

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
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
340 changed files with 4079 additions and 3816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.ci/php-cs-fixer/.php-cs-fixer.php
View File

@ -19,7 +19,20 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
$finder = PhpCsFixer\Finder::create(); $current = __DIR__;
$paths = [
$current . '/../../app',
$current . '/../../config',
$current . '/../../database',
$current . '/../../routes',
$current . '/../../tests',
$current . '/../../resources/lang',
];
$finder = PhpCsFixer\Finder::create()
->in($paths);
$config = new PhpCsFixer\Config(); $config = new PhpCsFixer\Config();
return $config->setRules([ return $config->setRules([

2
.ci/phpcs.sh
View File

@ -31,7 +31,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# clean up php code # clean up php code
cd $SCRIPT_DIR/php-cs-fixer cd $SCRIPT_DIR/php-cs-fixer
composer update composer update
./vendor/bin/php-cs-fixer fix $SCRIPT_DIR/../app --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
cd $SCRIPT_DIR/.. cd $SCRIPT_DIR/..
exit 0 exit 0

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

@ -67,7 +67,7 @@ class AccountController extends Controller
* Documentation for this endpoint: * Documentation for this endpoint:
* https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC * https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws JsonException * @throws JsonException
@ -82,7 +82,7 @@ class AccountController extends Controller
$date = $data['date'] ?? today(config('app.timezone')); $date = $data['date'] ?? today(config('app.timezone'));
$return = []; $return = [];
$result = $this->repository->searchAccount((string) $query, $types, $data['limit']); $result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */ /** @var Account $account */
@ -96,7 +96,7 @@ class AccountController extends Controller
} }
$return[] = [ $return[] = [
'id' => (string) $account->id, 'id' => (string)$account->id,
'name' => $account->name, 'name' => $account->name,
'name_with_balance' => $nameWithBalance, 'name_with_balance' => $nameWithBalance,
'type' => $account->accountType->type, 'type' => $account->accountType->type,

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

@ -59,7 +59,7 @@ class BillController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC * https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -70,7 +70,7 @@ class BillController extends Controller
$filtered = $result->map( $filtered = $result->map(
static function (Bill $item) { static function (Bill $item) {
return [ return [
'id' => (string) $item->id, 'id' => (string)$item->id,
'name' => $item->name, 'name' => $item->name,
]; ];
} }

4
app/Api/V1/Controllers/Autocomplete/BudgetController.php
View File

@ -59,7 +59,7 @@ class BudgetController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC * https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -70,7 +70,7 @@ class BudgetController extends Controller
$filtered = $result->map( $filtered = $result->map(
static function (Budget $item) { static function (Budget $item) {
return [ return [
'id' => (string) $item->id, 'id' => (string)$item->id,
'name' => $item->name, 'name' => $item->name,
]; ];
} }

4
app/Api/V1/Controllers/Autocomplete/CategoryController.php
View File

@ -59,7 +59,7 @@ class CategoryController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC * https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -70,7 +70,7 @@ class CategoryController extends Controller
$filtered = $result->map( $filtered = $result->map(
static function (Category $item) { static function (Category $item) {
return [ return [
'id' => (string) $item->id, 'id' => (string)$item->id,
'name' => $item->name, 'name' => $item->name,
]; ];
} }

8
app/Api/V1/Controllers/Autocomplete/CurrencyController.php
View File

@ -59,7 +59,7 @@ class CurrencyController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -72,7 +72,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */ /** @var TransactionCurrency $currency */
foreach ($collection as $currency) { foreach ($collection as $currency) {
$result[] = [ $result[] = [
'id' => (string) $currency->id, 'id' => (string)$currency->id,
'name' => $currency->name, 'name' => $currency->name,
'code' => $currency->code, 'code' => $currency->code,
'symbol' => $currency->symbol, 'symbol' => $currency->symbol,
@ -87,7 +87,7 @@ class CurrencyController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @deprecated * @deprecated
@ -101,7 +101,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */ /** @var TransactionCurrency $currency */
foreach ($collection as $currency) { foreach ($collection as $currency) {
$result[] = [ $result[] = [
'id' => (string) $currency->id, 'id' => (string)$currency->id,
'name' => sprintf('%s (%s)', $currency->name, $currency->code), 'name' => sprintf('%s (%s)', $currency->name, $currency->code),
'code' => $currency->code, 'code' => $currency->code,
'symbol' => $currency->symbol, 'symbol' => $currency->symbol,

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

@ -59,7 +59,7 @@ class ObjectGroupController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC * https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -72,7 +72,7 @@ class ObjectGroupController extends Controller
/** @var ObjectGroup $objectGroup */ /** @var ObjectGroup $objectGroup */
foreach ($result as $objectGroup) { foreach ($result as $objectGroup) {
$return[] = [ $return[] = [
'id' => (string) $objectGroup->id, 'id' => (string)$objectGroup->id,
'name' => $objectGroup->title, 'name' => $objectGroup->title,
'title' => $objectGroup->title, 'title' => $objectGroup->title,
]; ];

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

@ -63,7 +63,7 @@ class PiggyBankController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -78,7 +78,7 @@ class PiggyBankController extends Controller
foreach ($piggies as $piggy) { foreach ($piggies as $piggy) {
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; $currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$response[] = [ $response[] = [
'id' => (string) $piggy->id, 'id' => (string)$piggy->id,
'name' => $piggy->name, 'name' => $piggy->name,
'currency_id' => $currency->id, 'currency_id' => $currency->id,
'currency_name' => $currency->name, 'currency_name' => $currency->name,
@ -95,7 +95,7 @@ class PiggyBankController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -110,7 +110,7 @@ class PiggyBankController extends Controller
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; $currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0'; $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
$response[] = [ $response[] = [
'id' => (string) $piggy->id, 'id' => (string)$piggy->id,
'name' => $piggy->name, 'name' => $piggy->name,
'name_with_balance' => sprintf( 'name_with_balance' => sprintf(
'%s (%s / %s)', '%s (%s / %s)',

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

@ -56,7 +56,7 @@ class RecurrenceController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC * https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -69,7 +69,7 @@ class RecurrenceController extends Controller
/** @var Recurrence $recurrence */ /** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) { foreach ($recurrences as $recurrence) {
$response[] = [ $response[] = [
'id' => (string) $recurrence->id, 'id' => (string)$recurrence->id,
'name' => $recurrence->title, 'name' => $recurrence->title,
'description' => $recurrence->description, 'description' => $recurrence->description,
]; ];

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

@ -56,7 +56,7 @@ class RuleController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC * https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -69,7 +69,7 @@ class RuleController extends Controller
/** @var Rule $rule */ /** @var Rule $rule */
foreach ($rules as $rule) { foreach ($rules as $rule) {
$response[] = [ $response[] = [
'id' => (string) $rule->id, 'id' => (string)$rule->id,
'name' => $rule->title, 'name' => $rule->title,
'description' => $rule->description, 'description' => $rule->description,
]; ];

4
app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
View File

@ -56,7 +56,7 @@ class RuleGroupController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC * https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -69,7 +69,7 @@ class RuleGroupController extends Controller
/** @var RuleGroup $group */ /** @var RuleGroup $group */
foreach ($groups as $group) { foreach ($groups as $group) {
$response[] = [ $response[] = [
'id' => (string) $group->id, 'id' => (string)$group->id,
'name' => $group->title, 'name' => $group->title,
'description' => $group->description, 'description' => $group->description,
]; ];

4
app/Api/V1/Controllers/Autocomplete/TagController.php
View File

@ -59,7 +59,7 @@ class TagController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTagAC * https://api-docs.firefly-iii.org/#/autocomplete/getTagAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -72,7 +72,7 @@ class TagController extends Controller
/** @var Tag $tag */ /** @var Tag $tag */
foreach ($result as $tag) { foreach ($result as $tag) {
$array[] = [ $array[] = [
'id' => (string) $tag->id, 'id' => (string)$tag->id,
'name' => $tag->tag, 'name' => $tag->tag,
'tag' => $tag->tag, 'tag' => $tag->tag,
]; ];

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

@ -64,7 +64,7 @@ class TransactionController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -80,8 +80,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($filtered as $journal) { foreach ($filtered as $journal) {
$array[] = [ $array[] = [
'id' => (string) $journal->id, 'id' => (string)$journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id, 'transaction_group_id' => (string)$journal->transaction_group_id,
'name' => $journal->description, 'name' => $journal->description,
'description' => $journal->description, 'description' => $journal->description,
]; ];
@ -94,7 +94,7 @@ class TransactionController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -104,7 +104,7 @@ class TransactionController extends Controller
$result = new Collection(); $result = new Collection();
if (is_numeric($data['query'])) { if (is_numeric($data['query'])) {
// search for group, not journal. // search for group, not journal.
$firstResult = $this->groupRepository->find((int) $data['query']); $firstResult = $this->groupRepository->find((int)$data['query']);
if (null !== $firstResult) { if (null !== $firstResult) {
// group may contain multiple journals, each a result: // group may contain multiple journals, each a result:
foreach ($firstResult->transactionJournals as $journal) { foreach ($firstResult->transactionJournals as $journal) {
@ -122,8 +122,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($result as $journal) { foreach ($result as $journal) {
$array[] = [ $array[] = [
'id' => (string) $journal->id, 'id' => (string)$journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id, 'transaction_group_id' => (string)$journal->transaction_group_id,
'name' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description), 'name' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
'description' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description), 'description' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
]; ];

4
app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
View File

@ -55,7 +55,7 @@ class TransactionTypeController extends Controller
* This endpoint is documented at * This endpoint is documented at
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC
* *
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
@ -70,7 +70,7 @@ class TransactionTypeController extends Controller
foreach ($types as $type) { foreach ($types as $type) {
// different key for consistency. // different key for consistency.
$array[] = [ $array[] = [
'id' => (string) $type->id, 'id' => (string)$type->id,
'name' => $type->type, 'name' => $type->type,
'type' => $type->type, 'type' => $type->type,
]; ];

6
app/Api/V1/Controllers/Chart/AccountController.php
View File

@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview * https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
* *
* @param DateRequest $request * @param DateRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -115,7 +115,7 @@ class AccountController extends Controller
} }
$currentSet = [ $currentSet = [
'label' => $account->name, 'label' => $account->name,
'currency_id' => (string) $currency->id, 'currency_id' => (string)$currency->id,
'currency_code' => $currency->code, 'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol, 'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places, 'currency_decimal_places' => $currency->decimal_places,
@ -128,7 +128,7 @@ class AccountController extends Controller
$currentStart = clone $start; $currentStart = clone $start;
$range = app('steam')->balanceInRange($account, $start, clone $end); $range = app('steam')->balanceInRange($account, $start, clone $end);
// 2022-10-11 this method no longer converts to float. // 2022-10-11 this method no longer converts to float.
$previous = array_values($range)[0]; $previous = array_values($range)[0];
while ($currentStart <= $end) { while ($currentStart <= $end) {
$format = $currentStart->format('Y-m-d'); $format = $currentStart->format('Y-m-d');
$label = $currentStart->toAtomString(); $label = $currentStart->toAtomString();

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

@ -33,7 +33,6 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use League\Fractal\Manager; use League\Fractal\Manager;
use League\Fractal\Serializer\JsonApiSerializer; use League\Fractal\Serializer\JsonApiSerializer;
use Log;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\ParameterBag;
@ -88,8 +87,8 @@ abstract class Controller extends BaseController
if ($page < 1) { if ($page < 1) {
$page = 1; $page = 1;
} }
if ($page > (2^16)) { if ($page > (2 ^ 16)) {
$page = (2^16); $page = (2 ^ 16);
} }
$bag->set('page', $page); $bag->set('page', $page);
@ -101,7 +100,7 @@ abstract class Controller extends BaseController
if (null !== $date) { if (null !== $date) {
try { try {
$obj = Carbon::parse($date); $obj = Carbon::parse($date);
} catch (InvalidDateException | InvalidFormatException $e) { } catch (InvalidDateException|InvalidFormatException $e) {
// don't care // don't care
app('log')->warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage())); app('log')->warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage()));
} }
@ -123,7 +122,7 @@ abstract class Controller extends BaseController
} }
/** /**
* @param ParameterBag $bag * @param ParameterBag $bag
* *
* @return ParameterBag * @return ParameterBag
*/ */
@ -172,7 +171,7 @@ abstract class Controller extends BaseController
$params[$key] = $value; $params[$key] = $value;
} }
return $return . http_build_query($params); return $return.http_build_query($params);
} }
/** /**
@ -182,7 +181,7 @@ abstract class Controller extends BaseController
{ {
// create some objects: // create some objects:
$manager = new Manager(); $manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost() . '/api/v1'; $baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
return $manager; return $manager;

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

@ -58,7 +58,7 @@ class AccountController extends Controller
/** /**
* This endpoint is deprecated and not documented. * This endpoint is deprecated and not documented.
* *
* @param MoveTransactionsRequest $request * @param MoveTransactionsRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @deprecated * @deprecated

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

@ -63,7 +63,7 @@ class TransactionController extends Controller
/** /**
* This endpoint is documented at: * This endpoint is documented at:
* *
* @param TransactionRequest $request * @param TransactionRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -76,8 +76,8 @@ class TransactionController extends Controller
// to respond to what is in the $query. // to respond to what is in the $query.
// this is OK because only one thing can be in the query at the moment. // this is OK because only one thing can be in the query at the moment.
if ($this->updatesTransactionAccount($params)) { if ($this->updatesTransactionAccount($params)) {
$original = $this->repository->find((int) $params['where']['account_id']); $original = $this->repository->find((int)$params['where']['account_id']);
$destination = $this->repository->find((int) $params['update']['account_id']); $destination = $this->repository->find((int)$params['update']['account_id']);
/** @var AccountDestroyService $service */ /** @var AccountDestroyService $service */
$service = app(AccountDestroyService::class); $service = app(AccountDestroyService::class);
@ -88,7 +88,7 @@ class TransactionController extends Controller
} }
/** /**
* @param array $params * @param array $params
* *
* @return bool * @return bool
*/ */

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

@ -58,7 +58,7 @@ class DestroyController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/destroyData * https://api-docs.firefly-iii.org/#/data/destroyData
* *
* @param DestroyRequest $request * @param DestroyRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -97,24 +97,32 @@ class DestroyController extends Controller
case 'accounts': case 'accounts':
$this->destroyAccounts( $this->destroyAccounts(
[ [
AccountType::ASSET, AccountType::DEFAULT, AccountType::ASSET,
AccountType::BENEFICIARY, AccountType::EXPENSE, AccountType::DEFAULT,
AccountType::REVENUE, AccountType::INITIAL_BALANCE, AccountType::BENEFICIARY,
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD, AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
] ]
); );
break; break;
case 'asset_accounts': case 'asset_accounts':
$this->destroyAccounts( $this->destroyAccounts(
[ [
AccountType::ASSET, AccountType::DEFAULT, AccountType::ASSET,
AccountType::DEFAULT,
] ]
); );
break; break;
case 'expense_accounts': case 'expense_accounts':
$this->destroyAccounts( $this->destroyAccounts(
[ [
AccountType::BENEFICIARY, AccountType::EXPENSE, AccountType::BENEFICIARY,
AccountType::EXPENSE,
] ]
); );
break; break;
@ -128,7 +136,10 @@ class DestroyController extends Controller
case 'liabilities': case 'liabilities':
$this->destroyAccounts( $this->destroyAccounts(
[ [
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD, AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
] ]
); );
break; break;
@ -256,7 +267,7 @@ class DestroyController extends Controller
} }
/** /**
* @param array $types * @param array $types
*/ */
private function destroyAccounts(array $types): void private function destroyAccounts(array $types): void
{ {
@ -281,7 +292,7 @@ class DestroyController extends Controller
} }
/** /**
* @param array $types * @param array $types
*/ */
private function destroyTransactions(array $types): void private function destroyTransactions(array $types): void
{ {

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

@ -57,7 +57,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportAccounts * https://api-docs.firefly-iii.org/#/data/exportAccounts
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -70,7 +70,7 @@ class ExportController extends Controller
} }
/** /**
* @param string $key * @param string $key
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -86,13 +86,13 @@ class ExportController extends Controller
$response $response
->header('Content-Description', 'File Transfer') ->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream') ->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $fileName) ->header('Content-Disposition', 'attachment; filename='.$fileName)
->header('Content-Transfer-Encoding', 'binary') ->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive') ->header('Connection', 'Keep-Alive')
->header('Expires', '0') ->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public') ->header('Pragma', 'public')
->header('Content-Length', (string) strlen($data[$key])); ->header('Content-Length', (string)strlen($data[$key]));
return $response; return $response;
} }
@ -101,7 +101,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBills * https://api-docs.firefly-iii.org/#/data/exportBills
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -117,7 +117,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBudgets * https://api-docs.firefly-iii.org/#/data/exportBudgets
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -133,7 +133,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportCategories * https://api-docs.firefly-iii.org/#/data/exportCategories
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -149,7 +149,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportPiggies * https://api-docs.firefly-iii.org/#/data/exportPiggies
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -165,7 +165,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRecurring * https://api-docs.firefly-iii.org/#/data/exportRecurring
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -181,7 +181,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRules * https://api-docs.firefly-iii.org/#/data/exportRules
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -197,7 +197,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTags * https://api-docs.firefly-iii.org/#/data/exportTags
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException
@ -213,7 +213,7 @@ class ExportController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTransactions * https://api-docs.firefly-iii.org/#/data/exportTransactions
* *
* @param ExportRequest $request * @param ExportRequest $request
* *
* @return LaravelResponse * @return LaravelResponse
* @throws FireflyException * @throws FireflyException

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

@ -28,7 +28,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Recurrence; use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
@ -58,7 +57,7 @@ class PurgeController extends Controller
// piggies // 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.*']); ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
/** @var PiggyBank $piggy */ /** @var PiggyBank $piggy */
foreach ($set as $piggy) { foreach ($set as $piggy) {
$piggy->forceDelete(); $piggy->forceDelete();

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

@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset * https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -91,11 +91,11 @@ class AccountController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $expense['id'], 'id' => (string)$expense['id'],
'name' => $expense['name'], 'name' => $expense['name'],
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }
@ -107,7 +107,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense * https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -123,11 +123,11 @@ class AccountController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $expense['id'], 'id' => (string)$expense['id'],
'name' => $expense['name'], 'name' => $expense['name'],
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }

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

@ -61,7 +61,7 @@ class BillController extends Controller
* *
* Expenses per bill, possibly filtered by bill and account. * Expenses per bill, possibly filtered by bill and account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -85,33 +85,33 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$billId = (int) $journal['bill_id']; $billId = (int)$journal['bill_id'];
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
$key = sprintf('%d-%d', $billId, $currencyId); $key = sprintf('%d-%d', $billId, $currencyId);
$foreignKey = sprintf('%d-%d', $billId, $foreignCurrencyId); $foreignKey = sprintf('%d-%d', $billId, $foreignCurrencyId);
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [ $response[$key] = $response[$key] ?? [
'id' => (string) $billId, 'id' => (string)$billId,
'name' => $journal['bill_name'], 'name' => $journal['bill_name'],
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']); $response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float) $response[$key]['difference']; // intentional float $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $response[$foreignKey] ?? [ $response[$foreignKey] = $response[$foreignKey] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']); $response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
} }
} }
@ -124,7 +124,7 @@ class BillController extends Controller
* *
* Expenses for no bill filtered by account. * Expenses for no bill filtered by account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -143,28 +143,28 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); $response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
} }
} }

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

@ -68,7 +68,7 @@ class BudgetController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget * https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -88,11 +88,11 @@ class BudgetController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $budget->id, 'id' => (string)$budget->id,
'name' => $budget->name, 'name' => $budget->name,
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }
@ -105,7 +105,7 @@ class BudgetController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -120,8 +120,8 @@ class BudgetController extends Controller
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }

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

@ -69,7 +69,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -89,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $category->id, 'id' => (string)$category->id,
'name' => $category->name, 'name' => $category->name,
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }
@ -106,7 +106,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -121,8 +121,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // intentional float 'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }

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

@ -38,7 +38,7 @@ class PeriodController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal * https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -54,28 +54,28 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); $response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
} }
} }

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

@ -60,7 +60,7 @@ class TagController extends Controller
* *
* Expenses for no tag filtered by account. * Expenses for no tag filtered by account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -79,28 +79,28 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose. $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); $response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose. $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
} }
} }
@ -113,7 +113,7 @@ class TagController extends Controller
* *
* Expenses per tag, possibly filtered by tag and account. * Expenses per tag, possibly filtered by tag and account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -137,8 +137,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
/** @var array $journal */ /** @var array $journal */
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */ /** @var array $tag */
foreach ($journal['tags'] as $tag) { foreach ($journal['tags'] as $tag) {
@ -149,27 +149,27 @@ class TagController extends Controller
// on currency ID // on currency ID
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [ $response[$key] = $response[$key] ?? [
'id' => (string) $tagId, 'id' => (string)$tagId,
'name' => $tag['name'], 'name' => $tag['name'],
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']); $response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose. $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
} }
// on foreign ID // on foreign ID
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [ $response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']); $response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose. $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
} }
} }
} }

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

@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset * https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -90,11 +90,11 @@ class AccountController extends Controller
/** @var array $entry */ /** @var array $entry */
foreach ($income as $entry) { foreach ($income as $entry) {
$result[] = [ $result[] = [
'id' => (string) $entry['id'], 'id' => (string)$entry['id'],
'name' => $entry['name'], 'name' => $entry['name'],
'difference' => $entry['sum'], 'difference' => $entry['sum'],
'difference_float' => (float) $entry['sum'], // float but on purpose. 'difference_float' => (float)$entry['sum'], // float but on purpose.
'currency_id' => (string) $entry['currency_id'], 'currency_id' => (string)$entry['currency_id'],
'currency_code' => $entry['currency_code'], 'currency_code' => $entry['currency_code'],
]; ];
} }
@ -106,7 +106,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue * https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -122,11 +122,11 @@ class AccountController extends Controller
/** @var array $entry */ /** @var array $entry */
foreach ($income as $entry) { foreach ($income as $entry) {
$result[] = [ $result[] = [
'id' => (string) $entry['id'], 'id' => (string)$entry['id'],
'name' => $entry['name'], 'name' => $entry['name'],
'difference' => $entry['sum'], 'difference' => $entry['sum'],
'difference_float' => (float) $entry['sum'], // float but on purpose. 'difference_float' => (float)$entry['sum'], // float but on purpose.
'currency_id' => (string) $entry['currency_id'], 'currency_id' => (string)$entry['currency_id'],
'currency_code' => $entry['currency_code'], 'currency_code' => $entry['currency_code'],
]; ];
} }

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

@ -69,7 +69,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory * https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -89,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $category->id, 'id' => (string)$category->id,
'name' => $category->name, 'name' => $category->name,
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // float but on purpose. 'difference_float' => (float)$expense['sum'], // float but on purpose.
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }
@ -106,7 +106,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -121,8 +121,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], // float but on purpose. 'difference_float' => (float)$expense['sum'], // float but on purpose.
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }

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

@ -38,7 +38,7 @@ class PeriodController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal * https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -54,31 +54,31 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose. $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd( $response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], $response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose. $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
} }
} }

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

@ -61,7 +61,7 @@ class TagController extends Controller
* *
* Expenses for no tag filtered by account. * Expenses for no tag filtered by account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -80,31 +80,31 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd( $response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], $response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
} }
} }
@ -117,7 +117,7 @@ class TagController extends Controller
* *
* Expenses per tag, possibly filtered by tag and account. * Expenses per tag, possibly filtered by tag and account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -141,8 +141,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
/** @var array $journal */ /** @var array $journal */
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */ /** @var array $tag */
foreach ($journal['tags'] as $tag) { foreach ($journal['tags'] as $tag) {
@ -153,30 +153,30 @@ class TagController extends Controller
// on currency ID // on currency ID
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [ $response[$key] = $response[$key] ?? [
'id' => (string) $tagId, 'id' => (string)$tagId,
'name' => $tag['name'], 'name' => $tag['name'],
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount'])); $response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float) $response[$key]['difference']; $response[$key]['difference_float'] = (float)$response[$key]['difference'];
} }
// on foreign ID // on foreign ID
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [ $response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignKey]['difference'] = bcadd( $response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], $response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
} }
} }
} }

2
app/Api/V1/Controllers/Insight/Transfer/AccountController.php
View File

@ -61,7 +61,7 @@ class AccountController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransfers * https://api-docs.firefly-iii.org/#/insight/insightTransfers
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -68,7 +68,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -88,11 +88,11 @@ class CategoryController extends Controller
/** @var array $expense */ /** @var array $expense */
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'id' => (string) $category->id, 'id' => (string)$category->id,
'name' => $category->name, 'name' => $category->name,
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], 'difference_float' => (float)$expense['sum'],
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }
@ -105,7 +105,7 @@ class CategoryController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -120,8 +120,8 @@ class CategoryController extends Controller
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$result[] = [ $result[] = [
'difference' => $expense['sum'], 'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'], 'difference_float' => (float)$expense['sum'],
'currency_id' => (string) $expense['currency_id'], 'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $expense['currency_code'],
]; ];
} }

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

@ -38,7 +38,7 @@ class PeriodController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferTotal * https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -54,31 +54,31 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd( $response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], $response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
} }
} }

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

@ -58,7 +58,7 @@ class TagController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag * https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -77,31 +77,31 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [ $response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
} }
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [ $response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignCurrencyId]['difference'] = bcadd( $response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], $response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
} }
} }
@ -114,7 +114,7 @@ class TagController extends Controller
* *
* Transfers per tag, possibly filtered by tag and account. * Transfers per tag, possibly filtered by tag and account.
* *
* @param GenericRequest $request * @param GenericRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -138,8 +138,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals(); $genericSet = $collector->getExtractedJournals();
/** @var array $journal */ /** @var array $journal */
foreach ($genericSet as $journal) { foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id']; $foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */ /** @var array $tag */
foreach ($journal['tags'] as $tag) { foreach ($journal['tags'] as $tag) {
@ -150,30 +150,30 @@ class TagController extends Controller
// on currency ID // on currency ID
if (0 !== $currencyId) { if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [ $response[$key] = $response[$key] ?? [
'id' => (string) $tagId, 'id' => (string)$tagId,
'name' => $tag['name'], 'name' => $tag['name'],
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $currencyId, 'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
]; ];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount'])); $response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float) $response[$key]['difference']; $response[$key]['difference_float'] = (float)$response[$key]['difference'];
} }
// on foreign ID // on foreign ID
if (0 !== $foreignCurrencyId) { if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [ $response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0', 'difference' => '0',
'difference_float' => 0, 'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId, 'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'], 'currency_code' => $journal['foreign_currency_code'],
]; ];
$response[$foreignKey]['difference'] = bcadd( $response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], $response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount']) app('steam')->positive($journal['foreign_amount'])
); );
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
} }
} }
} }

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

@ -61,7 +61,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param Account $account * @param Account $account
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @return JsonResponse * @return JsonResponse

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

@ -73,7 +73,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount * https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount
* *
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
@ -82,7 +82,7 @@ class ListController extends Controller
public function attachments(Account $account): JsonResponse public function attachments(Account $account): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($account); $collection = $this->repository->getAttachments($account);
$count = $collection->count(); $count = $collection->count();
@ -90,7 +90,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.attachments', [$account->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -106,7 +106,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount * https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount
* *
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -118,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks($account); $collection = $this->repository->getPiggyBanks($account);
@ -127,7 +127,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]).$this->buildParams());
/** @var PiggyBankTransformer $transformer */ /** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class); $transformer = app(PiggyBankTransformer::class);
@ -147,15 +147,15 @@ class ListController extends Controller
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param Request $request * @param Request $request
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
*/ */
public function transactions(Request $request, Account $account): JsonResponse public function transactions(Request $request, Account $account): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -180,7 +180,7 @@ class ListController extends Controller
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
$groups = $paginator->getCollection(); $groups = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

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

@ -71,7 +71,7 @@ class ShowController extends Controller
* *
* Display a listing of the resource. * Display a listing of the resource.
* *
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -85,7 +85,7 @@ class ShowController extends Controller
// types to get, page size: // types to get, page size:
$types = $this->mapAccountTypes($this->parameters->get('type')); $types = $this->mapAccountTypes($this->parameters->get('type'));
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it. // get list of accounts. Count it and split it.
$this->repository->resetAccountOrder(); $this->repository->resetAccountOrder();
@ -99,7 +99,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.index') . $this->buildParams()); $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
/** @var AccountTransformer $transformer */ /** @var AccountTransformer $transformer */
$transformer = app(AccountTransformer::class); $transformer = app(AccountTransformer::class);
@ -117,7 +117,7 @@ class ShowController extends Controller
* *
* Show single instance. * Show single instance.
* *
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -63,7 +63,7 @@ class StoreController extends Controller
* *
* Store a new instance. * Store a new instance.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */

6
app/Api/V1/Controllers/Models/Account/UpdateController.php
View File

@ -66,8 +66,8 @@ class UpdateController extends Controller
* *
* Update account. * Update account.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -75,7 +75,7 @@ class UpdateController extends Controller
{ {
Log::debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$data = $request->getUpdateData(); $data = $request->getUpdateData();
$data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type); $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
$account = $this->repository->update($account, $data); $account = $this->repository->update($account, $data);
$manager = $this->getManager(); $manager = $this->getManager();
$account->refresh(); $account->refresh();

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

@ -66,7 +66,7 @@ class DestroyController extends Controller
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return JsonResponse * @return JsonResponse
*/ */

12
app/Api/V1/Controllers/Models/Attachment/ShowController.php
View File

@ -71,7 +71,7 @@ class ShowController extends Controller
* *
* Download an attachment. * Download an attachment.
* *
* @param Attachment $attachment * @param Attachment $attachment
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @return LaravelResponse * @return LaravelResponse
@ -97,13 +97,13 @@ class ShowController extends Controller
$response $response
->header('Content-Description', 'File Transfer') ->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream') ->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted) ->header('Content-Disposition', 'attachment; filename='.$quoted)
->header('Content-Transfer-Encoding', 'binary') ->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive') ->header('Connection', 'Keep-Alive')
->header('Expires', '0') ->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public') ->header('Pragma', 'public')
->header('Content-Length', (string) strlen($content)); ->header('Content-Length', (string)strlen($content));
return $response; return $response;
} }
@ -125,7 +125,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of attachments. Count it and split it. // get list of attachments. Count it and split it.
$collection = $this->repository->get(); $collection = $this->repository->get();
@ -134,7 +134,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.attachments.index') . $this->buildParams()); $paginator->setPath(route('api.v1.attachments.index').$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -152,7 +152,7 @@ class ShowController extends Controller
* *
* Display the specified resource. * Display the specified resource.
* *
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return JsonResponse * @return JsonResponse
*/ */

6
app/Api/V1/Controllers/Models/Attachment/StoreController.php
View File

@ -71,7 +71,7 @@ class StoreController extends Controller
* *
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -97,8 +97,8 @@ class StoreController extends Controller
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param Request $request * @param Request $request
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return JsonResponse * @return JsonResponse
*/ */

4
app/Api/V1/Controllers/Models/Attachment/UpdateController.php
View File

@ -67,8 +67,8 @@ class UpdateController extends Controller
* *
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -77,7 +77,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$start = $this->parameters->get('start'); $start = $this->parameters->get('start');
$end = $this->parameters->get('end'); $end = $this->parameters->get('end');
@ -89,7 +89,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams()); $paginator->setPath(route('api.v1.available_budgets.index').$this->buildParams());
/** @var AvailableBudgetTransformer $transformer */ /** @var AvailableBudgetTransformer $transformer */
$transformer = app(AvailableBudgetTransformer::class); $transformer = app(AvailableBudgetTransformer::class);
@ -107,7 +107,7 @@ class ShowController extends Controller
* *
* Display the specified resource. * Display the specified resource.
* *
* @param AvailableBudget $availableBudget * @param AvailableBudget $availableBudget
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -59,7 +59,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -72,7 +72,7 @@ class ListController extends Controller
* *
* Display a listing of the resource. * Display a listing of the resource.
* *
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -81,7 +81,7 @@ class ListController extends Controller
public function attachments(Bill $bill): JsonResponse public function attachments(Bill $bill): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($bill); $collection = $this->repository->getAttachments($bill);
$count = $collection->count(); $count = $collection->count();
@ -89,7 +89,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -107,7 +107,7 @@ class ListController extends Controller
* *
* List all of them. * List all of them.
* *
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -118,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->getRulesForBill($bill); $collection = $this->repository->getRulesForBill($bill);
@ -127,7 +127,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams());
/** @var RuleTransformer $transformer */ /** @var RuleTransformer $transformer */
$transformer = app(RuleTransformer::class); $transformer = app(RuleTransformer::class);
@ -144,9 +144,9 @@ class ListController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* *
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -154,7 +154,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Bill $bill): JsonResponse public function transactions(Request $request, Bill $bill): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -187,7 +187,7 @@ class ListController extends Controller
// get paginator. // get paginator.
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.bills.transactions', [$bill->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

4
app/Api/V1/Controllers/Models/Bill/ShowController.php
View File

@ -74,7 +74,7 @@ class ShowController extends Controller
$this->repository->correctOrder(); $this->repository->correctOrder();
$bills = $this->repository->getBills(); $bills = $this->repository->getBills();
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$count = $bills->count(); $count = $bills->count();
$bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
@ -95,7 +95,7 @@ class ShowController extends Controller
* *
* Show the specified bill. * Show the specified bill.
* *
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -65,7 +65,7 @@ class StoreController extends Controller
* *
* Store a bill. * Store a bill.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

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

@ -62,8 +62,8 @@ class UpdateController extends Controller
* *
* Update a bill. * Update a bill.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Bill $bill * @param Bill $bill
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -59,7 +59,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -74,7 +74,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget * https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget
* *
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -83,7 +83,7 @@ class ListController extends Controller
public function attachments(Budget $budget): JsonResponse public function attachments(Budget $budget): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($budget); $collection = $this->repository->getAttachments($budget);
$count = $collection->count(); $count = $collection->count();
@ -91,7 +91,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -109,7 +109,7 @@ class ListController extends Controller
* *
* Display a listing of the resource. * Display a listing of the resource.
* *
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -118,13 +118,13 @@ class ListController extends Controller
public function budgetLimits(Budget $budget): JsonResponse public function budgetLimits(Budget $budget): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->parameters->set('budget_id', $budget->id); $this->parameters->set('budget_id', $budget->id);
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end')); $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count(); $count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]).$this->buildParams());
/** @var BudgetLimitTransformer $transformer */ /** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class); $transformer = app(BudgetLimitTransformer::class);
@ -141,9 +141,9 @@ class ListController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* *
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -151,7 +151,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Budget $budget): JsonResponse public function transactions(Request $request, Budget $budget): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter. // user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit'); $limit = $this->parameters->get('limit');
@ -189,7 +189,7 @@ class ListController extends Controller
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */
@ -207,7 +207,7 @@ class ListController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -215,7 +215,7 @@ class ListController extends Controller
*/ */
public function withoutBudget(Request $request): JsonResponse public function withoutBudget(Request $request): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter. // user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit'); $limit = $this->parameters->get('limit');
@ -253,7 +253,7 @@ class ListController extends Controller
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

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

@ -78,7 +78,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->getBudgets(); $collection = $this->repository->getBudgets();
@ -87,7 +87,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.index') . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.index').$this->buildParams());
/** @var BudgetTransformer $transformer */ /** @var BudgetTransformer $transformer */
$transformer = app(BudgetTransformer::class); $transformer = app(BudgetTransformer::class);
@ -102,7 +102,7 @@ class ShowController extends Controller
/** /**
* Show a budget. * Show a budget.
* *
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -62,7 +62,7 @@ class StoreController extends Controller
* *
* Store a budget. * Store a budget.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

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

@ -62,8 +62,8 @@ class UpdateController extends Controller
* *
* Update a budget. * Update a budget.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
*/ */

4
app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
View File

@ -64,8 +64,8 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param Budget $budget * @param Budget $budget
* @param BudgetLimit $budgetLimit * @param BudgetLimit $budgetLimit
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

10
app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
View File

@ -71,9 +71,9 @@ class ListController extends Controller
* https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* @param Budget $budget * @param Budget $budget
* @param BudgetLimit $budgetLimit * @param BudgetLimit $budgetLimit
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -81,7 +81,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -110,7 +110,7 @@ class ListController extends Controller
$collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
$collector->setTypes($types); $collector->setTypes($types);
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

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

@ -75,8 +75,8 @@ class ShowController extends Controller
* *
* Display a listing of the budget limits for this budget. * Display a listing of the budget limits for this budget.
* *
* @param Request $request * @param Request $request
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -86,12 +86,12 @@ class ShowController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$manager->parseIncludes('budget'); $manager->parseIncludes('budget');
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end')); $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count(); $count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());
/** @var BudgetLimitTransformer $transformer */ /** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class); $transformer = app(BudgetLimitTransformer::class);
@ -109,7 +109,7 @@ class ShowController extends Controller
* *
* Display a listing of the budget limits for this budget. * Display a listing of the budget limits for this budget.
* *
* @param DateRequest $request * @param DateRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -119,12 +119,12 @@ class ShowController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$manager->parseIncludes('budget'); $manager->parseIncludes('budget');
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end')); $collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count(); $count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budget-limits.index') . $this->buildParams()); $paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams());
/** @var BudgetLimitTransformer $transformer */ /** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class); $transformer = app(BudgetLimitTransformer::class);
@ -140,16 +140,16 @@ class ShowController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit * https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit
* *
* @param Request $request * @param Request $request
* @param Budget $budget * @param Budget $budget
* @param BudgetLimit $budgetLimit * @param BudgetLimit $budgetLimit
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
*/ */
public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{ {
if ((int) $budget->id !== (int) $budgetLimit->budget_id) { if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.'); throw new FireflyException('20028: The budget limit does not belong to the budget.');
} }
// continue! // continue!

4
app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
View File

@ -65,8 +65,8 @@ class StoreController extends Controller
* *
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param StoreRequest $request * @param StoreRequest $request
* @param Budget $budget * @param Budget $budget
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -67,16 +67,16 @@ class UpdateController extends Controller
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Budget $budget * @param Budget $budget
* @param BudgetLimit $budgetLimit * @param BudgetLimit $budgetLimit
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
*/ */
public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{ {
if ((int) $budget->id !== (int) $budgetLimit->budget_id) { if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.'); throw new FireflyException('20028: The budget limit does not belong to the budget.');
} }
$data = $request->getAll(); $data = $request->getAll();

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

@ -59,7 +59,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param Category $category * @param Category $category
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -69,7 +69,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory * https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory
* *
* @param Category $category * @param Category $category
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -78,7 +78,7 @@ class ListController extends Controller
public function attachments(Category $category): JsonResponse public function attachments(Category $category): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($category); $collection = $this->repository->getAttachments($category);
$count = $collection->count(); $count = $collection->count();
@ -86,7 +86,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.categories.attachments', [$category->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.categories.attachments', [$category->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -104,9 +104,9 @@ class ListController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* *
* @param Category $category * @param Category $category
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -114,7 +114,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Category $category): JsonResponse public function transactions(Request $request, Category $category): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -145,7 +145,7 @@ class ListController extends Controller
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.categories.transactions', [$category->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

6
app/Api/V1/Controllers/Models/Category/ShowController.php
View File

@ -74,7 +74,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->getCategories(); $collection = $this->repository->getCategories();
@ -83,7 +83,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.categories.index') . $this->buildParams()); $paginator->setPath(route('api.v1.categories.index').$this->buildParams());
/** @var CategoryTransformer $transformer */ /** @var CategoryTransformer $transformer */
$transformer = app(CategoryTransformer::class); $transformer = app(CategoryTransformer::class);
@ -100,7 +100,7 @@ class ShowController extends Controller
* *
* Show the category. * Show the category.
* *
* @param Category $category * @param Category $category
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -62,7 +62,7 @@ class StoreController extends Controller
* *
* Store new category. * Store new category.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

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

@ -62,8 +62,8 @@ class UpdateController extends Controller
* *
* Update the category. * Update the category.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Category $category * @param Category $category
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -62,7 +62,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @return JsonResponse * @return JsonResponse

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

@ -68,7 +68,7 @@ class ListController extends Controller
* *
* List all bills in this object group * List all bills in this object group
* *
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -78,7 +78,7 @@ class ListController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it. // get list of piggy banks. Count it and split it.
$collection = $this->repository->getBills($objectGroup); $collection = $this->repository->getBills($objectGroup);
$count = $collection->count(); $count = $collection->count();
@ -86,7 +86,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]).$this->buildParams());
/** @var BillTransformer $transformer */ /** @var BillTransformer $transformer */
$transformer = app(BillTransformer::class); $transformer = app(BillTransformer::class);
@ -104,7 +104,7 @@ class ListController extends Controller
* *
* List all piggies under the object group. * List all piggies under the object group.
* *
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -116,7 +116,7 @@ class ListController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it. // get list of piggy banks. Count it and split it.
$collection = $this->repository->getPiggyBanks($objectGroup); $collection = $this->repository->getPiggyBanks($objectGroup);
@ -125,7 +125,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]).$this->buildParams());
/** @var PiggyBankTransformer $transformer */ /** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class); $transformer = app(PiggyBankTransformer::class);

8
app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
View File

@ -69,7 +69,7 @@ class ShowController extends Controller
* *
* Display a listing of the resource. * Display a listing of the resource.
* *
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -80,7 +80,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->repository->resetOrder(); $this->repository->resetOrder();
$collection = $this->repository->get(); $collection = $this->repository->get();
@ -89,7 +89,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams()); $paginator->setPath(route('api.v1.object-groups.index').$this->buildParams());
/** @var ObjectGroupTransformer $transformer */ /** @var ObjectGroupTransformer $transformer */
$transformer = app(ObjectGroupTransformer::class); $transformer = app(ObjectGroupTransformer::class);
@ -107,7 +107,7 @@ class ShowController extends Controller
* *
* Show single instance. * Show single instance.
* *
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup
* *
* @return JsonResponse * @return JsonResponse
*/ */

4
app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
View File

@ -63,8 +63,8 @@ class UpdateController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup * https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -59,7 +59,7 @@ class DestroyController extends Controller
* *
* Delete the resource. * Delete the resource.
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -63,7 +63,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank * https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -72,7 +72,7 @@ class ListController extends Controller
public function attachments(PiggyBank $piggyBank): JsonResponse public function attachments(PiggyBank $piggyBank): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($piggyBank); $collection = $this->repository->getAttachments($piggyBank);
$count = $collection->count(); $count = $collection->count();
@ -80,7 +80,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -98,7 +98,7 @@ class ListController extends Controller
* *
* List single resource. * List single resource.
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -107,7 +107,7 @@ class ListController extends Controller
public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
{ {
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$manager = $this->getManager(); $manager = $this->getManager();
$collection = $this->repository->getEvents($piggyBank); $collection = $this->repository->getEvents($piggyBank);
@ -116,7 +116,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]).$this->buildParams());
/** @var PiggyBankEventTransformer $transformer */ /** @var PiggyBankEventTransformer $transformer */
$transformer = app(PiggyBankEventTransformer::class); $transformer = app(PiggyBankEventTransformer::class);

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

@ -73,7 +73,7 @@ class ShowController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks(); $collection = $this->repository->getPiggyBanks();
@ -82,7 +82,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams()); $paginator->setPath(route('api.v1.piggy_banks.index').$this->buildParams());
/** @var PiggyBankTransformer $transformer */ /** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class); $transformer = app(PiggyBankTransformer::class);
@ -100,7 +100,7 @@ class ShowController extends Controller
* *
* List single resource. * List single resource.
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -62,7 +62,7 @@ class StoreController extends Controller
* *
* Store new object. * Store new object.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

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

@ -62,8 +62,8 @@ class UpdateController extends Controller
* *
* Update piggy bank. * Update piggy bank.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -59,7 +59,7 @@ class DestroyController extends Controller
* *
* Delete the resource. * Delete the resource.
* *
* @param Recurrence $recurrence * @param Recurrence $recurrence
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

8
app/Api/V1/Controllers/Models/Recurrence/ListController.php
View File

@ -69,8 +69,8 @@ class ListController extends Controller
* *
* Show transactions for this recurrence. * Show transactions for this recurrence.
* *
* @param Request $request * @param Request $request
* @param Recurrence $recurrence * @param Recurrence $recurrence
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -78,7 +78,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Recurrence $recurrence): JsonResponse public function transactions(Request $request, Recurrence $recurrence): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -110,7 +110,7 @@ class ListController extends Controller
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.transactions.index') . $this->buildParams()); $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

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

@ -74,7 +74,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->get(); $collection = $this->repository->get();
@ -83,7 +83,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams()); $paginator->setPath(route('api.v1.recurrences.index').$this->buildParams());
/** @var RecurrenceTransformer $transformer */ /** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class); $transformer = app(RecurrenceTransformer::class);
@ -101,7 +101,7 @@ class ShowController extends Controller
* *
* List single resource. * List single resource.
* *
* @param Recurrence $recurrence * @param Recurrence $recurrence
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -62,7 +62,7 @@ class StoreController extends Controller
* *
* Store new object. * Store new object.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException

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

@ -62,8 +62,8 @@ class UpdateController extends Controller
* *
* Update single recurrence. * Update single recurrence.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Recurrence $recurrence * @param Recurrence $recurrence
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -63,7 +63,7 @@ class DestroyController extends Controller
* *
* Delete the resource. * Delete the resource.
* *
* @param Rule $rule * @param Rule $rule
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -78,7 +78,7 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->ruleRepository->getAll(); $collection = $this->ruleRepository->getAll();
@ -87,7 +87,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rules.index') . $this->buildParams()); $paginator->setPath(route('api.v1.rules.index').$this->buildParams());
/** @var RuleTransformer $transformer */ /** @var RuleTransformer $transformer */
$transformer = app(RuleTransformer::class); $transformer = app(RuleTransformer::class);
@ -105,7 +105,7 @@ class ShowController extends Controller
* *
* List single resource. * List single resource.
* *
* @param Rule $rule * @param Rule $rule
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -65,7 +65,7 @@ class StoreController extends Controller
* *
* Store new object. * Store new object.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */

10
app/Api/V1/Controllers/Models/Rule/TriggerController.php
View File

@ -69,8 +69,8 @@ class TriggerController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rules/testRule * https://api-docs.firefly-iii.org/#/rules/testRule
* *
* @param TestRequest $request * @param TestRequest $request
* @param Rule $rule * @param Rule $rule
* *
* @return JsonResponse * @return JsonResponse
*/ */
@ -101,7 +101,7 @@ class TriggerController extends Controller
$count = $transactions->count(); $count = $transactions->count();
$paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.rules.test', [$rule->id]).$this->buildParams());
// resulting list is presented as JSON thing. // resulting list is presented as JSON thing.
$manager = $this->getManager(); $manager = $this->getManager();
@ -121,8 +121,8 @@ class TriggerController extends Controller
* *
* Execute the given rule group on a set of existing transactions. * Execute the given rule group on a set of existing transactions.
* *
* @param TriggerRequest $request * @param TriggerRequest $request
* @param Rule $rule * @param Rule $rule
* *
* @return JsonResponse * @return JsonResponse
*/ */

4
app/Api/V1/Controllers/Models/Rule/UpdateController.php
View File

@ -66,8 +66,8 @@ class UpdateController extends Controller
* *
* Update a rule. * Update a rule.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Rule $rule * @param Rule $rule
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -63,7 +63,7 @@ class DestroyController extends Controller
* *
* Delete the resource. * Delete the resource.
* *
* @param RuleGroup $ruleGroup * @param RuleGroup $ruleGroup
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -66,7 +66,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/listRuleByGroup * https://api-docs.firefly-iii.org/#/rule_groups/listRuleByGroup
* *
* @param RuleGroup $group * @param RuleGroup $group
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -76,7 +76,7 @@ class ListController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->ruleGroupRepository->getRules($group); $collection = $this->ruleGroupRepository->getRules($group);
@ -85,7 +85,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]).$this->buildParams());
/** @var RuleTransformer $transformer */ /** @var RuleTransformer $transformer */
$transformer = app(RuleTransformer::class); $transformer = app(RuleTransformer::class);

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

@ -76,7 +76,7 @@ class ShowController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of rule groups. Count it and split it. // get list of rule groups. Count it and split it.
$collection = $this->ruleGroupRepository->get(); $collection = $this->ruleGroupRepository->get();
@ -85,7 +85,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rule_groups.index') . $this->buildParams()); $paginator->setPath(route('api.v1.rule_groups.index').$this->buildParams());
/** @var RuleGroupTransformer $transformer */ /** @var RuleGroupTransformer $transformer */
$transformer = app(RuleGroupTransformer::class); $transformer = app(RuleGroupTransformer::class);
@ -103,7 +103,7 @@ class ShowController extends Controller
* *
* List single resource. * List single resource.
* *
* @param RuleGroup $ruleGroup * @param RuleGroup $ruleGroup
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -70,7 +70,7 @@ class StoreController extends Controller
* *
* Store new object. * Store new object.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -70,8 +70,8 @@ class TriggerController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/rule_groups/testRuleGroup * https://api-docs.firefly-iii.org/#/rule_groups/testRuleGroup
* *
* @param TestRequest $request * @param TestRequest $request
* @param RuleGroup $group * @param RuleGroup $group
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -108,7 +108,7 @@ class TriggerController extends Controller
$count = $transactions->count(); $count = $transactions->count();
$paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]).$this->buildParams());
// resulting list is presented as JSON thing. // resulting list is presented as JSON thing.
$manager = $this->getManager(); $manager = $this->getManager();
@ -128,8 +128,8 @@ class TriggerController extends Controller
* *
* Execute the given rule group on a set of existing transactions. * Execute the given rule group on a set of existing transactions.
* *
* @param TriggerRequest $request * @param TriggerRequest $request
* @param RuleGroup $group * @param RuleGroup $group
* *
* @return JsonResponse * @return JsonResponse
* @throws Exception * @throws Exception

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

@ -66,8 +66,8 @@ class UpdateController extends Controller
* *
* Update a rule group. * Update a rule group.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param RuleGroup $ruleGroup * @param RuleGroup $ruleGroup
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -63,7 +63,7 @@ class DestroyController extends Controller
* *
* Delete the resource. * Delete the resource.
* *
* @param Tag $tag * @param Tag $tag
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

14
app/Api/V1/Controllers/Models/Tag/ListController.php
View File

@ -72,7 +72,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/tags/listAttachmentByTag * https://api-docs.firefly-iii.org/#/tags/listAttachmentByTag
* *
* @param Tag $tag * @param Tag $tag
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -81,7 +81,7 @@ class ListController extends Controller
public function attachments(Tag $tag): JsonResponse public function attachments(Tag $tag): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($tag); $collection = $this->repository->getAttachments($tag);
$count = $collection->count(); $count = $collection->count();
@ -89,7 +89,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.tags.attachments', [$tag->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.tags.attachments', [$tag->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -107,8 +107,8 @@ class ListController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* @param Tag $tag * @param Tag $tag
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -116,7 +116,7 @@ class ListController extends Controller
*/ */
public function transactions(Request $request, Tag $tag): JsonResponse public function transactions(Request $request, Tag $tag): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -145,7 +145,7 @@ class ListController extends Controller
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.tags.transactions', [$tag->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.tags.transactions', [$tag->id]).$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */

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

@ -77,7 +77,7 @@ class ShowController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
// types to get, page size: // types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it. // get list of budgets. Count it and split it.
$collection = $this->repository->get(); $collection = $this->repository->get();
@ -86,7 +86,7 @@ class ShowController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.tags.index') . $this->buildParams()); $paginator->setPath(route('api.v1.tags.index').$this->buildParams());
/** @var TagTransformer $transformer */ /** @var TagTransformer $transformer */
$transformer = app(TagTransformer::class); $transformer = app(TagTransformer::class);
@ -104,7 +104,7 @@ class ShowController extends Controller
* *
* List single resource. * List single resource.
* *
* @param Tag $tag * @param Tag $tag
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -65,7 +65,7 @@ class StoreController extends Controller
* *
* Store new object. * Store new object.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -66,8 +66,8 @@ class UpdateController extends Controller
* *
* Update a rule. * Update a rule.
* *
* @param UpdateRequest $request * @param UpdateRequest $request
* @param Tag $tag * @param Tag $tag
* *
* @return JsonResponse * @return JsonResponse
*/ */

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

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Transaction; namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Events\DestroyedTransactionGroup;
use FireflyIII\Events\UpdatedAccount; use FireflyIII\Events\UpdatedAccount;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
@ -41,8 +40,8 @@ use Log;
*/ */
class DestroyController extends Controller class DestroyController extends Controller
{ {
private JournalRepositoryInterface $repository;
private TransactionGroupRepository $groupRepository; private TransactionGroupRepository $groupRepository;
private JournalRepositoryInterface $repository;
/** /**
* TransactionController constructor. * TransactionController constructor.
@ -74,7 +73,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param TransactionGroup $transactionGroup * @param TransactionGroup $transactionGroup
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
@ -114,7 +113,7 @@ class DestroyController extends Controller
* *
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param TransactionJournal $transactionJournal * @param TransactionJournal $transactionJournal
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @return JsonResponse * @return JsonResponse

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

@ -70,7 +70,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listAttachmentByTransaction * https://api-docs.firefly-iii.org/#/transactions/listAttachmentByTransaction
* *
* @param TransactionGroup $transactionGroup * @param TransactionGroup $transactionGroup
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -79,7 +79,7 @@ class ListController extends Controller
public function attachments(TransactionGroup $transactionGroup): JsonResponse public function attachments(TransactionGroup $transactionGroup): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = new Collection(); $collection = new Collection();
foreach ($transactionGroup->transactionJournals as $transactionJournal) { foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection); $collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection);
@ -90,7 +90,7 @@ class ListController extends Controller
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transactions.attachments', [$transactionGroup->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.transactions.attachments', [$transactionGroup->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */ /** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class); $transformer = app(AttachmentTransformer::class);
@ -106,7 +106,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listEventByTransaction * https://api-docs.firefly-iii.org/#/transactions/listEventByTransaction
* *
* @param TransactionGroup $transactionGroup * @param TransactionGroup $transactionGroup
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -116,7 +116,7 @@ class ListController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$collection = new Collection(); $collection = new Collection();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
foreach ($transactionGroup->transactionJournals as $transactionJournal) { foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection); $collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection);
} }
@ -124,7 +124,7 @@ class ListController extends Controller
$events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]).$this->buildParams());
/** @var PiggyBankEventTransformer $transformer */ /** @var PiggyBankEventTransformer $transformer */
$transformer = app(PiggyBankEventTransformer::class); $transformer = app(PiggyBankEventTransformer::class);
@ -145,7 +145,7 @@ class ListController extends Controller
* This endpoint is documented at: * This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listLinksByJournal * https://api-docs.firefly-iii.org/#/transactions/listLinksByJournal
* *
* @param TransactionJournal $transactionJournal * @param TransactionJournal $transactionJournal
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -155,13 +155,13 @@ class ListController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$collection = $this->journalAPIRepository->getJournalLinks($transactionJournal); $collection = $this->journalAPIRepository->getJournalLinks($transactionJournal);
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$count = $collection->count(); $count = $collection->count();
$journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator: // make paginator:
$paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transaction-journals.transaction_links', [$transactionJournal->id]) . $this->buildParams()); $paginator->setPath(route('api.v1.transaction-journals.transaction_links', [$transactionJournal->id]).$this->buildParams());
/** @var TransactionLinkTransformer $transformer */ /** @var TransactionLinkTransformer $transformer */
$transformer = app(TransactionLinkTransformer::class); $transformer = app(TransactionLinkTransformer::class);

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

@ -51,7 +51,7 @@ class ShowController extends Controller
* *
* Show all transactions. * Show all transactions.
* *
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
@ -59,7 +59,7 @@ class ShowController extends Controller
*/ */
public function index(Request $request): JsonResponse public function index(Request $request): JsonResponse
{ {
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default'; $type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type); $this->parameters->set('type', $type);
@ -85,7 +85,7 @@ class ShowController extends Controller
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
} }
$paginator = $collector->getPaginatedGroups(); $paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.transactions.index') . $this->buildParams()); $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
$transactions = $paginator->getCollection(); $transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */ /** @var TransactionGroupTransformer $transformer */
@ -104,7 +104,7 @@ class ShowController extends Controller
* *
* Show a single transaction, by transaction journal. * Show a single transaction, by transaction journal.
* *
* @param TransactionJournal $transactionJournal * @param TransactionJournal $transactionJournal
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
@ -120,7 +120,7 @@ class ShowController extends Controller
* *
* Show a single transaction. * Show a single transaction.
* *
* @param TransactionGroup $transactionGroup * @param TransactionGroup $transactionGroup
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore

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

@ -76,7 +76,7 @@ class StoreController extends Controller
* *
* Store a new transaction. * Store a new transaction.
* *
* @param StoreRequest $request * @param StoreRequest $request
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException|ValidationException * @throws FireflyException|ValidationException

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